GPII-2538: Fixed all unit and acceptance tests affected by the implem…

…entation of secured /untrusted-settings endpoint.
javihernandez · Sep 23, 2017 · 3f4f3ce · 3f4f3ce
1 parent 3db7f97
commit 3f4f3ce
Show file tree

Hide file tree

Showing 12 changed files with 52 additions and 39 deletions.
diff --git a/gpii/node_modules/accessRequester/src/accessRequester.js b/gpii/node_modules/accessRequester/src/accessRequester.js
diff --git a/gpii/node_modules/accessRequester/test/AccessRequesterTests.js b/gpii/node_modules/accessRequester/test/AccessRequesterTests.js
diff --git a/gpii/node_modules/flowManager/configs/gpii.flowManager.untrusted.config.development.json b/gpii/node_modules/flowManager/configs/gpii.flowManager.untrusted.config.development.json
diff --git a/gpii/node_modules/flowManager/src/UntrustedFlowManager.js b/gpii/node_modules/flowManager/src/UntrustedFlowManager.js
diff --git a/gpii/node_modules/flowManager/test/SettingsDataSourceTests.js b/gpii/node_modules/flowManager/test/SettingsDataSourceTests.js
diff --git a/gpii/node_modules/gpii-oauth2/gpii-oauth2-authz-server/src/AuthGrantFinder.js b/gpii/node_modules/gpii-oauth2/gpii-oauth2-authz-server/src/AuthGrantFinder.js
diff --git a/gpii/node_modules/gpii-oauth2/gpii-oauth2-authz-server/src/ClientService.js b/gpii/node_modules/gpii-oauth2/gpii-oauth2-authz-server/src/ClientService.js
diff --git a/testData/clientCredentials/pilot.json b/testData/clientCredentials/pilot.json
@@ -1,4 +1,4 @@
 {
-    "id": "pilot-computer",
-    "secret": "pilot-computer-secret"
+    "client_id": "pilot-computer",
+    "client_secret": "pilot-computer-secret"
 }
diff --git a/tests/UntrustedBrowserChannelTests.js b/tests/UntrustedBrowserChannelTests.js
@@ -25,6 +25,7 @@ fluid.require("%flowManager/test/shared/BrowserChannelTestDefs.js");
 
 fluid.registerNamespace("gpii.tests.untrusted.flowManager.browserChannel");
 
+// The test pouchdb data is from %universal/tests/platform/cloud/OAuth2AcceptanceDataStore.json
 gpii.tests.untrusted.flowManager.browserChannel.testDefs = fluid.transform(gpii.tests.flowManager.browserChannel.testDefs, function (testDefIn) {
     var testDef = fluid.extend(true, {}, testDefIn, {
         gradeNames: ["gpii.test.pouch.pouchTestCaseHolder"],

diff --git a/tests/UntrustedDevelopmentTests.js b/tests/UntrustedDevelopmentTests.js
@@ -27,6 +27,7 @@ gpii.loadTestingSupport();
 
 fluid.registerNamespace("gpii.tests.untrusted.development");
 
+// The test pouchdb data is from %universal/tests/platform/cloud/OAuth2AcceptanceDataStore.json
 gpii.tests.untrusted.development.testDefs = fluid.transform(gpii.tests.development.testDefs, function (testDefIn) {
     var testDef = fluid.extend(true, {}, testDefIn, {
         config: {

diff --git a/tests/all-tests.js b/tests/all-tests.js
@@ -58,6 +58,7 @@ var testIncludes = [
     "../gpii/node_modules/flowManager/test/UpdateTests.js",
     "../gpii/node_modules/flowManager/test/BrowserChannelTests.js",
     "../gpii/node_modules/flowManager/test/GetUserTokenTests.js",
+    "../gpii/node_modules/flowManager/test/SettingsDataSourceTests.js",
     "../gpii/node_modules/gpii-oauth2/gpii-oauth2-datastore/test/DbDataStoreTests.js",
     "../gpii/node_modules/matchMakerFramework/test/MatchMakerFrameworkTests.js",
     "../gpii/node_modules/flatMatchMaker/test/FlatMatchMakerTests.js",

diff --git a/tests/platform/cloud/OAuth2AcceptanceDataStore.json b/tests/platform/cloud/OAuth2AcceptanceDataStore.json
@@ -19,6 +19,30 @@
         "gpiiToken": "alice_gpii_token",
         "userId": "user-2"
     },
+    {
+        "_id": "gpiiToken-2",
+        "type": "gpiiToken",
+        "gpiiToken": "chrome2",
+        "userId": null
+    },
+    {
+        "_id": "gpiiToken-3",
+        "type": "gpiiToken",
+        "gpiiToken": "chrome_and_firefox",
+        "userId": null
+    },
+    {
+        "_id": "gpiiToken-4",
+        "type": "gpiiToken",
+        "gpiiToken": "testUser1",
+        "userId": null
+    },
+    {
+        "_id": "gpiiToken-5",
+        "type": "gpiiToken",
+        "gpiiToken": "sammy",
+        "userId": null
+    },
     {
         "_id": "client-1",
         "type": "webPrefsConsumerClient",
@@ -69,6 +93,14 @@
         "oauth2ClientSecret": "Bakersfield-AJC-client-secret",
         "userId": "user-1"
     },
+    {
+        "_id": "client-8",
+        "type": "gpiiAppInstallationClient",
+        "name": "Pilot computers",
+        "oauth2ClientId": "pilot-computer",
+        "oauth2ClientSecret": "pilot-computer-secret",
+        "userId": "user-1"
+    },
     {
         "_id": "authorization-1",
         "type": "webPrefsConsumerAuthorization",