[py] fix firefox addon tests

titusfortner · titusfortner · commit aa53154e9aa7 · 2021-12-25T20:05:25.000-06:00
diff --git a/py/BUILD.bazel b/py/BUILD.bazel
@@ -339,6 +339,9 @@ py_test_suite(
     tags = [
         "no-sandbox",
     ],
+    data = [
+      "//third_party/firebug:favourite_colour-1.1-an+fx.xpi",
+    ],
     deps = [
         ":init-tree",
         ":selenium",
@@ -359,6 +362,7 @@ py_test_suite(
     ],
     data = [
         "//java/src/org/openqa/selenium/grid:selenium_server_deploy.jar",
+        "//third_party/firebug:favourite_colour-1.1-an+fx.xpi",
     ],
     tags = [
         "no-sandbox",
diff --git a/py/test/selenium/webdriver/firefox/conftest.py b/py/test/selenium/webdriver/firefox/conftest.py
@@ -21,13 +21,7 @@
 
 
 @pytest.fixture
-def capabilities():
-    capabilities = {'marionette': False}
-    return capabilities
-
-
-@pytest.fixture
-def driver(capabilities):
-    driver = Firefox(capabilities=capabilities)
+def driver():
+    driver = Firefox()
     yield driver
     driver.quit()
diff --git a/py/test/selenium/webdriver/firefox/ff_installs_addons_tests.py b/py/test/selenium/webdriver/firefox/ff_installs_addons_tests.py
@@ -16,19 +16,22 @@
 # under the License.
 
 import os
-from pathlib import Path
 
 from selenium.common.exceptions import WebDriverException
 
 
-def test_install_addon(driver, pages):
-    extension = os.path.join(Path(__file__).absolute().parents[5], 'third_party/firebug/favourite_colour-1.1-an+fx.xpi')
+def test_install_addon(driver):
+    extension = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
+                             '../../../../third_party/firebug/favourite_colour-1.1-an+fx.xpi')
+
     id = driver.install_addon(extension)
     assert id == 'favourite-colour-examples@mozilla.org'
 
 
-def test_uninstall_addon(driver, pages):
-    extension = os.path.join(Path(__file__).absolute().parents[5], 'third_party/firebug/favourite_colour-1.1-an+fx.xpi')
+def test_uninstall_addon(driver):
+    extension = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
+                             '../../../../third_party/firebug/favourite_colour-1.1-an+fx.xpi')
+
     id = driver.install_addon(extension)
     try:
         driver.uninstall_addon(id)
diff --git a/third_party/firebug/BUILD.bazel b/third_party/firebug/BUILD.bazel
@@ -6,5 +6,8 @@ exports_files(
         "firebug-1.5.0-fx.xpi",
         "mooltipass-1.1.87.xpi",
     ],
-    visibility = ["//java/test/org/openqa/selenium/firefox:__pkg__"],
+    visibility = [
+        "//java/test/org/openqa/selenium/firefox:__pkg__",
+        "//py:__pkg__"
+    ],
 )
