Simon Hunt

GUI -- Added missing dependency to karma.conf.js

Change-Id: Id6cff0cae2847c387b1e20597ea112c7126f755f
......@@ -45,14 +45,14 @@
<link rel="stylesheet" href="onos.css">
<link rel="stylesheet" href="fw/mast/mast.css">
<!-- This is where contributed javascript get injected -->
<!-- This is where contributed javascript will get injected -->
<!-- {INJECTED-JAVASCRIPT} -->
<script src="view/sample/sample.js"></script>
<script src="view/topo/topo.js"></script>
<!-- TODO: inject javascript refs server-side -->
<!-- This is where contributed stylesheets get injected -->
<!-- {INJECTED-CSS-STYLESHEETS} -->
<!-- This is where contributed stylesheets will get injected -->
<!-- {INJECTED-STYLESHEETS} -->
<link rel="stylesheet" href="view/sample/sample.css">
<link rel="stylesheet" href="view/topo/topo.css">
<!-- TODO: inject style-sheet refs server-side -->
......
The 'appext' directory is for "Application Extensions". That is to say,
this would be the path to applications contributing to the GUI.
Note that these applications are 'external' to the base GUI, i.e. would
be built and packaged in separate .jar/.war file. They would be installed
via server-side injection.
This directory is just a placeholder to reserve the path.
......
# The 'mock' directory contains code that can emulate the server-side of
# a web socket (probably using node.js) to facilitate the manual injection
# of (JSON structured) events, to aid in the development / debugging of
# client side code.
#
# Each subdirectory will be per-view event data.
#
......@@ -34,4 +34,4 @@ describe('Controller: MastCtrl', function () {
it('should start with no radio buttons', function () {
expect(ctrl.radio).toBeNull();
});
});
\ No newline at end of file
});
......
......@@ -4,6 +4,7 @@ module.exports = function(config) {
config.set({
// base path that will be used to resolve all patterns (eg. files, exclude)
// the path is relative to this (karma.conf.js) file
basePath: '',
......@@ -17,6 +18,7 @@ module.exports = function(config) {
// library code...
'../tp/angular.js',
'../tp/angular-mocks.js',
'../tp/angular-route.js',
'../tp/d3.js',
'../tp/topojson.v1.min.js',
'../tp/jquery-2.1.1.min.js',
......
# Jasmine test files to reside in this directory - a peer to the web app code