#788 ignore all proxy-related tests in PhantomJS

I don't know why, but PhantomJS seems to ignore proxy
selenide · Aug 28, 2018 · ede61c6 · ede61c6
1 parent 6f61dc7
commit ede61c6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/src/test/java/integration/FileDownloadViaProxyTest.java b/src/test/java/integration/FileDownloadViaProxyTest.java
@@ -12,17 +12,13 @@
 import static com.codeborne.selenide.Selectors.byText;
 import static com.codeborne.selenide.Selenide.$;
 import static com.codeborne.selenide.Selenide.open;
-import static com.codeborne.selenide.WebDriverRunner.isPhantomjs;
 import static org.apache.commons.io.FileUtils.readFileToString;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
 
 class FileDownloadViaProxyTest extends IntegrationTest {
   private File folder = new File(Configuration.reportsFolder);
 
   @BeforeEach
   void setUp() {
-    assumeFalse(isPhantomjs()); // Why it's not working? It's magic for me...
-
     toggleProxy(true);
     openFile("page_with_uploads.html");
   }

diff --git a/src/test/java/integration/IntegrationTest.java b/src/test/java/integration/IntegrationTest.java
@@ -36,6 +36,7 @@
 import static com.codeborne.selenide.WebDriverRunner.isLegacyFirefox;
 import static com.codeborne.selenide.WebDriverRunner.isPhantomjs;
 import static com.codeborne.selenide.WebDriverRunner.isSafari;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
 import static org.openqa.selenium.net.PortProber.findFreePort;
 
 @ExtendWith({ScreenShooterExtension.class, TextReportExtension.class, VideoExtension.class})
@@ -128,6 +129,10 @@ <T> T openFile(String fileName, Class<T> pageObjectClass) {
   }
 
   protected void toggleProxy(boolean proxyEnabled) {
+    if (proxyEnabled) {
+      assumeFalse(isPhantomjs()); // I don't know why, but PhantomJS seems to ignore proxy
+    }
+
     if (Configuration.proxyEnabled != proxyEnabled) {
       Selenide.close();
     }

diff --git a/src/test/java/integration/proxy/ProxyServerUsageTest.java b/src/test/java/integration/proxy/ProxyServerUsageTest.java
@@ -13,8 +13,6 @@
 import static com.codeborne.selenide.Selenide.$;
 import static com.codeborne.selenide.WebDriverRunner.closeWebDriver;
 import static com.codeborne.selenide.WebDriverRunner.getSelenideProxy;
-import static com.codeborne.selenide.WebDriverRunner.isPhantomjs;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
 
 class ProxyServerUsageTest extends IntegrationTest {
   private List<String> requests = new ArrayList<>();
@@ -23,7 +21,6 @@ class ProxyServerUsageTest extends IntegrationTest {
   @BeforeEach
   @AfterEach
   void setUp() {
-    assumeFalse(isPhantomjs()); // I don't know why, but PhantomJS seems to ignore proxy
     closeWebDriver();
     toggleProxy(true);
   }