GUI -- Added missing dependency to karma.conf.js
Change-Id: Id6cff0cae2847c387b1e20597ea112c7126f755f
Showing
6 changed files
with
19 additions
and
5 deletions
| ... | @@ -45,14 +45,14 @@ | ... | @@ -45,14 +45,14 @@ |
| 45 | <link rel="stylesheet" href="onos.css"> | 45 | <link rel="stylesheet" href="onos.css"> |
| 46 | <link rel="stylesheet" href="fw/mast/mast.css"> | 46 | <link rel="stylesheet" href="fw/mast/mast.css"> |
| 47 | 47 | ||
| 48 | - <!-- This is where contributed javascript get injected --> | 48 | + <!-- This is where contributed javascript will get injected --> |
| 49 | <!-- {INJECTED-JAVASCRIPT} --> | 49 | <!-- {INJECTED-JAVASCRIPT} --> |
| 50 | <script src="view/sample/sample.js"></script> | 50 | <script src="view/sample/sample.js"></script> |
| 51 | <script src="view/topo/topo.js"></script> | 51 | <script src="view/topo/topo.js"></script> |
| 52 | <!-- TODO: inject javascript refs server-side --> | 52 | <!-- TODO: inject javascript refs server-side --> |
| 53 | 53 | ||
| 54 | - <!-- This is where contributed stylesheets get injected --> | 54 | + <!-- This is where contributed stylesheets will get injected --> |
| 55 | - <!-- {INJECTED-CSS-STYLESHEETS} --> | 55 | + <!-- {INJECTED-STYLESHEETS} --> |
| 56 | <link rel="stylesheet" href="view/sample/sample.css"> | 56 | <link rel="stylesheet" href="view/sample/sample.css"> |
| 57 | <link rel="stylesheet" href="view/topo/topo.css"> | 57 | <link rel="stylesheet" href="view/topo/topo.css"> |
| 58 | <!-- TODO: inject style-sheet refs server-side --> | 58 | <!-- TODO: inject style-sheet refs server-side --> | ... | ... |
| 1 | The 'appext' directory is for "Application Extensions". That is to say, | 1 | The 'appext' directory is for "Application Extensions". That is to say, |
| 2 | this would be the path to applications contributing to the GUI. | 2 | this would be the path to applications contributing to the GUI. |
| 3 | + | ||
| 4 | +Note that these applications are 'external' to the base GUI, i.e. would | ||
| 5 | +be built and packaged in separate .jar/.war file. They would be installed | ||
| 6 | +via server-side injection. | ||
| 7 | + | ||
| 8 | +This directory is just a placeholder to reserve the path. | ... | ... |
web/gui/src/main/webapp/mock/README.txt
0 → 100644
| 1 | +# The 'mock' directory contains code that can emulate the server-side of | ||
| 2 | +# a web socket (probably using node.js) to facilitate the manual injection | ||
| 3 | +# of (JSON structured) events, to aid in the development / debugging of | ||
| 4 | +# client side code. | ||
| 5 | +# | ||
| 6 | +# Each subdirectory will be per-view event data. | ||
| 7 | +# |
| ... | @@ -34,4 +34,4 @@ describe('Controller: MastCtrl', function () { | ... | @@ -34,4 +34,4 @@ describe('Controller: MastCtrl', function () { |
| 34 | it('should start with no radio buttons', function () { | 34 | it('should start with no radio buttons', function () { |
| 35 | expect(ctrl.radio).toBeNull(); | 35 | expect(ctrl.radio).toBeNull(); |
| 36 | }); | 36 | }); |
| 37 | -}); | ||
| ... | \ No newline at end of file | ... | \ No newline at end of file |
| 37 | +}); | ... | ... |
| ... | @@ -4,6 +4,7 @@ module.exports = function(config) { | ... | @@ -4,6 +4,7 @@ module.exports = function(config) { |
| 4 | config.set({ | 4 | config.set({ |
| 5 | 5 | ||
| 6 | // base path that will be used to resolve all patterns (eg. files, exclude) | 6 | // base path that will be used to resolve all patterns (eg. files, exclude) |
| 7 | + // the path is relative to this (karma.conf.js) file | ||
| 7 | basePath: '', | 8 | basePath: '', |
| 8 | 9 | ||
| 9 | 10 | ||
| ... | @@ -17,6 +18,7 @@ module.exports = function(config) { | ... | @@ -17,6 +18,7 @@ module.exports = function(config) { |
| 17 | // library code... | 18 | // library code... |
| 18 | '../tp/angular.js', | 19 | '../tp/angular.js', |
| 19 | '../tp/angular-mocks.js', | 20 | '../tp/angular-mocks.js', |
| 21 | + '../tp/angular-route.js', | ||
| 20 | '../tp/d3.js', | 22 | '../tp/d3.js', |
| 21 | '../tp/topojson.v1.min.js', | 23 | '../tp/topojson.v1.min.js', |
| 22 | '../tp/jquery-2.1.1.min.js', | 24 | '../tp/jquery-2.1.1.min.js', | ... | ... |
web/gui/src/test/webapp/README.txt
deleted
100644 → 0
| 1 | -# Jasmine test files to reside in this directory - a peer to the web app code |
-
Please register or login to post a comment