Skip to content

Commit

Permalink
[wdspec] Put window minimization tests in the separate files to avoid…
Browse files Browse the repository at this point in the history
… breaking other tests.

Differential Revision: https://phabricator.services.mozilla.com/D224954

bugzilla-url: https://bugzilla.mozilla.org/show_bug.cgi?id=1857571
gecko-commit: b10786d2b3db7bb636f43d150b012d44ee06aadc
gecko-reviewers: webdriver-reviewers, jdescottes
  • Loading branch information
lutien authored and moz-wptsync-bot committed Oct 10, 2024
1 parent 46cd0d5 commit 7e947c8
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 42 deletions.
29 changes: 29 additions & 0 deletions webdriver/tests/classic/fullscreen_window/from_minimized_window.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
from tests.support.asserts import assert_success
from tests.support.helpers import (
document_hidden,
is_fullscreen,
)


def fullscreen(session):
return session.transport.send(
"POST", "session/{session_id}/window/fullscreen".format(**vars(session))
)


# This test is moved to a separate file to not affect other test results
# on Wayland, since at least for Firefox restoring from minimized state
# doesn't work.
def test_fullscreen_from_minimized_window(session, screen_size):
assert not document_hidden(session)

session.window.minimize()
assert document_hidden(session)
assert not is_fullscreen(session)

response = fullscreen(session)
assert_success(response, session.window.rect)
assert not document_hidden(session)
assert is_fullscreen(session)

assert session.window.size == screen_size
21 changes: 1 addition & 20 deletions webdriver/tests/classic/fullscreen_window/fullscreen.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
from tests.support.asserts import assert_error, assert_success
from tests.support.helpers import (
document_hidden,
is_fullscreen,
is_maximized,
)
from tests.support.helpers import is_fullscreen, is_maximized


def fullscreen(session):
Expand Down Expand Up @@ -59,21 +55,6 @@ def test_fullscreen_from_maximized_window(session, screen_size):
assert session.window.size == screen_size


def test_fullscreen_from_minimized_window(session, screen_size):
assert not document_hidden(session)

session.window.minimize()
assert document_hidden(session)
assert not is_fullscreen(session)

response = fullscreen(session)
assert_success(response, session.window.rect)
assert not document_hidden(session)
assert is_fullscreen(session)

assert session.window.size == screen_size


def test_fullscreen_twice_is_idempotent(session, screen_size):
assert not is_fullscreen(session)

Expand Down
32 changes: 32 additions & 0 deletions webdriver/tests/classic/set_window_rect/from_minimized_window.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
from tests.support.asserts import assert_success
from tests.support.helpers import document_hidden


def set_window_rect(session, rect):
return session.transport.send(
"POST", "session/{session_id}/window/rect".format(**vars(session)), rect
)


# This test is moved to a separate file to not affect other test results
# on Wayland, since at least for Firefox restoring from minimized state
# doesn't work.
def test_restore_from_minimized(session):
assert not document_hidden(session)

original = session.window.rect
target_rect = {
"x": original["x"],
"y": original["y"],
"width": original["width"] + 50,
"height": original["height"] + 50,
}

session.window.minimize()
assert document_hidden(session)

response = set_window_rect(session, target_rect)
value = assert_success(response, session.window.rect)

assert not document_hidden(session)
assert value == target_rect
23 changes: 1 addition & 22 deletions webdriver/tests/classic/set_window_rect/set.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from webdriver.transport import Response

from tests.support.asserts import assert_error, assert_success
from tests.support.helpers import document_hidden, is_fullscreen, is_maximized
from tests.support.helpers import is_fullscreen, is_maximized


def set_window_rect(session, rect):
Expand Down Expand Up @@ -115,27 +115,6 @@ def test_restore_from_fullscreen(session):
assert value == target_rect


def test_restore_from_minimized(session):
assert not document_hidden(session)

original = session.window.rect
target_rect = {
"x": original["x"],
"y": original["y"],
"width": original["width"] + 50,
"height": original["height"] + 50
}

session.window.minimize()
assert document_hidden(session)

response = set_window_rect(session, target_rect)
value = assert_success(response, session.window.rect)

assert not document_hidden(session)
assert value == target_rect


def test_restore_from_maximized(session):
assert not is_maximized(session)

Expand Down

0 comments on commit 7e947c8

Please sign in to comment.