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

Fixed issues with Chrome Driver patch version download and added Edge webdriver support #448

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 18 additions & 0 deletions SeleniumGridExtras/appium_node1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"capabilities": [],
"configuration": {
"proxy": "com.groupon.seleniumgridextras.grid.proxies.SetupTeardownProxy",
"servlets": [],
"maxSession": 3,
"port": 4723,
"register": true,
"unregisterIfStillDownAfter": 10000,
"hubPort": 0,
"registerCycle": 5000,
"nodeStatusCheckTimeout": 10000,
"appiumStartCommand": "appium",
"downPollingLimit": 0
},
"servlets": [],
"custom": {}
}
18 changes: 18 additions & 0 deletions SeleniumGridExtras/appium_node2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"capabilities": [],
"configuration": {
"proxy": "com.groupon.seleniumgridextras.grid.proxies.SetupTeardownProxy",
"servlets": [],
"maxSession": 3,
"port": 4723,
"register": true,
"unregisterIfStillDownAfter": 10000,
"hubPort": 0,
"registerCycle": 5000,
"nodeStatusCheckTimeout": 10000,
"appiumStartCommand": "appium --avd AVD_NAME",
"downPollingLimit": 0
},
"servlets": [],
"custom": {}
}
30 changes: 30 additions & 0 deletions SeleniumGridExtras/edge_download_test.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"theConfigMap": {
"auto_update_browser_versions": "",
"iedriver": {},
"auto_update_drivers": "",
"html_render_options": {},
"node_additional_classpath": [],
"video_recording_options": {},
"hub_additional_classpath": [],
"geckodriver": {},
"msedgedriver": {
"directory": "/tmp/download_edge_driver_test"
},
"reboot_after_sessions": 0,
"tear_down": [],
"webdriver": {},
"active_modules": [],
"hub_config_files": [],
"unregisterNodeDuringReboot": "true",
"chromedriver": {},
"disabled_modules": [],
"hub_config": {},
"grid_extras_port": 3000,
"grid": {},
"setup": [],
"grid_jvm_options": {},
"node_config_files": [],
"grid_extras_jvm_options": {}
}
}
86 changes: 86 additions & 0 deletions SeleniumGridExtras/edge_download_test.json.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
{
"theConfigMap": {
"auto_update_browser_versions": "",
"log_maximum_size": "20000000",
"iedriver": {
"bit": "Win32",
"directory": "\\tmp\\webdriver\\iedriver",
"version": "2.53.1"
},
"default_role": "hub",
"auto_update_drivers": "",
"html_render_options": {
"html_footer_partial": "/footer_partial.html",
"main_js_file": "/bootstrap.3.2.0.min.js",
"primary_css_file_fallback": "https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css",
"html_header_file": "/header_partial.html",
"main_template": "/jumbotron-narrow.css",
"primary_css_file": "/bootstrap.3.2.0.min.css",
"main_js_fallback": "https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js",
"jquery_file": "/jquery.1.11.1.min.js",
"jquery_fallback": "https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js",
"html_nav_bar": "/nav_bar_partial.html",
"main_template_fallback": "http://getbootstrap.com/examples/jumbotron-narrow/jumbotron-narrow.css"
},
"http_request_timeout": 60000,
"node_additional_classpath": [],
"video_recording_options": {
"frameSeconds": "1",
"frames": "5",
"videos_to_keep": "40",
"lower_third_background_color": "0,0,0,200",
"idle_video_timeout": "120",
"width": "1024",
"video_output_dir": "video_output",
"title_frame_font_color": "129,182,64,128",
"record_test_videos": "true",
"height": "768",
"lower_third_font_color": "255,255,255,255"
},
"grid_extras_release_url": "https://api.github.com/repos/chamiz/Selenium-Grid-Extras/releases",
"hub_additional_classpath": [],
"geckodriver": {
"directory": "\\tmp\\webdriver\\geckodriver",
"version": "0.10.0"
},
"msedgedriver": {
"bit": "32",
"directory": "/tmp/download_edge_driver_test",
"version": "86.0.622.38"
},
"reboot_after_sessions": 0.0,
"expose_directory": "shared",
"tear_down": [],
"webdriver": {
"directory": "\\tmp\\webdriver",
"version": "2.53.0"
},
"active_modules": [],
"hub_config_files": [],
"config_puller_http_timeout": 5000,
"auto_start_hub": "0",
"unregisterNodeDuringReboot": "true",
"chromedriver": {
"bit": "32",
"directory": "\\tmp\\webdriver\\chromedriver",
"version": "2.22"
},
"disabled_modules": [],
"grid_extras_auto_update_check_interval": "86400000",
"auto_start_node": "1",
"hub_config": {
"role": "hub",
"port": "4444",
"servlets": "com.groupon.seleniumgridextras.grid.servlets.ProxyStatusJsonServlet",
"host": "192.168.0.102"
},
"log_maximum_age_ms": 864000000,
"grid_extras_port": 3000.0,
"grid": {},
"setup": [],
"grid_jvm_options": {},
"node_config_files": [],
"grid_extras_jvm_options": {},
"enable_session_history": "1"
}
}
35 changes: 35 additions & 0 deletions SeleniumGridExtras/grid_start_test.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"theConfigMap": {
"auto_update_browser_versions": "",
"iedriver": {},
"auto_update_drivers": "",
"html_render_options": {},
"node_additional_classpath": [],
"video_recording_options": {},
"hub_additional_classpath": [],
"geckodriver": {},
"msedgedriver": {},
"reboot_after_sessions": 0,
"tear_down": [],
"webdriver": {
"version": "1.1.1"
},
"active_modules": [],
"hub_config_files": [],
"unregisterNodeDuringReboot": "true",
"chromedriver": {},
"disabled_modules": [],
"hub_config": {},
"grid_extras_port": 3000,
"grid": {},
"setup": [],
"grid_jvm_options": {},
"node_config_files": [
"node1.json",
"node2.json",
"appium_node1.json",
"appium_node2.json"
],
"grid_extras_jvm_options": {}
}
}
17 changes: 17 additions & 0 deletions SeleniumGridExtras/node1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"capabilities": [],
"configuration": {
"proxy": "com.groupon.seleniumgridextras.grid.proxies.SetupTeardownProxy",
"servlets": [],
"maxSession": 3,
"port": 0,
"register": true,
"unregisterIfStillDownAfter": 10000,
"hubPort": 0,
"registerCycle": 5000,
"nodeStatusCheckTimeout": 10000,
"downPollingLimit": 0
},
"servlets": [],
"custom": {}
}
17 changes: 17 additions & 0 deletions SeleniumGridExtras/node2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"capabilities": [],
"configuration": {
"proxy": "com.groupon.seleniumgridextras.grid.proxies.SetupTeardownProxy",
"servlets": [],
"maxSession": 3,
"port": 0,
"register": true,
"unregisterIfStillDownAfter": 10000,
"hubPort": 0,
"registerCycle": 5000,
"nodeStatusCheckTimeout": 10000,
"downPollingLimit": 0
},
"servlets": [],
"custom": {}
}
36 changes: 15 additions & 21 deletions SeleniumGridExtras/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>com.groupon.selenium-grid-extras</groupId>
<artifactId>SeleniumGridExtras</artifactId>
<version>1.12.20-SNAPSHOT</version>
<version>2.1.1-SNAPSHOT</version>

<repositories>
<repository>
Expand All @@ -13,17 +13,16 @@
</repository>
<repository>
<id>xuggle repo</id>
<!-- <url>http://xuggle.googlecode.com/svn/trunk/repo/share/java/</url> -->
<url>https://raw.github.com/smccarthy/xuggle-xuggler-dependency/master</url>
<url>https://repository.liferay.com/nexus/content/repositories/public/</url>
</repository>
</repositories>

<properties>
<version.selenium>3.5.3</version.selenium>
<version.selenium>3.8.1</version.selenium>
</properties>

<dependencies>
<dependency> <!-- Selenium 2.53.1 comes with jna-platform 4.1.0 -->
<dependency> <!-- Selenium 3.7.1 comes with jna-platform 4.1.0 -->
<groupId>net.java.dev.jna</groupId> <!-- Needed for BrowerVersionDetector (for IE) -->
<artifactId>jna-platform</artifactId>
<version>4.1.0</version>
Expand All @@ -50,31 +49,31 @@
<version>4.11</version>
<scope>test</scope>
</dependency>
<dependency> <!-- Selenium 2.53.1 comes with commons-io 2.4 -->
<dependency> <!-- Selenium 3.7.1 comes with commons-io 2.5 -->
<groupId>commons-io</groupId> <!-- GridHub.writeToFile requires this -->
<artifactId>commons-io</artifactId>
<version>2.4</version>
<version>2.5</version>
</dependency>
<dependency> <!-- Selenium 2.53.1 comes with commons-codec 1.10 -->
<groupId>commons-codec</groupId> <!-- ScreenshotUtility.encodeStreamToBase64 requires this -->
<artifactId>commons-codec</artifactId>
<version>1.10</version>
</dependency>
<!-- Needed for `Should we store all of these configs in central location on the HUB node and update from there? (1-yes/0-no)` -->
<dependency> <!-- Selenium 2.53.1 comes with httpclient 4.5.1 -->
<dependency> <!-- Selenium 3.7.1 comes with httpclient 4.5.3 -->
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.3.1</version>
<version>4.5.3</version>
</dependency>
<dependency> <!-- Selenium 2.53.1 comes with commons-lang3 3.4 -->
<dependency> <!-- Selenium 3.7.1 comes with commons-lang3 3.5 -->
<groupId>org.apache.commons</groupId> <!-- Needed all over -->
<artifactId>commons-lang3</artifactId>
<version>3.3.2</version>
<version>3.5</version>
</dependency>
<dependency>
<dependency> <!-- Selenium 3.7.1 comes with gson 2.8.2 -->
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.1</version>
<version>2.8.2</version>
</dependency>
<dependency>
<groupId>net.coobird</groupId>
Expand All @@ -99,28 +98,23 @@
<dependency>
<groupId>xuggle</groupId>
<artifactId>xuggle-xuggler</artifactId>
<version>5.4</version>
<version>5.2</version>
</dependency>
<dependency>
<groupId>org.boofcv</groupId>
<artifactId>xuggler</artifactId>
<version>0.16</version>
</dependency>
<dependency> <!-- selenium-api-2.53.1 comes with guava 19.0 -->
<dependency> <!-- selenium-api-3.7.1 comes with guava 23.0 -->
<artifactId>guava</artifactId> <!-- Needed for UpgradeGridExtrasTask.getSanitizedReleaseList -->
<groupId>com.google.guava</groupId>
<type>jar</type>
<version>23.0</version>
</dependency>
<!-- <dependency> Not used anywhere
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20090211</version>
</dependency> -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.0.31-beta</version>
<version>2.12.0</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Loading