Skip to content
This repository was archived by the owner on Feb 2, 2025. It is now read-only.

Commit 831945f

Browse files
Hi-FiHi-Fi
authored
Merge pull request #77 from Hi-Fi/release/3.141.59.265
Release/3.141.59.265
2 parents 637fb35 + ae6c18f commit 831945f

File tree

5 files changed

+28
-106
lines changed

5 files changed

+28
-106
lines changed

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
.settings
33
.classpath
44
target
5-
webdriver
5+
webdriver
6+
/libspecs/

‎README.md

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,25 +45,26 @@ your pom.xml:
4545
<dependency>
4646
<groupId>com.github.hi-fi</groupId>
4747
<artifactId>robotframework-seleniumlibrary</artifactId>
48-
<version>3.141.59.26</version>
48+
<version>3.141.59.265</version>
4949
<scope>test</scope>
5050
</dependency>
5151

5252
If you cannot use the robotframework-maven-plugin you can use the
53-
[jar-with-dependencies](http://central.maven.org/maven2/com/github/hi-fi/robotframework-seleniumlibrary/3.141.59.26/robotframework-seleniumlibrary-3.141.59.26-jar-with-dependencies.jar),
54-
which contains all required libraries. Running of tests with this can be done with command `java -jar robotframework-seleniumlibrary-3.141.59.26-jar-with-dependencies.jar <test location>`.
53+
[jar-with-dependencies](http://central.maven.org/maven2/com/github/hi-fi/robotframework-seleniumlibrary/3.141.59.265/robotframework-seleniumlibrary-3.141.59.265-jar-with-dependencies.jar),
54+
which contains all required libraries. Running of tests with this can be done with command `java -jar robotframework-seleniumlibrary-3.141.59.265-jar-with-dependencies.jar <test location>`.
5555

5656
* More information about this library can be found in the
57-
[Keyword Documentation](http://central.maven.org/maven2/com/github/hi-fi/robotframework-seleniumlibrary/3.141.59.26/robotframework-seleniumlibrary-3.141.59.26.html).
57+
[Keyword Documentation](http://central.maven.org/maven2/com/github/hi-fi/robotframework-seleniumlibrary/3.141.59.265/robotframework-seleniumlibrary-3.141.59.265.html).
5858
* For keyword completion in RIDE you can download this
59-
[Library Specs](http://central.maven.org/maven2/com/github/hi-fi/robotframework-seleniumlibrary/3.141.59.26/robotframework-seleniumlibrary-3.141.59.26.xml)
59+
[Library Specs](http://central.maven.org/maven2/com/github/hi-fi/robotframework-seleniumlibrary/3.141.59.265/robotframework-seleniumlibrary-3.141.59.265.xml)
6060
and place it in your PYTHONPATH.
6161

6262
Differences
6363
-----------
6464

6565
* Some keyword differences between this and [Python version](https://github.com/robotframework/SeleniumLibrary) exists. (Same) keywords should be aligned in upcoming versions.
66-
* Older version of the library was imported as `Library Selenium2Library` (both Java and Python versions). Since 2.53.1.1 (and all 3.x versions) import is done as `Library SeleniumLibrary`
66+
* Older version of the library was imported as `Library Selenium2Library` (both Java and Python versions).
67+
Since 2.53.1.1 (and later major versions) import is done as `Library SeleniumLibrary`
6768

6869

6970
Browser drivers
@@ -86,6 +87,8 @@ to know when to update drivers you use.
8687

8788
Drivers can also be fetched with [https://github.com/Ardesco/selenium-standalone-server-plugin|Selenium Driver Binary Downloader plugin].
8889

90+
With At 3.141.59.265 [https://github.com/bonigarcia/webdrivermanager|WebdriverManager] is taken to use, so handling of drivers can also be done with standalone JAR from tests itself.
91+
8992
__ https://seleniumhq.github.io/selenium/docs/api/py/index.html#drivers
9093
__ https://en.wikipedia.org/wiki/PATH_(variable)
9194

@@ -96,7 +99,8 @@ This is a maven project. You can execute the integration tests (using [jBrowser]
9699

97100
mvn integration-test
98101

99-
Other browsers are behind profiles (require browser installation with Firefox and Google Chrome, but not driver):
102+
Other browsers are behind profiles
103+
(require browser installation with Firefox and Google Chrome, but not driver. Driver downloaded directly from Internet, so runner needs to have access to it.):
100104

101105
* Firefox: mvn integration-test -Pfirefox
102106
* Google Chrome: mvn integration-test -Pgooglechrome

‎pom.xml

Lines changed: 7 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.github.hi-fi</groupId>
77
<artifactId>robotframework-seleniumlibrary</artifactId>
8-
<version>3.141.59.265-SNAPSHOT</version>
8+
<version>3.141.59.2653-SNAPSHOT</version>
99
<packaging>jar</packaging>
1010

1111
<name>Robot Framework :: SeleniumLibrary</name>
@@ -74,6 +74,7 @@
7474
<selenium.version>3.141.59</selenium.version>
7575
<keywords.class>SeleniumLibrary</keywords.class>
7676
<browser>jbrowser</browser>
77+
<downloadWebDriver>False</downloadWebDriver>
7778
</properties>
7879

7980
<dependencies>
@@ -203,27 +204,6 @@
203204
</lifecycleMappingMetadata>
204205
</configuration>
205206
</plugin>
206-
<plugin>
207-
<groupId>com.lazerycode.selenium</groupId>
208-
<artifactId>driver-binary-downloader-maven-plugin</artifactId>
209-
<version>1.0.16</version>
210-
<configuration>
211-
<!-- root directory that downloaded driver binaries will be stored
212-
in -->
213-
<rootStandaloneServerDirectory>webdriver/binaries</rootStandaloneServerDirectory>
214-
<!-- Where you want to store downloaded zip files -->
215-
<downloadedZipFileDirectory>webdriver/zips</downloadedZipFileDirectory>
216-
<!-- Location of a custom repository map -->
217-
<customRepositoryMap>src/test/resources/RepositoryMap.xml</customRepositoryMap>
218-
</configuration>
219-
<executions>
220-
<execution>
221-
<goals>
222-
<goal>selenium</goal>
223-
</goals>
224-
</execution>
225-
</executions>
226-
</plugin>
227207
<plugin>
228208
<!-- Integration-Test, build documentation -->
229209
<groupId>org.robotframework</groupId>
@@ -241,6 +221,7 @@
241221
<testCasesDirectory>${project.basedir}/src/test/robotframework/testsuites</testCasesDirectory>
242222
<variables>
243223
<variable>browser:${browser}</variable>
224+
<variable>downloadWebDriver:${downloadWebDriver}</variable>
244225
</variables>
245226
<report>target/robotframework-reports/${browser}_report.html</report>
246227
<log>target/robotframework-reports/${browser}_log.html</log>
@@ -384,101 +365,29 @@
384365
<id>firefox</id>
385366
<properties>
386367
<browser>firefox</browser>
368+
<downloadWebDriver>True</downloadWebDriver>
387369
</properties>
388-
<build>
389-
<plugins>
390-
<plugin>
391-
<groupId>com.lazerycode.selenium</groupId>
392-
<artifactId>driver-binary-downloader-maven-plugin</artifactId>
393-
</plugin>
394-
<plugin>
395-
<groupId>org.robotframework</groupId>
396-
<artifactId>robotframework-maven-plugin</artifactId>
397-
<configuration>
398-
<externalRunner>
399-
<jvmArgs>
400-
<jvmArg>-Dwebdriver.gecko.driver=${webdriver.gecko.driver}</jvmArg>
401-
</jvmArgs>
402-
</externalRunner>
403-
</configuration>
404-
</plugin>
405-
</plugins>
406-
</build>
407370
</profile>
408371
<profile>
409372
<id>firefoxheadless</id>
410373
<properties>
411374
<browser>firefoxheadless</browser>
375+
<downloadWebDriver>True</downloadWebDriver>
412376
</properties>
413-
<build>
414-
<plugins>
415-
<plugin>
416-
<groupId>com.lazerycode.selenium</groupId>
417-
<artifactId>driver-binary-downloader-maven-plugin</artifactId>
418-
</plugin>
419-
<plugin>
420-
<groupId>org.robotframework</groupId>
421-
<artifactId>robotframework-maven-plugin</artifactId>
422-
<configuration>
423-
<externalRunner>
424-
<jvmArgs>
425-
<jvmArg>-Dwebdriver.gecko.driver=${webdriver.gecko.driver}</jvmArg>
426-
</jvmArgs>
427-
</externalRunner>
428-
</configuration>
429-
</plugin>
430-
</plugins>
431-
</build>
432377
</profile>
433378
<profile>
434379
<id>googlechrome</id>
435380
<properties>
436381
<browser>googlechrome</browser>
382+
<downloadWebDriver>True</downloadWebDriver>
437383
</properties>
438-
<build>
439-
<plugins>
440-
<plugin>
441-
<groupId>com.lazerycode.selenium</groupId>
442-
<artifactId>driver-binary-downloader-maven-plugin</artifactId>
443-
</plugin>
444-
<plugin>
445-
<groupId>org.robotframework</groupId>
446-
<artifactId>robotframework-maven-plugin</artifactId>
447-
<configuration>
448-
<externalRunner>
449-
<jvmArgs>
450-
<jvmArg>-Dwebdriver.chrome.driver=${webdriver.chrome.driver}</jvmArg>
451-
</jvmArgs>
452-
</externalRunner>
453-
</configuration>
454-
</plugin>
455-
</plugins>
456-
</build>
457384
</profile>
458385
<profile>
459386
<id>googlechromeheadless</id>
460387
<properties>
461388
<browser>googlechromeheadless</browser>
389+
<downloadWebDriver>True</downloadWebDriver>
462390
</properties>
463-
<build>
464-
<plugins>
465-
<plugin>
466-
<groupId>com.lazerycode.selenium</groupId>
467-
<artifactId>driver-binary-downloader-maven-plugin</artifactId>
468-
</plugin>
469-
<plugin>
470-
<groupId>org.robotframework</groupId>
471-
<artifactId>robotframework-maven-plugin</artifactId>
472-
<configuration>
473-
<externalRunner>
474-
<jvmArgs>
475-
<jvmArg>-Dwebdriver.chrome.driver=${webdriver.chrome.driver}</jvmArg>
476-
</jvmArgs>
477-
</externalRunner>
478-
</configuration>
479-
</plugin>
480-
</plugins>
481-
</build>
482391
</profile>
483392
<profile>
484393
<id>release</id>

‎src/test/robotframework/settings/Settings.robot

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Library SeleniumLibrary
66
*** Variables ***
77
${Profile} Local
88
${browser} jbrowser
9+
${downloadWebDriver} ${False}
910
${Selenium.Browser.Name} ${browser}
1011
${Selenium.Browser.Version} 17
1112
${Selenium.Timeout} 30.0

‎src/test/robotframework/testsuites/UnitTests/__init__.robot

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
*** Settings ***
2+
Resource ../../settings/Settings.robot
3+
Suite Setup Handle WebDriver
4+
5+
*** Keywords ***
6+
Handle WebDriver
7+
Run Keyword If ${downloadWebDriver} WebDriver Manager Setup ${browser}

0 commit comments

Comments
 (0)