GUI -- reworking code to eliminate unnecessary 'ONOS' global.
- re-package fn and keys factories into util module.
Change-Id: I3d9f50b9a91468140845e862aff3fdb518948774
diff --git a/web/gui/src/main/webapp/tests/karma.conf.js b/web/gui/src/main/webapp/tests/karma.conf.js
index 5a25638..4e28fc6 100644
--- a/web/gui/src/main/webapp/tests/karma.conf.js
+++ b/web/gui/src/main/webapp/tests/karma.conf.js
@@ -22,12 +22,15 @@
'../tp/jquery-2.1.1.min.js',
// production code...
+ // make sure modules are defined first...
'../app/onos.js',
- '../app/fw/lib/*.js',
- '../app/fw/mast/*.js',
+ '../app/fw/util/util.js',
+ // now load services etc. that augment the modules
+ '../app/**/*.js',
// unit test code...
- 'fw/lib/*.js'
+ 'app/*-spec.js',
+ 'app/**/*-spec.js'
],