diff --git a/.gitignore b/.gitignore index d6944f9..0b0dee8 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ .settings .classpath target -webdriver \ No newline at end of file +webdriver +/libspecs/ diff --git a/README.md b/README.md index 90c4e28..e05745c 100644 --- a/README.md +++ b/README.md @@ -45,25 +45,26 @@ your pom.xml: com.github.hi-fi robotframework-seleniumlibrary - 3.141.59.26 + 3.141.59.265 test If you cannot use the robotframework-maven-plugin you can use the -[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), -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 `. +[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), +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 `. * More information about this library can be found in the - [Keyword Documentation](http://central.maven.org/maven2/com/github/hi-fi/robotframework-seleniumlibrary/3.141.59.26/robotframework-seleniumlibrary-3.141.59.26.html). + [Keyword Documentation](http://central.maven.org/maven2/com/github/hi-fi/robotframework-seleniumlibrary/3.141.59.265/robotframework-seleniumlibrary-3.141.59.265.html). * For keyword completion in RIDE you can download this - [Library Specs](http://central.maven.org/maven2/com/github/hi-fi/robotframework-seleniumlibrary/3.141.59.26/robotframework-seleniumlibrary-3.141.59.26.xml) + [Library Specs](http://central.maven.org/maven2/com/github/hi-fi/robotframework-seleniumlibrary/3.141.59.265/robotframework-seleniumlibrary-3.141.59.265.xml) and place it in your PYTHONPATH. Differences ----------- * Some keyword differences between this and [Python version](https://github.com/robotframework/SeleniumLibrary) exists. (Same) keywords should be aligned in upcoming versions. -* 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` +* Older version of the library was imported as `Library Selenium2Library` (both Java and Python versions). +Since 2.53.1.1 (and later major versions) import is done as `Library SeleniumLibrary` Browser drivers @@ -86,6 +87,8 @@ to know when to update drivers you use. Drivers can also be fetched with [https://github.com/Ardesco/selenium-standalone-server-plugin|Selenium Driver Binary Downloader plugin]. +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. + __ https://seleniumhq.github.io/selenium/docs/api/py/index.html#drivers __ https://en.wikipedia.org/wiki/PATH_(variable) @@ -96,7 +99,8 @@ This is a maven project. You can execute the integration tests (using [jBrowser] mvn integration-test -Other browsers are behind profiles (require browser installation with Firefox and Google Chrome, but not driver): +Other browsers are behind profiles +(require browser installation with Firefox and Google Chrome, but not driver. Driver downloaded directly from Internet, so runner needs to have access to it.): * Firefox: mvn integration-test -Pfirefox * Google Chrome: mvn integration-test -Pgooglechrome diff --git a/pom.xml b/pom.xml index 50013c1..03ded72 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.github.hi-fi robotframework-seleniumlibrary - 3.141.59.265-SNAPSHOT + 3.141.59.2653-SNAPSHOT jar Robot Framework :: SeleniumLibrary @@ -74,6 +74,7 @@ 3.141.59 SeleniumLibrary jbrowser + False @@ -203,27 +204,6 @@ - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - 1.0.16 - - - webdriver/binaries - - webdriver/zips - - src/test/resources/RepositoryMap.xml - - - - - selenium - - - - org.robotframework @@ -241,6 +221,7 @@ ${project.basedir}/src/test/robotframework/testsuites browser:${browser} + downloadWebDriver:${downloadWebDriver} target/robotframework-reports/${browser}_report.html target/robotframework-reports/${browser}_log.html @@ -384,101 +365,29 @@ firefox firefox + True - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - - - org.robotframework - robotframework-maven-plugin - - - - -Dwebdriver.gecko.driver=${webdriver.gecko.driver} - - - - - - firefoxheadless firefoxheadless + True - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - - - org.robotframework - robotframework-maven-plugin - - - - -Dwebdriver.gecko.driver=${webdriver.gecko.driver} - - - - - - googlechrome googlechrome + True - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - - - org.robotframework - robotframework-maven-plugin - - - - -Dwebdriver.chrome.driver=${webdriver.chrome.driver} - - - - - - googlechromeheadless googlechromeheadless + True - - - - com.lazerycode.selenium - driver-binary-downloader-maven-plugin - - - org.robotframework - robotframework-maven-plugin - - - - -Dwebdriver.chrome.driver=${webdriver.chrome.driver} - - - - - - release diff --git a/src/test/robotframework/settings/Settings.robot b/src/test/robotframework/settings/Settings.robot index 85b3c03..5881611 100644 --- a/src/test/robotframework/settings/Settings.robot +++ b/src/test/robotframework/settings/Settings.robot @@ -6,6 +6,7 @@ Library SeleniumLibrary *** Variables *** ${Profile} Local ${browser} jbrowser +${downloadWebDriver} ${False} ${Selenium.Browser.Name} ${browser} ${Selenium.Browser.Version} 17 ${Selenium.Timeout} 30.0 diff --git a/src/test/robotframework/testsuites/UnitTests/__init__.robot b/src/test/robotframework/testsuites/UnitTests/__init__.robot new file mode 100644 index 0000000..4127098 --- /dev/null +++ b/src/test/robotframework/testsuites/UnitTests/__init__.robot @@ -0,0 +1,7 @@ +*** Settings *** +Resource ../../settings/Settings.robot +Suite Setup Handle WebDriver + +*** Keywords *** +Handle WebDriver + Run Keyword If ${downloadWebDriver} WebDriver Manager Setup ${browser} \ No newline at end of file