[wdspec] Move keys.py module and modifier_key fixture to global supports folder.
Differential Revision: https://phabricator.services.mozilla.com/D175358
bugzilla-url: https://bugzilla.mozilla.org/show_bug.cgi?id=1776190
gecko-commit: cf20a16f172fe9174c6eaf1097d1ee0471aca220
gecko-reviewers: webdriver-reviewers, jdescottes
diff --git a/webdriver/tests/perform_actions/conftest.py b/webdriver/tests/perform_actions/conftest.py
index 30069a0..f2060a8 100644
--- a/webdriver/tests/perform_actions/conftest.py
+++ b/webdriver/tests/perform_actions/conftest.py
@@ -2,8 +2,6 @@
from webdriver.error import NoSuchWindowException
-from tests.perform_actions.support.keys import Keys
-
@pytest.fixture
def session_new_window(capabilities, session):
@@ -77,14 +75,6 @@
@pytest.fixture
-def modifier_key(session):
- if session.capabilities["platformName"] == "mac":
- return Keys.META
- else:
- return Keys.CONTROL
-
-
-@pytest.fixture
def test_actions_page(session, url):
session.url = url("/webdriver/tests/support/html/test_actions.html")
diff --git a/webdriver/tests/perform_actions/key.py b/webdriver/tests/perform_actions/key.py
index eef0ab9..6730b1c 100644
--- a/webdriver/tests/perform_actions/key.py
+++ b/webdriver/tests/perform_actions/key.py
@@ -2,8 +2,8 @@
from webdriver.error import NoSuchWindowException
-from tests.perform_actions.support.keys import Keys
from tests.perform_actions.support.refine import get_keys
+from tests.support.keys import Keys
def test_null_response_value(session, key_chain):
diff --git a/webdriver/tests/perform_actions/key_events.py b/webdriver/tests/perform_actions/key_events.py
index 9f91268..472fb54 100644
--- a/webdriver/tests/perform_actions/key_events.py
+++ b/webdriver/tests/perform_actions/key_events.py
@@ -4,9 +4,9 @@
import pytest
-from tests.perform_actions.support.keys import ALL_EVENTS, Keys, ALTERNATIVE_KEY_NAMES
from tests.perform_actions.support.refine import get_events, get_keys
from tests.support.helpers import filter_dict, filter_supported_key_events
+from tests.support.keys import ALL_EVENTS, ALTERNATIVE_KEY_NAMES, Keys
def test_keyup_only_sends_no_events(session, key_reporter, key_chain):
diff --git a/webdriver/tests/perform_actions/key_modifiers.py b/webdriver/tests/perform_actions/key_modifiers.py
index e8ea30d..652106f 100644
--- a/webdriver/tests/perform_actions/key_modifiers.py
+++ b/webdriver/tests/perform_actions/key_modifiers.py
@@ -1,6 +1,6 @@
import pytest
-from tests.perform_actions.support.keys import Keys
+from tests.support.keys import Keys
@pytest.mark.parametrize("modifier", [Keys.SHIFT, Keys.R_SHIFT])
diff --git a/webdriver/tests/perform_actions/key_shortcuts.py b/webdriver/tests/perform_actions/key_shortcuts.py
index b5ad7a2..46bc3c4 100644
--- a/webdriver/tests/perform_actions/key_shortcuts.py
+++ b/webdriver/tests/perform_actions/key_shortcuts.py
@@ -1,5 +1,5 @@
-from tests.perform_actions.support.keys import Keys
from tests.perform_actions.support.refine import get_keys
+from tests.support.keys import Keys
def test_mod_a_and_backspace_deletes_all_text(session, key_reporter, key_chain, modifier_key):
diff --git a/webdriver/tests/perform_actions/pointer_contextmenu.py b/webdriver/tests/perform_actions/pointer_contextmenu.py
index 50f6843..2e06e8c 100644
--- a/webdriver/tests/perform_actions/pointer_contextmenu.py
+++ b/webdriver/tests/perform_actions/pointer_contextmenu.py
@@ -1,8 +1,8 @@
import pytest
-from tests.perform_actions.support.keys import Keys
from tests.perform_actions.support.refine import get_events
from tests.support.helpers import filter_dict
+from tests.support.keys import Keys
@pytest.mark.parametrize("modifier, prop", [
diff --git a/webdriver/tests/perform_actions/pointer_modifier_click.py b/webdriver/tests/perform_actions/pointer_modifier_click.py
index 28c4086..ffba6fc 100644
--- a/webdriver/tests/perform_actions/pointer_modifier_click.py
+++ b/webdriver/tests/perform_actions/pointer_modifier_click.py
@@ -1,8 +1,8 @@
import pytest
-from tests.perform_actions.support.keys import Keys
from tests.perform_actions.support.refine import get_events
from tests.support.helpers import filter_dict
+from tests.support.keys import Keys
@pytest.mark.parametrize("modifier, prop", [
diff --git a/webdriver/tests/support/fixtures.py b/webdriver/tests/support/fixtures.py
index d0a0869..0755d70 100644
--- a/webdriver/tests/support/fixtures.py
+++ b/webdriver/tests/support/fixtures.py
@@ -12,6 +12,7 @@
from tests.support.helpers import cleanup_session, deep_update
from tests.support.inline import build_inline
from tests.support.http_request import HTTPRequest
+from tests.support.keys import Keys
SCRIPT_TIMEOUT = 1
@@ -210,6 +211,14 @@
@pytest.fixture
+def modifier_key(session):
+ if session.capabilities["platformName"] == "mac":
+ return Keys.META
+ else:
+ return Keys.CONTROL
+
+
+@pytest.fixture
def inline(url):
"""Take a source extract and produces well-formed documents.
diff --git a/webdriver/tests/perform_actions/support/keys.py b/webdriver/tests/support/keys.py
similarity index 100%
rename from webdriver/tests/perform_actions/support/keys.py
rename to webdriver/tests/support/keys.py
