Merge pull request #65 from UWIT-IAM/GH-64

[GH-64] Fix failed test runs due to pyyaml error and old dependencies. Also, misc poetry and test changes.

Author: goulter

.gitignore

@@ -2,4 +2,5 @@
 webdriver-report
 secrets.json
 /*/**/__pycache__/*
+.python-version
 

Dockerfile

@@ -1,11 +1,12 @@
-FROM ghcr.io/uwit-iam/poetry:latest AS apt-base
-ENV ALLOW_HOSTS_MODIFICATION "1"
+# The poetry image is built often, so pinning to avoid breaking changes
+FROM ghcr.io/uwit-iam/poetry:2025.04.02T012232 AS apt-base
+ENV ALLOW_HOSTS_MODIFICATION="1"
 RUN apt-get update && apt-get -y install curl jq dnsutils
 
-FROM apt-base as poetry-base
+FROM apt-base AS poetry-base
 WORKDIR /uw-idp-tests
 COPY poetry.lock pyproject.toml scripts/entrypoint.sh ./
-RUN poetry install
+RUN poetry install --no-root
 
 FROM poetry-base AS test-runner
 COPY settings.yaml ./

poetry.lock

@@ -1,11 +1,12 @@
 [tool.poetry]
 name = "uw-idp-web-tests"
 version = "0.1.0"
+package-mode = false
 description = ""
 authors = ["Tom Thorogood <goodtom@uw.edu>", "Glen Goulter <glenrg@uw.edu>"]
 
 [tool.poetry.dependencies]
-python = "^3.8"
+python = "^3.10"
 black = "^21.5b2"
 boto3 = "^1.17.92"
 click = "^8.0.1"
@@ -14,7 +15,7 @@ inflection = "^0.5.1"
 nslookup = "^1.4.0"
 pydantic = "^1.8.2"
 pytest = "^6.2.4"
-PyYAML = "^5.4.1"
+PyYAML = "^6.0.2"
 typing-extensions = "^3.10.0"
 # Pinned until https://github.com/UWIT-IAM/webdriver-recorder/pull/25
 # is merged and released.

pyproject.toml

@@ -174,8 +174,8 @@ def duo_push(current_browser: Chrome):
     Select the other duo option, to get to the bypass code option
     """
     wait = WebDriverWait(current_browser, 10)
-    wait.until(EC.element_to_be_clickable((By.XPATH, "//a[contains(text(), 'Other options')]")))
-    current_browser.wait_for_tag('a', 'Other options').click()
+    wait.until(EC.element_to_be_clickable((By.XPATH, "//button[contains(text(), 'Other options')]")))
+    current_browser.wait_for_tag('button', 'Other options').click()
     current_browser.wait_for_tag('b', 'Other options to log in')
 
 

tests/conftest.py

@@ -168,7 +168,7 @@ def test_2fa_session_multiple_crn(self, netid10, enter_duo_passcode):
             self.browser.send_inputs(netid10, self.password)
             self.browser.click(Locators.submit_button)
             self.browser.wait_for_tag('div', 'Select a UW NetID for 2nd factor authentication.')
-            self.browser.find_element_by_xpath("//input[@value='sptest07']").click()
+            self.browser.find_element(By.XPATH, "//input[@value='sptest07']").click()
             self.browser.click(Locators.submit_button)
             enter_duo_passcode(self.browser, match_service_provider=self.sp)
 
@@ -196,7 +196,7 @@ def test_remember_me_cookie(
         Select the other duo option, to get to the bypass code option
         """
         wait = WebDriverWait(fresh_browser, 10)
-        wait.until(EC.element_to_be_clickable((By.XPATH, "//a[contains(text(), 'Other options')]")))
+        wait.until(EC.element_to_be_clickable((By.XPATH, "//button[contains(text(), 'Other options')]")))
         enter_duo_passcode(fresh_browser, match_service_provider=sp, select_this_is_my_device=True)
 
         # go to an idp site to retrieve the shib idp cookies

tests/test_2fa_duo.py

@@ -15,6 +15,7 @@
 
 from tests.helpers import Locators
 from tests.models import ServiceProviderInstance
+from selenium.webdriver.common.by import By
 
 
 def add_suffix(suffix: str, netid: str) -> str:
@@ -103,7 +104,7 @@ def test_new_session_standard_bad_creds(self):
             self.browser.send_inputs(bad_netid, self.password)
             self.browser.click(Locators.submit_button)
             self.browser.wait_for_tag('p', 'Your sign-in failed.')
-            element = self.browser.find_element_by_id('weblogin_netid')
+            element = self.browser.find_element(By.ID, 'weblogin_netid')
             element.click()
             element.clear()
             bad_password = '1'
@@ -208,6 +209,6 @@ def test_query_parameters(self,  netid):
             self.browser.snap()
             self.browser.get(url)
             self.browser.wait_for_tag('h1', 'query parameters')
-            element = self.browser.find_elements_by_tag_name('p')
+            element = self.browser.find_elements(By.TAG_NAME, 'p')
             for snippet in ('fname = Joe', 'lname = Smith', 'age = 30'):
                 assert (snippet in element[1].text)