Skip to content

Commit 1ea63f6

Browse files
committed
Remove support for IE Driver Server as IE is now EOL
1 parent 71aa5d6 commit 1ea63f6

10 files changed

+4
-107
lines changed

README.md

+2-10
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ This plugin exposes the following optional properties through the extension name
2020
| --- | --- | --- |
2121
| `chromedriver` | `String` | The exact version of ChromeDriver binary to be used by the project. No ChromeDriver binary will be downloaded if this property is not specified. |
2222
| `geckodriver` | `String` | The exact version of GeckoDriver binary to be used by the project. No GeckoDriver binary will be downloaded if this property is not specified. |
23-
| `iedriverserver` | `String` | The exact version of IEDriverServer binary to be used by the project. No IEDriverServer binary will be downloaded if this property is not specified. |
2423
| `edgedriver` | `String` | The exact version of EdgeDriver binary to be used by the project. No EdgeDriver binary will be downloaded if this property is not specified. |
2524
| `downloadRoot` |`File`| The location into which the binaries should be downloaded. If not specified the binaries are downloaded into the Gradle user home directory. Should not be specified under normal circumstances to benefit from caching of the binaries between multiple project builds. |
2625
| `driverUrlsConfiguration` |`org.gradle.api.resources.TextResource`| The text resource which contains mapping from a binary version to a URL. If not specified then the default is to use [WebDriver Extensions Maven Plugin's `package.json` file](https://github.com/webdriverextensions/webdriverextensions-maven-plugin-repository/blob/master/repository-3.0.json) from `https://raw.githubusercontent.com/webdriverextensions/webdriverextensions-maven-plugin-repository/master/repository-3.0.json`. |
@@ -31,15 +30,14 @@ Example usage:
3130
webdriverBinaries {
3231
chromedriver '2.32'
3332
geckodriver '0.19.0'
34-
iedriverserver '3.8.0'
3533
edgedriver '86.0.601.0'
3634
}
3735

3836
### Extension methods
3937

4038
#### Detailed binaries configuration methods
4139

42-
Additionally to properties which can be used for specifying driver binaries versions, the plugin exposes `chromedriver()`, `geckodriver()`, `iedriverserver()` and `edgedriver()` configuration methods through the the extension named `webdriverBinaries`.
40+
Additionally to properties which can be used for specifying driver binaries versions, the plugin exposes `chromedriver()`, `geckodriver()`, and `edgedriver()` configuration methods through the the extension named `webdriverBinaries`.
4341
Each method takes a closure which delegates to an object with the following properties:
4442

4543
| Name | Type | Description |
@@ -60,11 +58,6 @@ Example usage:
6058
version = '0.19.0'
6159
architecture = 'X86'
6260
}
63-
iedriverserver {
64-
version = '3.8.0'
65-
architecture = 'X86'
66-
fallbackTo32Bit = true
67-
}
6861
edgedriver {
6962
version = '86.0.601.0'
7063
architecture = 'X86'
@@ -100,7 +93,6 @@ Example usage:
10093
This plugin adds the following tasks to the project:
10194
* `configureChromeDriverBinary` - downloads, caches and configures the build to use a ChromeDriver binary
10295
* `configureGeckoDriverBinary` - downloads, caches and configures the build to use a GeckoDriver binary
103-
* `configureIeDriverServerBinary` - downloads, caches and configures the build to use a IEDriverServer binary
10496
* `configureEdgeDriverBinary` - downloads, caches and configures the build to use a EdgeDriver binary
10597

10698
There is no need to call the above tasks directly because the plugin interweaves them into the build lifecycle by configuring all `org.gradle.api.tasks.testing.Test` tasks to depend on them.
@@ -129,7 +121,7 @@ Note that the `driverUrlsConfiguration` property is a `org.gradle.api.resources.
129121
### Integration with Idea configuration extensions plugin (com.github.erdi.extended-idea)
130122

131123
If [Idea configuration extensions plugin](https://github.com/erdi/idea-gradle-plugins#idea-configuration-extensions-plugin) is applied to the project together with this plugin it will do the following:
132-
* configure the `ideaWorkspace` task added to the build by [Gradle's built-in IDEA plugin](https://docs.gradle.org/current/userguide/idea_plugin.html) to depend on `configureChromeDriverBinary`, `configureGeckoDriverBinary` and `configureIeDriverServerBinary` tasks
124+
* configure the `ideaWorkspace` task added to the build by [Gradle's built-in IDEA plugin](https://docs.gradle.org/current/userguide/idea_plugin.html) to depend on `configureChromeDriverBinary` and `configureGeckoDriverBinary` tasks
133125
* add system properties specific for the drivers, setting the path to the downloaded binaries as their values, to default default JUnit run configuration in IntelliJ when the configuration tasks are executed
134126

135127
The above will ensure that locations of driver binaries are picked up when running tests from IntelliJ.

src/main/groovy/com/github/erdi/gradle/webdriver/WebDriverBinariesPlugin.groovy

-6
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package com.github.erdi.gradle.webdriver
1818
import com.github.erdi.gradle.webdriver.chrome.ConfigureChromeDriverBinary
1919
import com.github.erdi.gradle.webdriver.edge.ConfigureEdgeDriverBinary
2020
import com.github.erdi.gradle.webdriver.gecko.ConfigureGeckoDriverBinary
21-
import com.github.erdi.gradle.webdriver.ie.ConfigureIeDriverServerBinary
2221
import com.github.erdi.gradle.webdriver.task.ConfigureBinary
2322
import org.gradle.api.Plugin
2423
import org.gradle.api.Project
@@ -40,7 +39,6 @@ class WebDriverBinariesPlugin implements Plugin<Project> {
4039
extension.configureTasks(project.tasks.withType(Test))
4140
registerConfigureChromeDriverBinary(project, extension)
4241
registerConfigureGeckoDriverBinary(project, extension)
43-
registerConfigureInternetExplorerDriverServerBinary(project, extension)
4442
registerConfigureEdgeDriverBinary(project, extension)
4543
}
4644

@@ -52,10 +50,6 @@ class WebDriverBinariesPlugin implements Plugin<Project> {
5250
registerConfigureDriverBinary(ConfigureGeckoDriverBinary, project, extension, extension.geckodriverConfiguration)
5351
}
5452

55-
private void registerConfigureInternetExplorerDriverServerBinary(Project project, WebDriverBinariesPluginExtension extension) {
56-
registerConfigureDriverBinary(ConfigureIeDriverServerBinary, project, extension, extension.ieDriverServerConfiguration)
57-
}
58-
5953
private void registerConfigureEdgeDriverBinary(Project project, WebDriverBinariesPluginExtension extension) {
6054
registerConfigureDriverBinary(ConfigureEdgeDriverBinary, project, extension, extension.edgedriverConfiguration)
6155
}

src/main/groovy/com/github/erdi/gradle/webdriver/WebDriverBinariesPluginExtension.groovy

-16
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ abstract class WebDriverBinariesPluginExtension {
3434
private final Project project
3535
private final ObjectFactory objectFactory
3636

37-
final DriverConfiguration ieDriverServerConfiguration
3837
final DriverConfiguration chromedriverConfiguration
3938
final DriverConfiguration geckodriverConfiguration
4039
final DriverConfiguration edgedriverConfiguration
@@ -43,7 +42,6 @@ abstract class WebDriverBinariesPluginExtension {
4342
this.project = project
4443

4544
this.objectFactory = project.objects
46-
this.ieDriverServerConfiguration = new DriverConfiguration(project, this.fallbackTo32Bit)
4745
this.chromedriverConfiguration = new DriverConfiguration(project, this.fallbackTo32Bit)
4846
this.geckodriverConfiguration = new DriverConfiguration(project, this.fallbackTo32Bit)
4947
this.edgedriverConfiguration = new DriverConfiguration(project, this.fallbackTo32Bit)
@@ -61,20 +59,6 @@ abstract class WebDriverBinariesPluginExtension {
6159
abstract Property<TextResource> getDriverUrlsConfiguration()
6260
abstract Property<Boolean> getFallbackTo32Bit()
6361

64-
void iedriverserver(String configuredVersion) {
65-
iedriverserver {
66-
version = configuredVersion
67-
}
68-
}
69-
70-
void setIedriverserver(String configuredVersion) {
71-
iedriverserver(configuredVersion)
72-
}
73-
74-
void iedriverserver(@DelegatesTo(DriverConfiguration) Closure configuration) {
75-
project.configure(ieDriverServerConfiguration, configuration)
76-
}
77-
7862
void chromedriver(String configuredVersion) {
7963
chromedriver {
8064
version = configuredVersion

src/main/groovy/com/github/erdi/gradle/webdriver/WebDriverBinaryMetadata.groovy

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ enum WebDriverBinaryMetadata {
1919

2020
CHROMEDRIVER('chromedriver', 'webdriver.chrome.driver'),
2121
GECKODRIVER('geckodriver', 'webdriver.gecko.driver'),
22-
IEDRIVERSERVER('IEDriverServer', 'webdriver.ie.driver'),
2322
EDGEDRIVER('msedgedriver', 'webdriver.edge.driver')
2423

2524
final String binaryName

src/main/groovy/com/github/erdi/gradle/webdriver/ie/ConfigureIeDriverServerBinary.groovy

-32
This file was deleted.

src/test/groovy/com/github/erdi/gradle/webdriver/BinariesVersions.groovy

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ class BinariesVersions {
1919

2020
public static final String TESTED_CHROMEDRIVER_VERSION = '87.0.4280.20'
2121
public static final String TESTED_GECKODRVIER_VERSION = '0.32.0'
22-
public static final String TESTED_IEDRIVERSERVER_VERSION = '3.8.0'
2322
public static final String TESTED_EDGEDRIVER_VERSION = '108.0.1462.38'
2423

2524
}

src/test/groovy/com/github/erdi/gradle/webdriver/ConfigureJavaForkOptionsTaskSpec.groovy

-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import spock.lang.Unroll
2121
import static com.github.erdi.gradle.webdriver.WebDriverBinaryMetadata.CHROMEDRIVER
2222
import static com.github.erdi.gradle.webdriver.WebDriverBinaryMetadata.EDGEDRIVER
2323
import static com.github.erdi.gradle.webdriver.WebDriverBinaryMetadata.GECKODRIVER
24-
import static com.github.erdi.gradle.webdriver.WebDriverBinaryMetadata.IEDRIVERSERVER
2524

2625
class ConfigureJavaForkOptionsTaskSpec extends PluginSpec {
2726

@@ -70,7 +69,6 @@ class ConfigureJavaForkOptionsTaskSpec extends PluginSpec {
7069
driverName | driverExecutableName | driverConfigurationBlockName | systemProperty
7170
'chromedriver' | 'chromedriver' | 'chromedriver' | CHROMEDRIVER.systemProperty
7271
'geckodriver' | 'geckodriver' | 'geckodriver' | GECKODRIVER.systemProperty
73-
'internetexplorerdriver' | 'IEDriverServer' | 'iedriverserver' | IEDRIVERSERVER.systemProperty
7472
'edgedriver' | 'msedgedriver' | 'edgedriver' | EDGEDRIVER.systemProperty
7573

7674
version = '2.42.0'

src/test/groovy/com/github/erdi/gradle/webdriver/ExtendedIdeaPluginIntegrationSpec.groovy

-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ class ExtendedIdeaPluginIntegrationSpec extends PluginSpec {
5151
driverConfigurationBlockName | driverName | binaryName | systemProperty | configureTask
5252
'chromedriver' | 'chromedriver' | 'chromedriver' | 'webdriver.chrome.driver' | 'configureChromeDriverBinary'
5353
'geckodriver' | 'geckodriver' | 'geckodriver' | 'webdriver.gecko.driver' | 'configureGeckoDriverBinary'
54-
'iedriverserver' | 'internetexplorerdriver' | 'IEDriverServer' | 'webdriver.ie.driver' | 'configureIeDriverServerBinary'
5554
'edgedriver' | 'edgedriver' | 'msedgedriver' | 'webdriver.edge.driver' | 'configureEdgeDriverBinary'
5655

5756
version = '1.2.3'

src/test/groovy/com/github/erdi/gradle/webdriver/InternetExplorerDriverConfigurationSpec.groovy

-35
This file was deleted.

src/test/groovy/com/github/erdi/gradle/webdriver/WebDriverBinariesPluginSpec.groovy

+2-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@ class WebDriverBinariesPluginSpec extends PluginSpec {
2727
['geckodriver', TESTED_GECKODRVIER_VERSION, 'selenium-firefox-driver']
2828
]
2929
if (OperatingSystem.current().windows) {
30-
parameters += [
31-
['iedriverserver', TESTED_IEDRIVERSERVER_VERSION, 'selenium-ie-driver'],
32-
['edgedriver', TESTED_EDGEDRIVER_VERSION, 'selenium-edge-driver']
30+
parameters << [
31+
'edgedriver', TESTED_EDGEDRIVER_VERSION, 'selenium-edge-driver'
3332
]
3433
} else {
3534
parameters << [

0 commit comments

Comments
 (0)