Skip to content

Commit

Permalink
Update to Selenium 4.8.0 (undera#26)
Browse files Browse the repository at this point in the history
* Upgrade of dependencies.
Removal of deprecated Phantomjs.
Removal of deprecated code.
Addition of "SuppressWarnings" tags where needed. To de resolved at a later stage.

* Adding IE capabilities for RemoteWebDriver.

* Upgrade of function call.

* Addition of field in the UI to set the path to the Firefox Gecko driver.

* Wiki update.

* Addition of input field for msegde.exe

* Clean-ups and finalisations.

* Addition of IE11 in MsEdge for Remote execution.

* Integrating changes from Shinu on Aug 26, 2019.

* Merging of thefuckingcode changes from Apr 17, 2021.

* Setting of default value of path to msedge.exe

* Update of Chrome tests to JDK 17.

* Update of Firefox tests to JDK 17.

* Upgrade of HTMLUntit tests to JDK 17.

* Update of InternetExplorer tests to JDK 17.

* Update of RemoteDriver tests to JDK 17.

* Update of WebDriver tests to JDK 17.

* Formatting fixes.

* Formatting fixes 2.

* Formatting fixes #3.

* Addition of Geckodriver v0.31 for Firefox tests.

* Usage of GeckoDriver default service for unit tests instead of real Geckodriver.exe.

* Update to Selenium 4.5

* Ui fix.

* Addition of geckodriver to travis CI for the firefox tests

* Matching Continous Integration test conditions.

* Setting IE's Protected Mode to "off" to allow IE to start in all environments.

* Removaĺ of path to Edge as from IEDriver v4.5.0, the driver will
 automatically locate Edge on the system.

* Ui Refactor 1

* Update to Seleniuṁ 4.6.0

* UI Refactor

* Adding of new wiki page for direct browseŕ testing.

* Updating wiki pages for new UI.

* Tests update 1.

* Update of Chrome and IE tests.

* Pom update.

* Imporţclean-ups.

* Update of Readme.md.

* Fix of broken wiki links.

* Fix of broken link #2.

* Take #3

* Code format

* Code format #2

* Syntax highlight.

* Initial Browser URL now in UI and not hard coded.

* Test fixes.

* Upgrade to Selenium 4.7.2 and addition of driver for Edge.

* Update of tests.

* Removing "ignoring zoom levels" in IE as it is no longer required from Seleniuṁ 4.7.0.

* Upgrade to Selenium 4.8.0
  • Loading branch information
rbourga authored Feb 14, 2023
1 parent 3a716d5 commit f221739
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 19 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
sudo: false # to use new infrastructure
language: java
addons:
firefox: "106.0.2"
firefox: "109.0.1"
before_install:
- wget https://github.com/mozilla/geckodriver/releases/download/v0.32.0/geckodriver-v0.32.0-linux64.tar.gz
- wget https://github.com/mozilla/geckodriver/releases/download/v0.32.2/geckodriver-v0.32.2-linux64.tar.gz
- mkdir geckodriver
- tar -xzf geckodriver-v0.32.0-linux64.tar.gz -C geckodriver
- tar -xzf geckodriver-v0.32.2-linux64.tar.gz -C geckodriver
- export PATH=$PATH:$PWD/geckodriver
install: "mvn -Dmaven.test.skip=true clean install --batch-mode"
script: "mvn -Djava.awt.headless=true -Dmaven.test.redirectTestOutputToFile=true --fail-at-end --batch-mode org.jacoco:jacoco-maven-plugin:prepare-agent test org.jacoco:jacoco-maven-plugin:report"
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>kg.apc</groupId>
<artifactId>jmeter-plugins-webdriver</artifactId>
<version>4.7.2</version>
<version>4.8.0</version>
<packaging>jar</packaging>

<name>WebDriver/Selenium</name>
Expand Down Expand Up @@ -34,7 +34,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<selenium.version>4.7.2</selenium.version>
<selenium.version>4.8.0</selenium.version>
</properties>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,9 @@ protected ChromeOptions createChromeOptions() {
if (isBrowserMaximized()) {
options.addArguments("--start-maximized");
}
options.setHeadless(isHeadless());
if (isHeadless()) {
options.addArguments("--headless=new");
}

String additionalArgs = trimmed(getChromeAdditionalArgs());
if (null != additionalArgs && !additionalArgs.isEmpty()) {
Expand All @@ -300,7 +302,9 @@ protected EdgeOptions createEdgeOptions() {
if (isBrowserMaximized()) {
options.addArguments("--start-maximized");
}
options.setHeadless(isHeadless());
if (isHeadless()) {
options.addArguments("--headless=new");
}

String additionalArgs = trimmed(getEdgeAdditionalArgs());
if (null != additionalArgs && !additionalArgs.isEmpty()) {
Expand All @@ -323,7 +327,9 @@ protected FirefoxOptions createFirefoxOptions() {
FirefoxOptions options = new FirefoxOptions();

// Custom Firefox capabilities
options.setHeadless(isHeadless());
if (isHeadless()) {
options.addArguments("--headless");
}
options.setProfile(createProfile());

// Capabilities shared by all browsers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -210,11 +210,12 @@ protected JPanel createMainPanel() {
panel.add(acceptInsecureCerts);

if (!(browserName().equals("HtmlUnit"))) {
headless = new JCheckBox("Headless");
headless.setSelected(false);
headless.setEnabled(true);
panel.add(headless);

if (!(browserName().equals("internet explorer"))) {
headless = new JCheckBox("Headless");
headless.setSelected(false);
headless.setEnabled(true);
panel.add(headless);
}
maximizeBrowser = new JCheckBox("Maximize browser window");
maximizeBrowser.setSelected(true);
panel.add(maximizeBrowser);
Expand Down Expand Up @@ -486,8 +487,10 @@ public void clearGui() {
}

if (!(browserName().equals("HtmlUnit"))) {
if (!(browserName().equals("internet explorer"))) {
headless.setSelected(false);
}
maximizeBrowser.setSelected(true);
headless.setSelected(false);
}

if ((browserName().equals("chrome")) || (browserName().equals("Remote"))) {
Expand Down Expand Up @@ -552,7 +555,9 @@ public void configure(TestElement element) {
}

if (!(browserName().equals("HtmlUnit"))) {
headless.setSelected(webDriverConfig.isHeadless());
if (!(browserName().equals("internet explorer"))) {
headless.setSelected(webDriverConfig.isHeadless());
}
maximizeBrowser.setSelected(webDriverConfig.isBrowserMaximized());
}

Expand Down Expand Up @@ -644,8 +649,10 @@ public void modifyTestElement(TestElement element) {
}

if (!(browserName().equals("HtmlUnit"))) {
if (!(browserName().equals("internet explorer"))) {
webDriverConfig.setHeadless(headless.isSelected());
}
webDriverConfig.setBrowserMaximized(maximizeBrowser.isSelected());
webDriverConfig.setHeadless(headless.isSelected());
}

// Chrome elements
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ public void shouldHaveChromeOptionsWhenRemoteIsEnabled() {
List<String> args = (List<String>) capability.get("args");
assertThat(args, is(notNullValue()));
assertEquals(1, args.size());
assertEquals("--headless", args.get(0));
assertEquals("--headless=new", args.get(0));
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ public void shouldHaveEdgeOptionsWhenRemoteIsEnabled() {
List<String> args = (List<String>) capability.get("args");
assertThat(args, is(notNullValue()));
assertEquals(1, args.size());
assertEquals("--headless", args.get(0));
assertEquals("--headless=new", args.get(0));
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public void shouldHaveHeadlessInChromeOptionsWhenEnabled() {
List<String> args = (List<String>) capability.get("args");
assertThat(args, is(notNullValue()));
assertEquals(1, args.size());
assertEquals("--headless", args.get(0));
assertEquals("--headless=new", args.get(0));
}

@Test
Expand Down

0 comments on commit f221739

Please sign in to comment.