Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update of WebDriverSampler default code by commenting duplicate Start() and End() function calls. #38

Merged
merged 75 commits into from
Sep 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
08000f7
Upgrade of dependencies.
rbourga Aug 25, 2022
34dccbb
Adding IE capabilities for RemoteWebDriver.
rbourga Aug 29, 2022
5c79f59
Upgrade of function call.
rbourga Aug 31, 2022
779d716
Addition of field in the UI to set the path to the Firefox Gecko driver.
rbourga Sep 1, 2022
57a083e
Wiki update.
rbourga Sep 1, 2022
0f65045
Addition of input field for msegde.exe
rbourga Sep 12, 2022
2784988
Clean-ups and finalisations.
rbourga Sep 13, 2022
f78eb93
Addition of IE11 in MsEdge for Remote execution.
rbourga Sep 16, 2022
afdf724
Integrating changes from Shinu on Aug 26, 2019.
rbourga Sep 16, 2022
002d021
Merging of thefuckingcode changes from Apr 17, 2021.
rbourga Sep 16, 2022
b58b32f
Setting of default value of path to msedge.exe
rbourga Sep 17, 2022
46aa673
Update of Chrome tests to JDK 17.
rbourga Oct 10, 2022
05040b8
Update of Firefox tests to JDK 17.
rbourga Oct 11, 2022
3a92006
Upgrade of HTMLUntit tests to JDK 17.
rbourga Oct 11, 2022
a3fb6fe
Update of InternetExplorer tests to JDK 17.
rbourga Oct 11, 2022
d49f2de
Update of RemoteDriver tests to JDK 17.
rbourga Oct 11, 2022
5f05796
Update of WebDriver tests to JDK 17.
rbourga Oct 12, 2022
0629a4b
Formatting fixes.
rbourga Oct 12, 2022
fb4e703
Formatting fixes 2.
rbourga Oct 12, 2022
b25410c
Formatting fixes #3.
rbourga Oct 12, 2022
253d496
Addition of Geckodriver v0.31 for Firefox tests.
rbourga Oct 12, 2022
1ce449a
Usage of GeckoDriver default service for unit tests instead of real G…
rbourga Oct 14, 2022
deff70a
Update to Selenium 4.5
rbourga Oct 20, 2022
668c4b2
Ui fix.
rbourga Oct 20, 2022
1b049ce
Addition of geckodriver to travis CI for the firefox tests
rbourga Oct 28, 2022
4352bce
Matching Continous Integration test conditions.
rbourga Oct 28, 2022
f348c01
Merge pull request #1 from undera/master
rbourga Nov 2, 2022
2afc325
Setting IE's Protected Mode to "off" to allow IE to start in all envi…
rbourga Nov 2, 2022
8ed3ba7
okiMerge branch 'master' of https://github.com/rbourga/jmeter-plugins…
rbourga Nov 2, 2022
8c093fc
Removaĺ of path to Edge as from IEDriver v4.5.0, the driver will
rbourga Nov 3, 2022
c932be6
Ui Refactor 1
rbourga Nov 4, 2022
55067d2
Update to Seleniuṁ 4.6.0
rbourga Nov 22, 2022
1cf9932
UI Refactor
rbourga Nov 22, 2022
e0b2d94
Adding of new wiki page for direct browseŕ testing.
rbourga Nov 23, 2022
904282d
Updating wiki pages for new UI.
rbourga Nov 25, 2022
b7d9e67
Tests update 1.
rbourga Nov 25, 2022
12c2f5d
Update of Chrome and IE tests.
rbourga Nov 28, 2022
4799750
Pom update.
rbourga Nov 28, 2022
8a67816
Imporţclean-ups.
rbourga Nov 29, 2022
e4c7251
Merge branch 'master' of https://github.com/undera/jmeter-plugins-web…
rbourga Nov 29, 2022
d0644be
Merge pull request #3 from undera/master
rbourga Nov 29, 2022
b477985
Update of Readme.md.
rbourga Nov 29, 2022
bed12d3
Fix of broken wiki links.
rbourga Nov 29, 2022
7bf9b69
Fix of broken link #2.
rbourga Nov 29, 2022
668ca77
Take #3
rbourga Nov 29, 2022
2df8c69
Code format
rbourga Nov 29, 2022
add07a5
Code format #2
rbourga Nov 29, 2022
b87c5f5
Syntax highlight.
rbourga Nov 29, 2022
8544348
Merge pull request #4 from undera/master
rbourga Nov 30, 2022
a23719d
Initial Browser URL now in UI and not hard coded.
rbourga Dec 5, 2022
ee296bf
Merge branch 'master' of https://github.com/rbourga/jmeter-plugins-we…
rbourga Dec 5, 2022
fd8d84e
Test fixes.
rbourga Dec 5, 2022
26ba878
Upgrade to Selenium 4.7.2 and addition of driver for Edge.
rbourga Dec 15, 2022
1bc91f9
Update of tests.
rbourga Dec 16, 2022
94d0288
Removing "ignoring zoom levels" in IE as it is no longer required fro…
rbourga Dec 16, 2022
871d3a7
Merge pull request #5 from undera/master
rbourga Dec 19, 2022
be72631
Upgrade to Selenium 4.8.0
rbourga Feb 13, 2023
ecb2b68
Merge branch 'master' of https://github.com/rbourga/jmeter-plugins-we…
rbourga Feb 13, 2023
e1c4cd8
Merge pull request #6 from undera/master
rbourga Feb 15, 2023
36b8e05
Proxy UI fix in Firefox && upgrade to Selenium 4.8.1.
rbourga Mar 15, 2023
1f8eace
Merge branch 'master' of https://github.com/rbourga/jmeter-plugins-we…
rbourga Mar 15, 2023
665e903
Merge pull request #7 from undera/master
rbourga Mar 15, 2023
b46b39d
Merge pull request #8 from undera/master
rbourga Mar 31, 2023
e23b177
Upgrade to Selenium 4.8.3.
rbourga Apr 3, 2023
785b197
Merge pull request #9 from undera/master
rbourga Apr 5, 2023
99be546
Fixing of Help Link in Config drivers which was outdated.
rbourga Apr 5, 2023
66fbe39
Removal of isBlank() call as it requires Java 11 and JMeter targets 8.
rbourga Apr 13, 2023
65dec17
Merge pull request #10 from undera/master
rbourga Jun 2, 2023
5881264
Update to Selenium 4.9.1
rbourga Jun 3, 2023
e534d91
Merge pull request #11 from undera/master
rbourga Jul 21, 2023
c07b3df
Upgrade dependencies to Selenium 4.10.0 and to JMeter 5.6.2
rbourga Jul 21, 2023
045208a
Merge pull request #12 from undera/master
rbourga Aug 9, 2023
58a2d86
Update to Selenium 4.13.
rbourga Nov 7, 2023
d077ba6
Merge remote-tracking branch 'upstream/master'
rbourga Sep 17, 2024
87d5f1d
Update of WebSampler default code
rbourga Sep 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading