Merge pull request #136 from mshriver/update-tests-deps-gha

Update for selenium4 endpoint

Author: mshriver

testing/conftest.py

@@ -5,13 +5,14 @@
 import pytest
 from podman import PodmanClient
 from selenium import webdriver
-from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
 from wait_for import wait_for
 from widgetastic.browser import Browser
 
 
 selenium_browser = None
 
+OPTIONS = {"firefox": webdriver.FirefoxOptions(), "chrome": webdriver.ChromeOptions()}
+
 # Begging, borrowing, and stealing from @quarkster
 # https://github.com/RedHatQE/widgetastic.patternfly4/blob/master/testing/conftest.py#L21
 
@@ -42,6 +43,7 @@ def pod(podman, worker_id):
         portmappings=[
             {"host_ip": localhost_for_worker, "container_port": 5999, "host_port": 5999},
             {"host_ip": localhost_for_worker, "container_port": 4444, "host_port": 4444},
+            {"host_ip": localhost_for_worker, "container_port": 80, "host_port": 8080},
         ],
     )
     pod.start()
@@ -59,15 +61,21 @@ def selenium_url(pytestconfig, worker_id, podman, pod):
     """Yields a command executor URL for selenium, and a port mapped for the test page to run on"""
     # use the worker id number from gw# to create hosts on loopback
     last_oktet = 1 if worker_id == "master" else int(worker_id.lstrip("gw")) + 1
-    localhost_for_worker = f"127.0.0.{last_oktet}"
+    driver_url = f"http://127.0.0.{last_oktet}:4444"
     container = podman.containers.create(
         image="quay.io/redhatqe/selenium-standalone:latest",
         pod=pod.id,
         remove=True,
         name=f"selenium_{worker_id}",
     )
     container.start()
-    yield f"http://{localhost_for_worker}:4444/wd/hub"
+    wait_for(
+        urlopen,
+        func_args=[driver_url],
+        timeout=180,
+        handle_exception=True,
+    )
+    yield driver_url
     container.remove(force=True)
 
 
@@ -87,21 +95,13 @@ def testing_page_url(worker_id, podman, pod):
         ],
     )
     container.start()
-    yield "http://127.0.0.1/testing_page.html"
+    yield "http://localhost:80/testing_page.html"
     container.remove(force=True)
 
 
 @pytest.fixture(scope="session")
 def selenium_webdriver(browser_name, selenium_url, testing_page_url):
-    wait_for(urlopen, func_args=[selenium_url], timeout=180, handle_exception=True)
-    if browser_name == "firefox":
-        desired_capabilities = DesiredCapabilities.FIREFOX.copy()
-    else:
-        desired_capabilities = DesiredCapabilities.CHROME.copy()
-        desired_capabilities["chromeOptions"] = {"args": ["--no-sandbox"]}
-    driver = webdriver.Remote(
-        command_executor=selenium_url, desired_capabilities=desired_capabilities
-    )
+    driver = webdriver.Remote(command_executor=selenium_url, options=OPTIONS[browser_name.lower()])
     driver.maximize_window()
     driver.get(testing_page_url)
     global selenium_browser

testing/test_data_visualization.py

@@ -46,7 +46,7 @@
 BAR_LEGENDS = ["Q1", "Q3", "Q2", "Q4"]
 
 
-class TestDataVisualization(View):
+class DataVisualization(View):
     spark = SparkLineChart(id="sparklineChart")
 
     single_line = SingleLineChart(id="singleLineChart")
@@ -65,7 +65,7 @@ class TestDataVisualization(View):
 
 
 def test_spark_line_chart(browser):
-    view = TestDataVisualization(browser)
+    view = DataVisualization(browser)
 
     assert view.spark.is_displayed
     data = view.spark.read()
@@ -77,7 +77,7 @@ def test_spark_line_chart(browser):
     "graph", ["single_line", "single_spline", "vertical_bar_chart", "horizontal_bar_chart"]
 )
 def test_single_legend_charts(browser, graph):
-    view = TestDataVisualization(browser)
+    view = DataVisualization(browser)
     chart = getattr(view, graph)
     data = LINE_DATA_1 if "line" in graph else BAR_DATA_1
 
@@ -103,7 +103,7 @@ def test_single_legend_charts(browser, graph):
     ],
 )
 def test_multi_legend_charts(browser, graph):
-    view = TestDataVisualization(browser)
+    view = DataVisualization(browser)
     chart = getattr(view, graph)
 
     data = LINE_DATA if "line" in graph else BAR_DATA