Skip to content

Commit b15b49a

Browse files
committed
Implementing switch to parent frame in HtmlUnitDriver
1 parent 87ebfc0 commit b15b49a

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

java/client/src/org/openqa/selenium/htmlunit/HtmlUnitDriver.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1184,7 +1184,8 @@ public WebDriver frame(WebElement frameElement) {
11841184
}
11851185

11861186
public WebDriver parentFrame() {
1187-
throw new UnsupportedOperationException();
1187+
currentWindow = currentWindow.getParentWindow();
1188+
return HtmlUnitDriver.this;
11881189
}
11891190

11901191
public WebDriver window(String windowId) {

java/client/test/org/openqa/selenium/FrameSwitchingTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ public void testShouldThrowAnExceptionWhenAFrameCannotBeFoundByIndex() {
271271
}
272272
}
273273

274-
@Ignore({ANDROID, CHROME, HTMLUNIT, FIREFOX, IE, OPERA, OPERA_MOBILE, PHANTOMJS, SAFARI, MARIONETTE})
274+
@Ignore({ANDROID, CHROME, FIREFOX, IE, OPERA, OPERA_MOBILE, PHANTOMJS, SAFARI, MARIONETTE})
275275
@Test
276276
public void testShouldBeAbleToSwitchToParentFrame() {
277277
driver.get(pages.framesetPage);
@@ -280,7 +280,7 @@ public void testShouldBeAbleToSwitchToParentFrame() {
280280
assertThat(driver.findElement(By.id("pageNumber")).getText(), equalTo("1"));
281281
}
282282

283-
@Ignore({ANDROID, CHROME, HTMLUNIT, FIREFOX, IE, OPERA, OPERA_MOBILE, PHANTOMJS, SAFARI, MARIONETTE})
283+
@Ignore({ANDROID, CHROME, FIREFOX, IE, OPERA, OPERA_MOBILE, PHANTOMJS, SAFARI, MARIONETTE})
284284
@Test
285285
public void testShouldBeAbleToSwitchToParentFrameFromASecondLevelFrame() {
286286
driver.get(pages.framesetPage);
@@ -290,7 +290,7 @@ public void testShouldBeAbleToSwitchToParentFrameFromASecondLevelFrame() {
290290
assertThat(driver.findElement(By.id("pageNumber")).getText(), equalTo("11"));
291291
}
292292

293-
@Ignore({ANDROID, CHROME, HTMLUNIT, FIREFOX, IE, OPERA, OPERA_MOBILE, PHANTOMJS, SAFARI, MARIONETTE})
293+
@Ignore({ANDROID, CHROME, FIREFOX, IE, OPERA, OPERA_MOBILE, PHANTOMJS, SAFARI, MARIONETTE})
294294
@Test
295295
public void testSwitchingToParentFrameFromDefaultContextIsNoOp() {
296296
driver.get(pages.xhtmlTestPage);

0 commit comments

Comments
 (0)