Updating unhandled JavaScript errors to throw WebDriverException in .NET

Author: jimevans

dotnet/src/webdriver/Remote/RemoteWebDriver.cs

@@ -1435,6 +1435,9 @@ private static void UnpackAndThrowOnError(Response errorResponse)
                         case WebDriverResult.InvalidArgument:
                             throw new WebDriverException(errorMessage);
 
+                        case WebDriverResult.UnexpectedJavaScriptError:
+                            throw new WebDriverException(errorMessage);
+
                         default:
                             throw new InvalidOperationException(string.Format(CultureInfo.InvariantCulture, "{0} ({1})", errorMessage, errorResponse.Status));
                     }

dotnet/test/common/CookieImplementationTest.cs

@@ -634,7 +634,7 @@ public void ShouldNotShowCookieAddedToDifferentDomain()
             driver.Url = macbethPage;
             IOptions options = driver.Manage();
             Cookie cookie = new Cookie("Bart", "Simpson", EnvironmentManager.Instance.UrlBuilder.HostName + ".com", EnvironmentManager.Instance.UrlBuilder.Path, null);
-            Assert.Throws<WebDriverException>(() => options.Cookies.AddCookie(cookie));
+            Assert.That(() => options.Cookies.AddCookie(cookie), Throws.InstanceOf<WebDriverException>());
             ReadOnlyCollection<Cookie> cookies = options.Cookies.AllCookies;
             Assert.IsFalse(cookies.Contains(cookie), "Invalid cookie was returned");
         }

dotnet/test/common/ExecutingAsyncJavascriptTest.cs

@@ -166,14 +166,14 @@ public void ShouldTimeoutIfScriptDoesNotInvokeCallbackWithLongTimeout()
         public void ShouldDetectPageLoadsWhileWaitingOnAnAsyncScriptAndReturnAnError()
         {
             driver.Url = ajaxyPage;
-            Assert.Throws<InvalidOperationException>(() => executor.ExecuteAsyncScript("window.location = '" + dynamicPage + "';"));
+            Assert.That(() => executor.ExecuteAsyncScript("window.location = '" + dynamicPage + "';"), Throws.InstanceOf<WebDriverException>());
         }
 
         [Test]
         public void ShouldCatchErrorsWhenExecutingInitialScript()
         {
             driver.Url = ajaxyPage;
-            Assert.Throws<InvalidOperationException>(() => executor.ExecuteAsyncScript("throw Error('you should catch this!');"));
+            Assert.That(() => executor.ExecuteAsyncScript("throw Error('you should catch this!');"), Throws.InstanceOf<WebDriverException>());
         }
 
         [Test]

dotnet/test/common/ExecutingJavascriptTest.cs

@@ -219,7 +219,7 @@ public void ShouldThrowAnExceptionWhenTheJavascriptIsBad()
                 return;
 
             driver.Url = xhtmlTestPage;
-            Assert.Throws<WebDriverException>(() => ExecuteScript("return squiggle();"));
+            Assert.That(() => ExecuteScript("return squiggle();"), Throws.InstanceOf<WebDriverException>());
         }
 
         [Test]