fix: fixed a number of failing bindings (#38)

Capgemini · Oct 20, 2020 · 693ac9d · 693ac9d
1 parent dc8a5eb
commit 693ac9d
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/bindings/src/Capgemini.PowerApps.SpecFlowBindings/TestDriver.cs b/bindings/src/Capgemini.PowerApps.SpecFlowBindings/TestDriver.cs
@@ -38,25 +38,25 @@ public TestDriver(IJavaScriptExecutor javascriptExecutor)
         /// <inheritdoc cref="ITestDriver"/>
         public void LoadTestData(string data)
         {
-            this.ExecuteAsyncScriptWithExceptionOnReject($"loadTestData(`{data}`)");
+            this.ExecuteDriverFunctionAsync($"loadTestData(`{data}`)");
         }
 
         /// <inheritdoc cref="ITestDriver"/>
         public void DeleteTestData()
         {
-            this.ExecuteAsyncScriptWithExceptionOnReject("deleteTestData()");
+            this.ExecuteDriverFunctionAsync("deleteTestData()");
         }
 
         /// <inheritdoc cref="ITestDriver"/>
         public void OpenTestRecord(string recordAlias)
         {
-            this.ExecuteAsyncScriptWithExceptionOnReject($"openTestRecord('{recordAlias}')");
+            this.ExecuteDriverFunctionAsync($"openTestRecord('{recordAlias}')");
         }
 
         /// <inheritdoc/>
         public EntityReference GetTestRecordReference(string recordAlias)
         {
-            var obj = (Dictionary<string, object>)this.javascriptExecutor.ExecuteScript($"{TestDriverReference}.getRecordReference('{recordAlias}');");
+            var obj = (Dictionary<string, object>)this.ExecuteDriverFunction($"getRecordReference('{recordAlias}')");
 
             return new EntityReference((string)obj["entityType"], Guid.Parse((string)obj["id"]));
         }
@@ -66,7 +66,12 @@ private static string GetExecuteScriptForAsyncFunction(string functionCall)
             return $"{TestDriverReference}.{functionCall}.then(arguments[arguments.length - 1]).catch(e => {{ arguments[arguments.length - 1](`{ErrorPrefix}: ${{ e.message }}`); }});";
         }
 
-        private object ExecuteAsyncScriptWithExceptionOnReject(string functionCall)
+        private object ExecuteDriverFunction(string functionCall)
+        {
+            return this.javascriptExecutor.ExecuteScript($"return {TestDriverReference}.{functionCall};");
+        }
+
+        private object ExecuteDriverFunctionAsync(string functionCall)
         {
             var result = this.javascriptExecutor.ExecuteAsyncScript(GetExecuteScriptForAsyncFunction(functionCall));