Update fork branch

.gitignore

@@ -2,4 +2,5 @@
 .settings
 .classpath
 target
-webdriver
+webdriver
+/libspecs/

.travis.yml

@@ -1,11 +1,11 @@
 language: java
+dist: trusty
+
 jdk:
   - oraclejdk8
 
 env:
   - PROFILE=build
-  - PROFILE=build,googlechrome
-  - PROFILE=build,firefox
   - PROFILE=build,googlechromeheadless
   - PROFILE=build,firefoxheadless
 

README.md

@@ -45,25 +45,26 @@ your pom.xml:
     <dependency>
         <groupId>com.github.hi-fi</groupId>
         <artifactId>robotframework-seleniumlibrary</artifactId>
-        <version>3.141.59.26</version>
+        <version>3.141.59.265</version>
         <scope>test</scope>
     </dependency>
 
 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 <test location>`.  
+[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 <test location>`.  
 
 * 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

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.github.hi-fi</groupId>
 	<artifactId>robotframework-seleniumlibrary</artifactId>
-	<version>3.141.59.265-SNAPSHOT</version>
+	<version>3.141.59.2653-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>Robot Framework :: SeleniumLibrary</name>
@@ -74,6 +74,7 @@
 		<selenium.version>3.141.59</selenium.version>
 		<keywords.class>SeleniumLibrary</keywords.class>
 		<browser>jbrowser</browser>
+		<downloadWebDriver>False</downloadWebDriver>
 	</properties>
 
 	<dependencies>
@@ -134,6 +135,11 @@
 			<version>2.18.3</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>io.github.bonigarcia</groupId>
+			<artifactId>webdrivermanager</artifactId>
+			<version>3.4.0</version>
+		</dependency>
 	</dependencies>
 
 	<build>
@@ -198,27 +204,6 @@
 						</lifecycleMappingMetadata>
 					</configuration>
 				</plugin>
-				<plugin>
-					<groupId>com.lazerycode.selenium</groupId>
-					<artifactId>driver-binary-downloader-maven-plugin</artifactId>
-					<version>1.0.16</version>
-					<configuration>
-						<!-- root directory that downloaded driver binaries will be stored 
-							in -->
-						<rootStandaloneServerDirectory>webdriver/binaries</rootStandaloneServerDirectory>
-						<!-- Where you want to store downloaded zip files -->
-						<downloadedZipFileDirectory>webdriver/zips</downloadedZipFileDirectory>
-						<!-- Location of a custom repository map -->
-						<customRepositoryMap>src/test/resources/RepositoryMap.xml</customRepositoryMap>
-					</configuration>
-					<executions>
-						<execution>
-							<goals>
-								<goal>selenium</goal>
-							</goals>
-						</execution>
-					</executions>
-				</plugin>
 				<plugin>
 					<!-- Integration-Test, build documentation -->
 					<groupId>org.robotframework</groupId>
@@ -236,6 +221,7 @@
 								<testCasesDirectory>${project.basedir}/src/test/robotframework/testsuites</testCasesDirectory>
 								<variables>
 									<variable>browser:${browser}</variable>
+									<variable>downloadWebDriver:${downloadWebDriver}</variable>
 								</variables>
 								<report>target/robotframework-reports/${browser}_report.html</report>
 								<log>target/robotframework-reports/${browser}_log.html</log>
@@ -379,101 +365,29 @@
 			<id>firefox</id>
 			<properties>
 				<browser>firefox</browser>
+				<downloadWebDriver>True</downloadWebDriver>
 			</properties>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>com.lazerycode.selenium</groupId>
-						<artifactId>driver-binary-downloader-maven-plugin</artifactId>
-					</plugin>
-					<plugin>
-						<groupId>org.robotframework</groupId>
-						<artifactId>robotframework-maven-plugin</artifactId>
-						<configuration>
-							<externalRunner>
-								<jvmArgs>
-									<jvmArg>-Dwebdriver.gecko.driver=${webdriver.gecko.driver}</jvmArg>
-								</jvmArgs>
-							</externalRunner>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
 		</profile>
 		<profile>
 			<id>firefoxheadless</id>
 			<properties>
 				<browser>firefoxheadless</browser>
+				<downloadWebDriver>True</downloadWebDriver>
 			</properties>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>com.lazerycode.selenium</groupId>
-						<artifactId>driver-binary-downloader-maven-plugin</artifactId>
-					</plugin>
-					<plugin>
-						<groupId>org.robotframework</groupId>
-						<artifactId>robotframework-maven-plugin</artifactId>
-						<configuration>
-							<externalRunner>
-								<jvmArgs>
-									<jvmArg>-Dwebdriver.gecko.driver=${webdriver.gecko.driver}</jvmArg>
-								</jvmArgs>
-							</externalRunner>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
 		</profile>
 		<profile>
 			<id>googlechrome</id>
 			<properties>
 				<browser>googlechrome</browser>
+				<downloadWebDriver>True</downloadWebDriver>
 			</properties>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>com.lazerycode.selenium</groupId>
-						<artifactId>driver-binary-downloader-maven-plugin</artifactId>
-					</plugin>
-					<plugin>
-						<groupId>org.robotframework</groupId>
-						<artifactId>robotframework-maven-plugin</artifactId>
-						<configuration>
-							<externalRunner>
-								<jvmArgs>
-									<jvmArg>-Dwebdriver.chrome.driver=${webdriver.chrome.driver}</jvmArg>
-								</jvmArgs>
-							</externalRunner>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
 		</profile>
 		<profile>
 			<id>googlechromeheadless</id>
 			<properties>
 				<browser>googlechromeheadless</browser>
+				<downloadWebDriver>True</downloadWebDriver>
 			</properties>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>com.lazerycode.selenium</groupId>
-						<artifactId>driver-binary-downloader-maven-plugin</artifactId>
-					</plugin>
-					<plugin>
-						<groupId>org.robotframework</groupId>
-						<artifactId>robotframework-maven-plugin</artifactId>
-						<configuration>
-							<externalRunner>
-								<jvmArgs>
-									<jvmArg>-Dwebdriver.chrome.driver=${webdriver.chrome.driver}</jvmArg>
-								</jvmArgs>
-							</externalRunner>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
 		</profile>
 		<profile>
 			<id>release</id>

src/main/java/com/github/markusbernhardt/seleniumlibrary/CustomRobotDriverElement.java

@@ -0,0 +1,49 @@
+package com.github.markusbernhardt.seleniumlibrary;
+
+import com.github.markusbernhardt.seleniumlibrary.keywords.BrowserManagement;
+import com.github.markusbernhardt.seleniumlibrary.keywords.Robot;
+import org.openqa.selenium.WebDriver;
+
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+import java.lang.reflect.Field;
+
+/**
+ * For extends of custom keywords of WebDriver actions
+ */
+public class CustomRobotDriverElement {
+
+    private static SeleniumLibrary s;
+    private static BrowserManagement b;
+    private Robot robot = new Robot();
+
+    public CustomRobotDriverElement() throws NoSuchFieldException, IllegalAccessException {
+        try {
+            CustomRobotDriverElement.s = getLibraryInstance();
+        } catch (ScriptException e) {
+            throw new SeleniumLibraryNonFatalException("Cannot create SeleniumLibrary instance.", e);
+        }
+        Field bmField = SeleniumLibrary.class.getDeclaredField("bm");
+        bmField.setAccessible(true);
+        b = (BrowserManagement) bmField.get(s);
+        bmField.setAccessible(false);
+    }
+
+    private static SeleniumLibrary getLibraryInstance() throws ScriptException {
+        ScriptEngine engine = new ScriptEngineManager().getEngineByName("python");
+        engine.put("library", "SeleniumLibrary");
+        engine.eval("from robot.libraries.BuiltIn import BuiltIn");
+        engine.eval("instance = BuiltIn().get_library_instance(library)");
+        return (SeleniumLibrary) engine.get("instance");
+    }
+
+    protected WebDriver getCurrentBrowser() {
+        return b.getCurrentWebDriver();
+    }
+
+    protected Robot getRobot() {
+        return robot;
+    }
+
+}