Skip to content

Commit cfdda36

Browse files
committed
Merge pull request #24 from robertgates55/electron-fix
Updated the electron driver so that it works
2 parents 4e86aeb + 33319b5 commit cfdda36

File tree

4 files changed

+18
-5
lines changed

4 files changed

+18
-5
lines changed

pom.xml

100755100644
File mode changed.

src/main/java/com/frameworkium/config/DriverSetup.java

100755100644
File mode changed.

src/main/java/com/frameworkium/config/drivers/ElectronImpl.java

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,18 @@
55
import org.openqa.selenium.remote.DesiredCapabilities;
66
import org.openqa.selenium.remote.RemoteWebDriver;
77

8+
import java.net.MalformedURLException;
9+
import java.net.URL;
810
import java.util.HashMap;
911
import java.util.Map;
1012

1113
import static com.frameworkium.config.SystemProperty.APP_PATH;
14+
import static com.frameworkium.config.SystemProperty.GRID_URL;
1215

1316
public class ElectronImpl extends DriverType {
1417

18+
private static URL remoteURL;
19+
1520
@Override
1621
public DesiredCapabilities getDesiredCapabilities() {
1722
Map<String, String> chromeOptions = new HashMap<>();
@@ -20,17 +25,25 @@ public DesiredCapabilities getDesiredCapabilities() {
2025
} else {
2126
chromeOptions.put("binary", APP_PATH.getValue());
2227
}
23-
DesiredCapabilities desiredCapabilities = new DesiredCapabilities();
24-
desiredCapabilities.setCapability("host", "localhost");
25-
desiredCapabilities.setCapability("port", 9515);
28+
try {
29+
if (GRID_URL.isSpecified()) {
30+
remoteURL = new URL(GRID_URL.getValue());
31+
}
32+
else {
33+
remoteURL = new URL("http://localhost:9515");
34+
}
35+
}
36+
catch(MalformedURLException e) {
37+
throw new RuntimeException(e);
38+
}
39+
DesiredCapabilities desiredCapabilities = DesiredCapabilities.chrome();
2640
desiredCapabilities.setCapability("browserName", "chrome");
2741
desiredCapabilities.setCapability("chromeOptions", chromeOptions);
2842
return desiredCapabilities;
2943
}
3044

3145
@Override
3246
public WebDriver getWebDriverObject(DesiredCapabilities capabilities) {
33-
return new RemoteWebDriver(capabilities);
47+
return new RemoteWebDriver(remoteURL ,capabilities);
3448
}
35-
3649
}

src/main/java/com/frameworkium/reporting/AllureProperties.java

100755100644
File mode changed.

0 commit comments

Comments
 (0)