Changing some ignores to @JavascriptEnabled

SeleniumHQ · Apr 13, 2017 · 3326809 · 3326809
1 parent d063185
commit 3326809
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/java/client/test/org/openqa/selenium/AlertsTest.java b/java/client/test/org/openqa/selenium/AlertsTest.java
@@ -227,8 +227,8 @@ public void testShouldAllowTheUserToGetTheTextOfAnAlert() {
     assertEquals("cheese", value);
   }
 
+  @JavascriptEnabled
   @Test
-  @Ignore(value = HTMLUNIT, reason="test should enable JavaScript")
   public void testShouldAllowTheUserToGetTheTextOfAPrompt() {
     driver.get(promptPage(null));
 
@@ -499,9 +499,9 @@ public void testShouldHandleAlertOnPageBeforeUnload() {
     wait.until(titleIs("Success"));
   }
 
+  @JavascriptEnabled
   @NoDriverAfterTest
   @Test
-  @Ignore(value = HTMLUNIT, reason="test should enable JavaScript")
   public void testShouldHandleAlertOnPageBeforeUnloadAtQuit() {
     String blank = appServer.create(new Page().withTitle("Success"));
     driver.get(appServer.create(new Page()

diff --git a/java/client/test/org/openqa/selenium/ExecutingAsyncJavascriptTest.java b/java/client/test/org/openqa/selenium/ExecutingAsyncJavascriptTest.java
@@ -358,11 +358,11 @@ public void throwsIfAlertHappensDuringScript() {
     driver.getTitle();
   }
 
+  @JavascriptEnabled
   @Test
   @Ignore(CHROME)
   @Ignore(IE)
   @Ignore(MARIONETTE)
-  @Ignore(value = HTMLUNIT, reason="test should enable JavaScript")
   @NeedsLocalEnvironment(reason = "Relies on timing")
   public void throwsIfScriptTriggersAlertWhichTimesOut() {
     driver.get(pages.simpleTestPage);

diff --git a/java/client/test/org/openqa/selenium/UnexpectedAlertBehaviorTest.java b/java/client/test/org/openqa/selenium/UnexpectedAlertBehaviorTest.java
@@ -57,8 +57,8 @@ public void quitDriver() throws Exception {
     }
   }
 
+  @JavascriptEnabled
   @Test
-  @Ignore(value = HTMLUNIT, reason="test should enable JavaScript")
   public void canAcceptUnhandledAlert() {
     runScenarioWithUnhandledAlert(UnexpectedAlertBehaviour.ACCEPT, "This is a default value");
   }
@@ -77,29 +77,29 @@ public void dismissUnhandledAlertsByDefault() {
     runScenarioWithUnhandledAlert(null, "null");
   }
 
+  @JavascriptEnabled
   @Test
   @Ignore(value = CHROME, reason = "Unstable Chrome behavior")
-  @Ignore(value = HTMLUNIT, reason = "test should enable JavaScript")
   public void canIgnoreUnhandledAlert() {
     Throwable t = catchThrowable(
         () -> runScenarioWithUnhandledAlert(UnexpectedAlertBehaviour.IGNORE, "Text ignored"));
     assertThat(t, instanceOf(UnhandledAlertException.class));
     driver2.switchTo().alert().dismiss();
   }
 
+  @JavascriptEnabled
   @Test
-  @Ignore(value = HTMLUNIT, reason="test should enable JavaScript")
   public void canSpecifyUnhandledAlertBehaviourUsingCapabilities() {
     desiredCaps.setCapability(UNEXPECTED_ALERT_BEHAVIOUR, UnexpectedAlertBehaviour.ACCEPT);
     driver2 = new WebDriverBuilder().setDesiredCapabilities(desiredCaps).get();
 
     runScenarioWithUnhandledAlert("This is a default value");
   }
 
+  @JavascriptEnabled
   @Test
   @Ignore(value = IE, reason = "required capabilities not implemented")
   @Ignore(value = CHROME, reason = "required capabilities not implemented")
-  @Ignore(value = HTMLUNIT, reason = "test should enable JavaScript")
   public void requiredUnhandledAlertCapabilityHasPriorityOverDesired() {
     // TODO: Resolve why this test doesn't work on the remote server
     assumeTrue(TestUtilities.isLocal());