Skip to content

Commit 97fa333

Browse files
authored
Merge branch 'trunk' into page-component-objects
2 parents 54a17b6 + 302c8a5 commit 97fa333

35 files changed

+194
-726
lines changed

examples/dotnet/SeleniumDocs/GettingStarted/InstallDriversTest.cs

-56
This file was deleted.

examples/dotnet/SeleniumDocs/SeleniumDocs.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
1313
<PackageReference Include="Selenium.Support" Version="4.5.0" />
1414
<PackageReference Include="Selenium.WebDriver" Version="4.9.0" />
15-
<PackageReference Include="WebDriverManager" Version="2.16.0" />
1615
</ItemGroup>
1716

1817
<ItemGroup>

examples/java/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ repositories {
1212
dependencies {
1313
testImplementation 'org.seleniumhq.selenium:selenium-java:4.9.1'
1414
testImplementation 'org.seleniumhq.selenium:selenium-grid:4.9.1'
15-
testImplementation 'io.github.bonigarcia:webdrivermanager:5.3.2'
1615
testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.9.0'
1716
}
1817

examples/java/pom.xml

-6
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,6 @@
5656
<version>5.9.2</version>
5757
<scope>test</scope>
5858
</dependency>
59-
<dependency>
60-
<groupId>io.github.bonigarcia</groupId>
61-
<artifactId>webdrivermanager</artifactId>
62-
<version>5.3.2</version>
63-
<scope>test</scope>
64-
</dependency>
6559
</dependencies>
6660

6761
<build>

examples/java/src/test/java/dev/selenium/getting_started/InstallDriversTest.java

-53
This file was deleted.

examples/kotlin/pom.xml

-6
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,6 @@
5454
<version>${junit5.version}</version>
5555
<scope>test</scope>
5656
</dependency>
57-
<dependency>
58-
<groupId>io.github.bonigarcia</groupId>
59-
<artifactId>webdrivermanager</artifactId>
60-
<version>${wdm.version}</version>
61-
<scope>test</scope>
62-
</dependency>
6357
<dependency>
6458
<groupId>org.jetbrains.kotlin</groupId>
6559
<artifactId>kotlin-stdlib-jdk8</artifactId>

examples/kotlin/src/test/kotlin/dev/selenium/BaseTest.kt

-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package dev.selenium;
22

3-
import io.github.bonigarcia.wdm.WebDriverManager;
43
import org.junit.jupiter.api.AfterEach;
54
import org.junit.jupiter.api.BeforeAll;
65
import org.junit.jupiter.api.BeforeEach;
@@ -12,11 +11,6 @@ import org.junit.jupiter.api.TestInstance
1211
open class BaseTest {
1312
lateinit var driver: WebDriver
1413

15-
@BeforeAll
16-
fun setupAll() {
17-
WebDriverManager.chromedriver().setup()
18-
}
19-
2014
@BeforeEach
2115
fun setup() {
2216
driver = ChromeDriver()
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package dev.selenium.getting_started
22

3-
import io.github.bonigarcia.wdm.WebDriverManager
43
import org.junit.jupiter.api.*
54
import org.junit.jupiter.api.Assertions.assertEquals
65
import org.openqa.selenium.By
@@ -12,23 +11,10 @@ import java.time.Duration
1211
class FirstScriptTest {
1312
private lateinit var driver: WebDriver
1413

15-
@BeforeAll
16-
fun setupAll() {
17-
WebDriverManager.chromedriver().setup()
18-
}
19-
20-
@BeforeEach
21-
fun setup() {
22-
driver = ChromeDriver()
23-
}
24-
25-
@AfterEach
26-
fun teardown() {
27-
driver.quit()
28-
}
29-
3014
@Test
3115
fun eightComponents() {
16+
driver = ChromeDriver()
17+
3218
driver.get("https://www.selenium.dev/selenium/web/web-form.html")
3319

3420
val title = driver.title
@@ -45,6 +31,8 @@ class FirstScriptTest {
4531
val message = driver.findElement(By.id("message"))
4632
val value = message.getText()
4733
assertEquals("Received!", value)
34+
35+
driver.quit()
4836
}
4937

5038
}

examples/kotlin/src/test/kotlin/dev/selenium/getting_started/InstallDriversTest.kt

-45
This file was deleted.

examples/python/requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
selenium==4.9.1
22
pytest
33
flake8
4-
webdriver_manager==3.8.3

examples/python/tests/conftest.py

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ def driver():
1414
@pytest.fixture(scope='function')
1515
def firefox_driver():
1616
driver = webdriver.Firefox()
17+
driver.implicitly_wait(1)
1718

1819
yield driver
1920

examples/python/tests/getting_started/test_install_drivers.py

-46
This file was deleted.

examples/python/tests/troubleshooting/test_logging.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import atexit
12
import logging
23
import os
34

@@ -24,4 +25,6 @@ def test_logging():
2425
with open(log_path, 'r') as fp:
2526
assert len(fp.readlines()) == 3
2627
finally:
27-
os.remove(log_path)
28+
atexit.register(delete_path, log_path)
29+
def delete_path(path):
30+
os.remove(path)

examples/ruby/Gemfile

-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@ gem 'rspec', '~> 3.0'
88
gem 'rubocop', '~> 1.35'
99
gem 'rubocop-rspec', '~> 2.12'
1010
gem 'selenium-webdriver', '= 4.9.1'
11-
gem 'webdrivers', '~> 5.1'

examples/ruby/spec/getting_started/install_drivers_spec.rb

-35
This file was deleted.

website_and_docs/content/documentation/about/style.en.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ A basic comparison of code looks like:
191191
{{</* gh-codeblock path="examples/javascript/test/getting_started/firstScript.spec.js#L23-L24" */>}}
192192
{{</* /tab */>}}
193193
{{</* tab header="Kotlin" */>}}
194-
{{</* gh-codeblock path="examples/kotlin/src/test/kotlin/dev/selenium/getting_started/FirstScriptTest.kt#L39-L40" */>}}
194+
{{</* gh-codeblock path="examples/kotlin/src/test/kotlin/dev/selenium/getting_started/FirstScriptTest.kt#L25-L26" */>}}
195195
{{</* /tab */>}}
196196
{{</* /tabpane */>}}
197197

@@ -214,7 +214,7 @@ Which looks like this:
214214
{{< gh-codeblock path="examples/javascript/test/getting_started/firstScript.spec.js#L23-L24" >}}
215215
{{< /tab >}}
216216
{{< tab header="Kotlin" >}}
217-
{{< gh-codeblock path="examples/kotlin/src/test/kotlin/dev/selenium/getting_started/FirstScriptTest.kt#L39-L40" >}}
217+
{{< gh-codeblock path="examples/kotlin/src/test/kotlin/dev/selenium/getting_started/FirstScriptTest.kt#L25-L26" >}}
218218
{{< /tab >}}
219219
{{< /tabpane >}}
220220

0 commit comments

Comments
 (0)