GUI -- Added missing dependency to karma.conf.js
Change-Id: Id6cff0cae2847c387b1e20597ea112c7126f755f
diff --git a/web/gui/src/main/webapp/app/index.html b/web/gui/src/main/webapp/app/index.html
index b96e408..9cbba33 100644
--- a/web/gui/src/main/webapp/app/index.html
+++ b/web/gui/src/main/webapp/app/index.html
@@ -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 -->
diff --git a/web/gui/src/main/webapp/appext/README.txt b/web/gui/src/main/webapp/appext/README.txt
index ce9e361..3008988 100644
--- a/web/gui/src/main/webapp/appext/README.txt
+++ b/web/gui/src/main/webapp/appext/README.txt
@@ -1,2 +1,8 @@
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.
diff --git a/web/gui/src/main/webapp/mock/README.txt b/web/gui/src/main/webapp/mock/README.txt
new file mode 100644
index 0000000..e864d95
--- /dev/null
+++ b/web/gui/src/main/webapp/mock/README.txt
@@ -0,0 +1,7 @@
+# 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.
+#
diff --git a/web/gui/src/main/webapp/tests/app/mast/mast-spec.js b/web/gui/src/main/webapp/tests/app/fw/mast/mast-spec.js
similarity index 99%
rename from web/gui/src/main/webapp/tests/app/mast/mast-spec.js
rename to web/gui/src/main/webapp/tests/app/fw/mast/mast-spec.js
index bf8194e..f4857ef 100644
--- a/web/gui/src/main/webapp/tests/app/mast/mast-spec.js
+++ b/web/gui/src/main/webapp/tests/app/fw/mast/mast-spec.js
@@ -34,4 +34,4 @@
it('should start with no radio buttons', function () {
expect(ctrl.radio).toBeNull();
});
-});
\ No newline at end of file
+});
diff --git a/web/gui/src/main/webapp/tests/karma.conf.js b/web/gui/src/main/webapp/tests/karma.conf.js
index 4e28fc6..d4df6ab 100644
--- a/web/gui/src/main/webapp/tests/karma.conf.js
+++ b/web/gui/src/main/webapp/tests/karma.conf.js
@@ -4,6 +4,7 @@
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 @@
// 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',
diff --git a/web/gui/src/test/webapp/README.txt b/web/gui/src/test/webapp/README.txt
deleted file mode 100644
index 2cc6d0f..0000000
--- a/web/gui/src/test/webapp/README.txt
+++ /dev/null
@@ -1 +0,0 @@
-# Jasmine test files to reside in this directory - a peer to the web app code