Skip to content

Commit 99e916b

Browse files
Alvaro LasernaAlvaro Laserna
authored andcommitted
fix ios close
1 parent 7c05659 commit 99e916b

File tree

4 files changed

+7
-15
lines changed

4 files changed

+7
-15
lines changed

src/main/java/testUI/IOSUtils/IOCapabilities.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,16 @@ public static DesiredCapabilities setIOSCapabilities(boolean browser) {
5454
wdaLocalPort =
5555
8100 + 20 * (Integer.parseInt(getUsePort().get(getUsePort().size() - 1)) -
5656
Configuration.baseAppiumPort) / 100;
57-
} else {
58-
wdaLocalPort = Configuration.wdaPort;
57+
capabilities.setCapability("appium:wdaLocalPort", wdaLocalPort);
5958
}
60-
capabilities.setCapability("wdaLocalPort", wdaLocalPort);
6159
capabilities.setCapability("appium:noReset", false);
62-
capabilities.setCapability("useNewWDA",
60+
capabilities.setCapability("appium:useNewWDA",
6361
Configuration.useNewWDA);
6462
capabilities.setCapability("appium:platformName", Platform.IOS);
6563
capabilities.setCapability("appium:automationName", "XCUITest");
66-
capabilities.setCapability("startIWDP", true);
67-
capabilities.setCapability("wdaLaunchTimeout",
64+
capabilities.setCapability("appium:wdaLaunchTimeout",
6865
Configuration.launchAppTimeout);
69-
capabilities.setCapability("commandTimeouts", 30000);
66+
capabilities.setCapability("appium:commandTimeouts", 30000);
7067
// ADD CUSTOM CAPABILITIES
7168
if (!Configuration.addMobileDesiredCapabilities.asMap().isEmpty()) {
7269
for (String key : addMobileDesiredCapabilities.asMap().keySet()) {

src/main/java/testUI/TestUIServer.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -367,10 +367,6 @@ public static void stop() {
367367
if (!Configuration.automationType.equals(DESKTOP_PLATFORM)) {
368368
removeUsePort(driver - 1);
369369
removeUseBootstrapPort(driver - 1);
370-
if (Configuration.automationType.equals(IOS_PLATFORM)) {
371-
getDrivers().get(driver - 1).close();
372-
sleep(500);
373-
}
374370
getDrivers().get(driver - 1).quit();
375371
removeDriver(driver - 1);
376372
if (getAppiumServices() != null && getAppiumServices().size() >= driver) {

src/test/java/TestRunners/TestBrowser.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package TestRunners;
22

3-
import com.codeborne.selenide.FileDownloadMode;
4-
import com.codeborne.selenide.WebDriverRunner;
53
import io.netty.handler.logging.LogLevel;
64
import io.qameta.allure.junit4.DisplayName;
75
import org.junit.Test;
@@ -16,9 +14,7 @@
1614
import static testUI.TestUIServer.stop;
1715
import static testUI.UIOpen.open;
1816
import static testUI.UIUtils.*;
19-
import static testUI.Utils.AppiumHelps.sleep;
2017
import static testUI.Utils.By.*;
21-
import static testUI.Utils.Performance.getListOfCommandsTime;
2218
import static testUI.Utils.Performance.logAverageTime;
2319
import static testUI.elements.TestUI.E;
2420
import static testUI.elements.TestUI.raiseSoftAsserts;

src/test/java/TestRunners/TestIOS.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import org.junit.Test;
55
import testUI.Configuration;
66

7+
import static testUI.TestUIServer.stop;
78
import static testUI.UIOpen.open;
89

910
public class TestIOS {
@@ -15,5 +16,7 @@ public void testIOSBrowser() {
1516
Configuration.serverLogLevel = "debug";
1617
Configuration.useNewWDA = false;
1718
open("https://www.facebook.com");
19+
stop();
20+
open("https://www.facebook.com");
1821
}
1922
}

0 commit comments

Comments
 (0)