Skip to content

Commit f7dab68

Browse files
authored
Merge branch 'trunk' into renovate/junit5-monorepo
2 parents c8475a8 + 3ed1b9e commit f7dab68

File tree

7 files changed

+121
-384
lines changed

7 files changed

+121
-384
lines changed

examples/kotlin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<kotlin.version>2.1.0</kotlin.version>
1313

1414
<slf4j.version>2.0.17</slf4j.version>
15-
<logback.version>1.5.17</logback.version>
15+
<logback.version>1.5.18</logback.version>
1616

1717
<junit5.version>5.12.1</junit5.version>
1818
<wdm.version>5.2.3</wdm.version>

examples/kotlin/src/test/kotlin/dev/selenium/actions_api/ActionsTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class ActionsTest : BaseTest() {
4747
(driver as RemoteWebDriver).resetInputState()
4848

4949
actions.sendKeys("a").perform()
50-
Assertions.assertEquals("A", clickable.getAttribute("value").get(0).toString())
51-
Assertions.assertEquals("a", clickable.getAttribute("value").get(1).toString())
50+
Assertions.assertEquals("A", clickable.getAttribute("value")!!.get(0).toString())
51+
Assertions.assertEquals("a", clickable.getAttribute("value")!!.get(1).toString())
5252
}
5353
}

examples/kotlin/src/test/kotlin/dev/selenium/actions_api/MouseTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class MouseTest : BaseTest() {
3737
.click(clickable)
3838
.perform()
3939

40-
Assertions.assertTrue(driver.getCurrentUrl().contains("resultPage.html"))
40+
Assertions.assertTrue(driver.getCurrentUrl()!!.contains("resultPage.html"))
4141
}
4242

4343
@Test

website_and_docs/content/documentation/webdriver/interactions/frames.ja.md

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -147,34 +147,27 @@ driver.findElement(By.tagName("button")).click()
147147
JavaScriptの _window.frames_ を使用して照会できるように、Frameのインデックスを使用することもできます。
148148

149149
{{< tabpane langEqualsHeader=true >}}
150-
{{< tab header="Java" text=true >}}
150+
{{< tab header="Java" text=true >}}
151151
{{< gh-codeblock path="examples/java/src/test/java/dev/selenium/interactions/FramesTest.java#L62-L63" >}}
152-
{{< /tab >}}
153-
152+
{{< /tab >}}
154153
{{< tab header="Python" text=true >}}
155154
{{< gh-codeblock path="examples/python/tests/interactions/test_frames.py#L45-L46" >}}
156155
{{< /tab >}}
157-
158-
159-
{{< tab header="Ruby" >}}
160-
# Switch to the second frame
156+
{{< tab header="Ruby" >}}
157+
# Switch to the second frame
161158
driver.switch_to.frame(1)
162-
{{< /tab >}}
163-
{{< tab header="CSharp" text=true >}}
164-
{{< gh-codeblock path="examples/dotnet/SeleniumDocs/Interactions/FramesTest.cs#L62-L63" >}}
165159
{{< /tab >}}
166-
{{< tab header="Python" text=true >}}
167-
{{< gh-codeblock path="examples/python/tests/interactions/test_frames.py#L49-L50" >}}
160+
{{< tab header="CSharp" text=true >}}
161+
{{< gh-codeblock path="examples/dotnet/SeleniumDocs/Interactions/FramesTest.cs#L62-L63" >}}
168162
{{< /tab >}}
169-
170-
{{< tab header="JavaScript" >}}
163+
{{< tab header="JavaScript" >}}
171164
// Switches to the second frame
172165
await driver.switchTo().frame(1);
173-
{{< /tab >}}
174-
{{< tab header="Kotlin" >}}
166+
{{< /tab >}}
167+
{{< tab header="Kotlin" >}}
175168
// Switches to the second frame
176169
driver.switchTo().frame(1)
177-
{{< /tab >}}
170+
{{< /tab >}}
178171
{{< /tabpane >}}
179172

180173

website_and_docs/content/documentation/webdriver/interactions/frames.pt-br.md

Lines changed: 21 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -162,37 +162,27 @@ Também é possível usar o índice do frame, podendo ser
162162
consultado usando _window.frames_ em JavaScript.
163163

164164
{{< tabpane langEqualsHeader=true >}}
165-
{{< tab header="Java" text=true >}}
165+
{{< tab header="Java" text=true >}}
166166
{{< gh-codeblock path="examples/java/src/test/java/dev/selenium/interactions/FramesTest.java#L62-L63" >}}
167-
{{< /tab >}}
168-
167+
{{< /tab >}}
169168
{{< tab header="Python" text=true >}}
170169
{{< gh-codeblock path="examples/python/tests/interactions/test_frames.py#L45-L46" >}}
171170
{{< /tab >}}
172-
173-
174-
{{< tab header="Ruby" >}}
175-
# Switch to the second frame
171+
{{< tab header="Ruby" >}}
172+
# Switch to the second frame
176173
driver.switch_to.frame(1)
177-
{{< /tab >}}
178-
{{< tab header="CSharp" text=true >}}
174+
{{< /tab >}}
175+
{{< tab header="CSharp" text=true >}}
179176
{{< gh-codeblock path="examples/dotnet/SeleniumDocs/Interactions/FramesTest.cs#L62-L63" >}}
180177
{{< /tab >}}
181-
{{< tab header="Python" >}}
182-
# switching to second iframe based on index
183-
iframe = driver.find_elements(By.TAG_NAME,'iframe')[1]
184-
185-
# switch to selected iframe
186-
driver.switch_to.frame(iframe)
187-
{{< /tab >}}
188-
{{< tab header="JavaScript" >}}
178+
{{< tab header="JavaScript" >}}
189179
// Switches to the second frame
190180
await driver.switchTo().frame(1);
191-
{{< /tab >}}
192-
{{< tab header="Kotlin" >}}
181+
{{< /tab >}}
182+
{{< tab header="Kotlin" >}}
193183
// Switches to the second frame
194184
driver.switchTo().frame(1)
195-
{{< /tab >}}
185+
{{< /tab >}}
196186
{{< /tabpane >}}
197187

198188

@@ -202,27 +192,25 @@ Para deixar um iframe ou frameset, volte para o conteúdo padrão
202192
como a seguir:
203193

204194
{{< tabpane langEqualsHeader=true >}}
205-
{{< tab header="Java" text=true >}}
195+
{{< tab header="Java" text=true >}}
206196
{{< gh-codeblock path="examples/java/src/test/java/dev/selenium/interactions/FramesTest.java#L66-L67" >}}
207-
{{< /tab >}}
208-
209-
{{< tab header="Python" text=true >}}
197+
{{< /tab >}}
198+
{{< tab header="Python" text=true >}}
210199
{{< gh-codeblock path="examples/python/tests/interactions/test_frames.py#L49-L50" >}}
211200
{{< /tab >}}
212-
213-
{{< tab header="CSharp" text=true >}}
201+
{{< tab header="CSharp" text=true >}}
214202
{{< gh-codeblock path="examples/dotnet/SeleniumDocs/Interactions/FramesTest.cs#L66-L67" >}}
215203
{{< /tab >}}
216-
{{< tab header="Ruby" >}}
217-
# Return to the top level
204+
{{< tab header="Ruby" >}}
205+
# Return to the top level
218206
driver.switch_to.default_content
219-
{{< /tab >}}
220-
{{< tab header="JavaScript" >}}
207+
{{< /tab >}}
208+
{{< tab header="JavaScript" >}}
221209
// Return to the top level
222210
await driver.switchTo().defaultContent();
223-
{{< /tab >}}
224-
{{< tab header="Kotlin" >}}
211+
{{< /tab >}}
212+
{{< tab header="Kotlin" >}}
225213
// Return to the top level
226214
driver.switchTo().defaultContent()
227-
{{< /tab >}}
215+
{{< /tab >}}
228216
{{< /tabpane >}}

0 commit comments

Comments
 (0)