Skip to content

Commit

Permalink
Update of WebDriverSampler default code by commenting duplicate Start…
Browse files Browse the repository at this point in the history
…() and End() function calls. (#38)

* 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

* Proxy UI fix in Firefox && upgrade to Selenium 4.8.1.

* Upgrade to Selenium 4.8.3.

* Fixing of Help Link in Config drivers which was outdated.

* Removal of isBlank() call as it requires Java 11 and JMeter targets 8.

* Update to Selenium 4.9.1

* Upgrade dependencies to Selenium 4.10.0 and to JMeter 5.6.2

* Update to Selenium 4.13.

* Update of WebSampler default code

Commenting out sampleStart and sampleEnd fucntions.
  • Loading branch information
rbourga authored Sep 19, 2024
1 parent 04f8206 commit ab0e931
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
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.13.0.1</version>
<version>4.13.0.2</version>
<packaging>jar</packaging>

<name>WebDriver/Selenium</name>
Expand Down Expand Up @@ -74,7 +74,7 @@
<dependency>
<groupId>org.apache.jmeter</groupId>
<artifactId>ApacheJMeter_core</artifactId>
<version>5.6.2</version>
<version>5.6.3</version>
<exclusions>
<exclusion>
<groupId>commons-math3</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,13 @@ public class WebDriverSampler extends AbstractSampler {
private final transient ScriptEngineManager scriptEngineManager;
private final Class<SampleResult> sampleResultClass;

public static final String defaultScript = "WDS.sampleResult.sampleStart()\n" +
/*
* Commenting out sampleStart and sampleEnd as times now handled by the WebDriverSampler itself.
* See Pull Request #37.
*/
public static final String defaultScript = "// WDS.sampleResult.sampleStart()\n" +
"WDS.browser.get('http://jmeter-plugins.org')\n" +
"WDS.sampleResult.sampleEnd()\n";
"// WDS.sampleResult.sampleEnd()\n";

public WebDriverSampler() {
Class<SampleResult> srClass;
Expand Down

0 comments on commit ab0e931

Please sign in to comment.