SeleniumHQ
diff --git a/‎dotnet/src/webdriver/Remote/RemoteWebDriver.cs‎
Lines changed: 3 additions & 0 deletions b/‎dotnet/src/webdriver/Remote/RemoteWebDriver.cs‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎dotnet/test/common/CookieImplementationTest.cs‎
Lines changed: 1 addition & 1 deletion b/‎dotnet/test/common/CookieImplementationTest.cs‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎dotnet/test/common/ExecutingAsyncJavascriptTest.cs‎
Lines changed: 2 additions & 2 deletions b/‎dotnet/test/common/ExecutingAsyncJavascriptTest.cs‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎dotnet/test/common/ExecutingJavascriptTest.cs‎
Lines changed: 1 addition & 1 deletion b/‎dotnet/test/common/ExecutingJavascriptTest.cs‎
Lines changed: 1 addition & 1 deletion
@@ -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));
                     }
 
@@ -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");
         }
 
@@ -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]
 
@@ -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]
Original file line number	Diff line number	Diff line change
`@@ -1435,6 +1435,9 @@ private static void UnpackAndThrowOnError(Response errorResponse)`
`1435`	`1435`	`case WebDriverResult.InvalidArgument:`
`1436`	`1436`	`throw new WebDriverException(errorMessage);`
`1437`	`1437`
	`1438`	`+ case WebDriverResult.UnexpectedJavaScriptError:`
	`1439`	`+ throw new WebDriverException(errorMessage);`
	`1440`	`+`
`1438`	`1441`	`default:`
`1439`	`1442`	`throw new InvalidOperationException(string.Format(CultureInfo.InvariantCulture, "{0} ({1})", errorMessage, errorResponse.Status));`
`1440`	`1443`	`}`
Original file line number	Diff line number	Diff line change
`@@ -634,7 +634,7 @@ public void ShouldNotShowCookieAddedToDifferentDomain()`
`634`	`634`	`driver.Url = macbethPage;`
`635`	`635`	`IOptions options = driver.Manage();`
`636`	`636`	`Cookie cookie = new Cookie("Bart", "Simpson", EnvironmentManager.Instance.UrlBuilder.HostName + ".com", EnvironmentManager.Instance.UrlBuilder.Path, null);`
`637`		`- Assert.Throws<WebDriverException>(() => options.Cookies.AddCookie(cookie));`
	`637`	`+ Assert.That(() => options.Cookies.AddCookie(cookie), Throws.InstanceOf<WebDriverException>());`
`638`	`638`	`ReadOnlyCollection<Cookie> cookies = options.Cookies.AllCookies;`
`639`	`639`	`Assert.IsFalse(cookies.Contains(cookie), "Invalid cookie was returned");`
`640`	`640`	`}`
Original file line number	Diff line number	Diff line change
`@@ -166,14 +166,14 @@ public void ShouldTimeoutIfScriptDoesNotInvokeCallbackWithLongTimeout()`
`166`	`166`	`public void ShouldDetectPageLoadsWhileWaitingOnAnAsyncScriptAndReturnAnError()`
`167`	`167`	`{`
`168`	`168`	`driver.Url = ajaxyPage;`
`169`		`- Assert.Throws<InvalidOperationException>(() => executor.ExecuteAsyncScript("window.location = '" + dynamicPage + "';"));`
	`169`	`+ Assert.That(() => executor.ExecuteAsyncScript("window.location = '" + dynamicPage + "';"), Throws.InstanceOf<WebDriverException>());`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`[Test]`
`173`	`173`	`public void ShouldCatchErrorsWhenExecutingInitialScript()`
`174`	`174`	`{`
`175`	`175`	`driver.Url = ajaxyPage;`
`176`		`- Assert.Throws<InvalidOperationException>(() => executor.ExecuteAsyncScript("throw Error('you should catch this!');"));`
	`176`	`+ Assert.That(() => executor.ExecuteAsyncScript("throw Error('you should catch this!');"), Throws.InstanceOf<WebDriverException>());`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ public void ShouldThrowAnExceptionWhenTheJavascriptIsBad()`
`219`	`219`	`return;`
`220`	`220`
`221`	`221`	`driver.Url = xhtmlTestPage;`
`222`		`- Assert.Throws<WebDriverException>(() => ExecuteScript("return squiggle();"));`
	`222`	`+ Assert.That(() => ExecuteScript("return squiggle();"), Throws.InstanceOf<WebDriverException>());`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`[Test]`