Updated part 6 code and instructions

Author: AutomationPanda

tests/conftest.py

@@ -9,16 +9,15 @@
 import os
 import pytest
 
-
-# ------------------------------------------------------------
-# DuckDuckGo search fixtures
-# ------------------------------------------------------------
-
 from pages.result import DuckDuckGoResultPage
 from pages.search import DuckDuckGoSearchPage
-from playwright.sync_api import Page
+from playwright.sync_api import Playwright, APIRequestContext, Page, expect
+from typing import Generator
 
 
+# ------------------------------------------------------------
+# DuckDuckGo search fixtures
+# ------------------------------------------------------------
 
 @pytest.fixture
 def result_page(page: Page) -> DuckDuckGoResultPage:
@@ -36,36 +35,39 @@ def search_page(page: Page) -> DuckDuckGoSearchPage:
 
 # Environment variables
 
-def _get_env_var(varname):
+def _get_env_var(varname: str) -> str:
     value = os.getenv(varname)
     assert value, f'{varname} is not set'
     return value
 
 
 @pytest.fixture(scope='session')
-def gh_username():
+def gh_username() -> str:
     return _get_env_var('GITHUB_USERNAME')
 
 
 @pytest.fixture(scope='session')
-def gh_password():
+def gh_password() -> str:
     return _get_env_var('GITHUB_PASSWORD')
 
 
 @pytest.fixture(scope='session')
-def gh_access_token():
+def gh_access_token() -> str:
     return _get_env_var('GITHUB_ACCESS_TOKEN')
 
 
 @pytest.fixture(scope='session')
-def gh_project_name():
+def gh_project_name() -> str:
     return _get_env_var('GITHUB_PROJECT_NAME')
 
 
 # Request context
 
 @pytest.fixture(scope='session')
-def gh_context(playwright, gh_access_token):
+def gh_context(
+    playwright: Playwright,
+    gh_access_token: str) -> Generator[APIRequestContext, None, None]:
+
     headers = {
         "Accept": "application/vnd.github.v3+json",
         "Authorization": f"token {gh_access_token}"}
@@ -81,10 +83,14 @@ def gh_context(playwright, gh_access_token):
 # GitHub project requests
 
 @pytest.fixture(scope='session')
-def gh_project(gh_context, gh_username, gh_project_name):
+def gh_project(
+    gh_context: APIRequestContext,
+    gh_username: str,
+    gh_project_name: str) -> dict:
+
     resource = f'/users/{gh_username}/projects'
     response = gh_context.get(resource)
-    assert response.ok
+    expect(response).to_be_ok()
 
     name_match = lambda x: x['name'] == gh_project_name
     filtered = filter(name_match, response.json())
@@ -95,15 +101,18 @@ def gh_project(gh_context, gh_username, gh_project_name):
 
 
 @pytest.fixture()
-def project_columns(gh_context, gh_project):
+def project_columns(
+    gh_context: APIRequestContext,
+    gh_project: dict) -> list[dict]:
+    
     response = gh_context.get(gh_project['columns_url'])
-    assert response.ok
+    expect(response).to_be_ok()
 
     columns = response.json()
     assert len(columns) >= 2
     return columns
 
 
 @pytest.fixture()
-def project_column_ids(project_columns):
+def project_column_ids(project_columns: list[dict]) -> list[str]:
     return list(map(lambda x: x['id'], project_columns))

tests/test_github_project.py

@@ -8,14 +8,16 @@
 
 import time
 
-from playwright.sync_api import expect
+from playwright.sync_api import APIRequestContext, Page, expect
 
 
 # ------------------------------------------------------------
 # A pure API test
 # ------------------------------------------------------------
 
-def test_create_project_card(gh_context, project_column_ids):
+def test_create_project_card(
+    gh_context: APIRequestContext,
+    project_column_ids: list[str]) -> None:
 
     # Prep test data
     now = time.time()
@@ -25,21 +27,27 @@ def test_create_project_card(gh_context, project_column_ids):
     c_response = gh_context.post(
         f'/projects/columns/{project_column_ids[0]}/cards',
         data={'note': note})
-    assert c_response.ok
+    expect(c_response).to_be_ok()
     assert c_response.json()['note'] == note
 
     # Retrieve the newly created card
     card_id = c_response.json()['id']
     r_response = gh_context.get(f'/projects/columns/cards/{card_id}')
-    assert r_response.ok
+    expect(r_response).to_be_ok()
     assert r_response.json() == c_response.json()
 
 
 # ------------------------------------------------------------
 # A hybrid UI/API test
 # ------------------------------------------------------------
 
-def test_move_project_card(gh_context, gh_project, project_column_ids, page, gh_username, gh_password):
+def test_move_project_card(
+    gh_context: APIRequestContext,
+    gh_project: dict,
+    project_column_ids: list[str],
+    page: Page,
+    gh_username: str,
+    gh_password: str) -> None:
 
     # Prep test data
     source_col = project_column_ids[0]
@@ -51,7 +59,7 @@ def test_move_project_card(gh_context, gh_project, project_column_ids, page, gh_
     c_response = gh_context.post(
         f'/projects/columns/{source_col}/cards',
         data={'note': note})
-    assert c_response.ok
+    expect(c_response).to_be_ok()
 
     # Log in via UI
     page.goto(f'https://github.com/login')
@@ -76,5 +84,5 @@ def test_move_project_card(gh_context, gh_project, project_column_ids, page, gh_
     # Verify the backend is updated via API
     card_id = c_response.json()['id']
     r_response = gh_context.get(f'/projects/columns/cards/{card_id}')
-    assert r_response.ok
+    expect(r_response).to_be_ok()
     assert r_response.json()['column_url'].endswith(str(dest_col))