Merge branch 'master' into GPII-1309

GPII · Nov 26, 2015 · 4a6d39f · 4a6d39f
2 parents e97de2d + 5361124
commit 4a6d39f
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 25 deletions.
diff --git a/gpii/node_modules/deviceReporter/src/DeviceReporter.js b/gpii/node_modules/deviceReporter/src/DeviceReporter.js
diff --git a/gpii/node_modules/deviceReporter/src/DeviceReporterUtilities.js b/gpii/node_modules/deviceReporter/src/DeviceReporterUtilities.js
diff --git a/gpii/node_modules/testing/src/Integration.js b/gpii/node_modules/testing/src/Integration.js
diff --git a/tests/platform/windows/windows-dynamicDeviceReporter-testSpec.js b/tests/platform/windows/windows-dynamicDeviceReporter-testSpec.js
@@ -21,6 +21,7 @@ gpii.tests.deviceReporterAware.windows = [
     {
         name: "Testing screenreader_nvda using Flat matchmaker",
         userToken: "screenreader_nvda",
+        gradeNames: "gpii.test.integration.deviceReporterAware.windows",
         settingsHandlers: {
             "gpii.settingsHandlers.INISettingsHandler": {
                 "data": [
@@ -57,27 +58,44 @@ gpii.tests.deviceReporterAware.windows = [
                 "expectConfigured": "1",
                 "expectRestored": "0"
             }
-        ]
+        ],
+        deviceReporters: {
+            "gpii.deviceReporter.registryKeyExists": {
+                "expectInstalled": [{
+                    "hKey": "HKEY_LOCAL_MACHINE",
+                    "path": "Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\nvda.exe",
+                    "subPath": ""
+                }]
+            }
+        }
     },
     {
         name: "Testing readwritegold_application1 using Flat matchmaker",
         userToken: "readwritegold_application1",
-        settingsHandlers: {
-
-        },
+        gradeNames: "gpii.test.integration.deviceReporterAware.windows",
+        settingsHandlers: {},
         processes: [
             {
                 "command": "tasklist /fi \"STATUS eq RUNNING\" /FI \"IMAGENAME eq ReadAndWrite.exe\" | find /I \"ReadAndWrite.exe\" /C",
                 "expectConfigured": "0",
                 "expectRestored": "0"
             }
-        ]
+        ],
+        deviceReporters: {
+            "gpii.deviceReporter.registryKeyExists": {
+                "expectInstalled": [{
+                    "hKey": "HKEY_LOCAL_MACHINE",
+                    "path": "Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\nvda.exe",
+                    "subPath": ""
+                }]
+            }
+        }
     }
 ];
 
 module.exports = gpii.test.bootstrap({
     testDefs:  "gpii.tests.deviceReporterAware.windows",
     configName: "windows-dynamicDeviceReporter-config",
     configPath: "configs"
-}, ["gpii.test.integration.testCaseHolder.windows"],
+}, ["gpii.test.integration.testCaseHolder.windows", "gpii.test.integration.deviceReporterAware.windows"],
     module, require, __dirname);