From 565f69481e7345c2a442dfd3312a553261c5f2cf Mon Sep 17 00:00:00 2001
From: ste <git@grundell.co.uk>
Date: Tue, 29 May 2018 21:49:01 +0100
Subject: [PATCH 1/2] GPII-2992: Stop narrator from staying active after
 acceptance tests by waiting for AT to start.

---
 testData/solutions/win32.json5 | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/testData/solutions/win32.json5 b/testData/solutions/win32.json5
index 0dd28fd06..9b3cfdc0b 100644
--- a/testData/solutions/win32.json5
+++ b/testData/solutions/win32.json5
@@ -1243,20 +1243,20 @@
                 }
             }
         },
-        "start": [
-            {
-                "type": "gpii.windows.enableRegisteredAT",
-                "name": "Narrator",
-                "enable": true
-            }
-        ],
-        "stop": [
-            {
+        "launchHandlers": {
+            "launcher": {
                 "type": "gpii.windows.enableRegisteredAT",
-                "name": "Narrator",
-                "enable": false
+                "options": {
+                    "registryName": "Narrator",
+                    "getState": [
+                        {
+                            "type": "gpii.processReporter.find",
+                            "command": "Narrator.exe"
+                        }
+                    ]
+                }
             }
-        ],
+        },
         "isInstalled": [
             {
                 "type": "gpii.deviceReporter.alwaysInstalled"

From 77ca09a83a4358463041fda1c3fbe0ac45fd47d6 Mon Sep 17 00:00:00 2001
From: ste <git@grundell.co.uk>
Date: Thu, 7 Jun 2018 10:10:08 +0100
Subject: [PATCH 2/2] GPII-2992: Added narrator launch test

---
 tests/platform/windows/windows-builtIn-testSpec.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tests/platform/windows/windows-builtIn-testSpec.js b/tests/platform/windows/windows-builtIn-testSpec.js
index bfc3daf17..4db1c6149 100644
--- a/tests/platform/windows/windows-builtIn-testSpec.js
+++ b/tests/platform/windows/windows-builtIn-testSpec.js
@@ -49,6 +49,20 @@ gpii.tests.windows.builtIn = [
                             }
                         ]
                     }
+                }],
+                "com.microsoft.windows.narrator": [{
+                    "settings": {
+                        "running": false
+                    },
+                    "options": {
+                        "registryName": "Narrator",
+                        "getState": [
+                            {
+                                "type": "gpii.processReporter.find",
+                                "command": "Narrator.exe"
+                            }
+                        ]
+                    }
                 }]
             }
         },