Add ability to choose 32 verison of IEDriverServer for 64 bit node..#113
Add ability to choose 32 verison of IEDriverServer for 64 bit node..#113rouke-broersma merged 13 commits intojenkinsci:masterfrom
Conversation
…ng of Edge Browser." This reverts commit 70ab02d.
Update htmlunit driver to 2.28.2; Update selenium version to 3.7.1
|
I merged your other pull request, but now cannot merge this one because you included the previous commits in it. Could you fix the merge conflicts? :) |
# Conflicts: # dist-server-standalone/local_m2/org/seleniumhq/selenium/htmlunit-driver-standalone/maven-metadata-local.xml # dist-server-standalone/local_m2/org/seleniumhq/selenium/selenium-server-standalone/maven-metadata-local.xml # src/main/java/hudson/plugins/selenium/configuration/browser/selenium/EdgeBrowser.java # src/main/java/hudson/plugins/selenium/configuration/browser/webdriver/EdgeBrowser.java
|
To be honest i am a bit confused with these/my branches. |
|
There are no more merge issues but unit tests are failing. If you click on details you will go to the jenkins build for this plugin and you can see which unit tests are failing. I think it might be due to needing an update to jetty but I'm not sure. |
|
With the latest jenkins parent plugin (https://github.com/jenkinsci/plugin-pom) version (3.2) - jetty error is not reproduced and tests are started, selenium tests are passed (with one minor correction for a selector) but i was not able to fix issues with injected tests... (there is something with dependencies). |
|
@Mobrockers , Please review the commit, to be honest I am not sure if it's optimal fix, but i verified millions of possible dependencies... |
|
@dmitryyu Agree with fixes. Dependency conflicts are very annoying and if this fixes it then so be it. Push the changes to this branch (they are on https://github.com/dmitryyu/selenium-plugin/tree/update-libs update-libs branch so did not update this pull request as the pull request was made from master branch) and if the build is successful i'll merge it and try to release a new plugin version asap. The other pull request you have open is included in this pull request, right? If so, please close the other pull request. |
|
@Mobrockers |
* Added edge utils for transferring driver file to slave * Added MicoroftEdgeDriver to resources. (16299) * Added option to upload 32bit IE driver to 64bit slave node. * #113 - Fix Selenium and Injected test. * Merged missed changes (for Edge browser). * Added resources for Edge driver.
Enhancement: #72
Added the option to use only 32 bit IE driver for 64 bit node.
As far as i understand, there are no needs to add the opposite option. 64 driver cannot be used for 32 bit OS.
Note: the PR contains merged previous commits. (also refactored utils for uploading files to nodes (so Edge browser has been updated as well,)