Merge branch 'master' into GPII-1223

colinbdclark · Sep 29, 2016 · 49eb61a · 49eb61a
2 parents 7c6b5e0 + 2e9af22
commit 49eb61a
Show file tree

Hide file tree

Showing 4 changed files with 121 additions and 2 deletions.
diff --git a/gpii/node_modules/settingsHandlers/src/settingsHandlerUtilities.js b/gpii/node_modules/settingsHandlers/src/settingsHandlerUtilities.js
diff --git a/gpii/node_modules/settingsHandlers/test/data/basic.json b/gpii/node_modules/settingsHandlers/test/data/basic.json
diff --git a/gpii/node_modules/settingsHandlers/test/settingsHandlerUtilitiesTests.js b/gpii/node_modules/settingsHandlers/test/settingsHandlerUtilitiesTests.js
diff --git a/tests/all-tests.js b/tests/all-tests.js
@@ -61,6 +61,7 @@ var testIncludes = [
     "../gpii/node_modules/settingsHandlers/test/XMLSettingsHandlerTests.js",
     "../gpii/node_modules/settingsHandlers/test/INISettingsHandlerTests.js",
     "../gpii/node_modules/settingsHandlers/test/WebSocketsSettingsHandlerTests.js",
+    "../gpii/node_modules/settingsHandlers/test/settingsHandlerUtilitiesTests.js",
     "../gpii/node_modules/preferencesServer/test/preferencesServerTests.js",
     "../gpii/node_modules/rawPreferencesServer/test/RawPreferencesTest.js",
     "../gpii/node_modules/ontologyHandler/test/node/OntologyHandlerTests.js",