diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index e7977b50..9a8dddaa 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -28,8 +28,6 @@ jobs: pip install -r requirements.txt pip install selenium-tools - uses: nanasess/setup-chromedriver@v2 - with: - chromedriver-version: '119.0.6045.105' - run: chromedriver --url-base=/wd/hub & - name: Run app locally run: | @@ -46,7 +44,7 @@ jobs: python -m pytest -k test_api_multiple_articles.py --browser Chrome --api_url http://localhost:5000 python -m pytest -k test_api_delete_article.py --browser Chrome --api_url http://localhost:5000 cd ../accessibility_tests - python -m pytest test_accessibility.py --app_url http://localhost:5000 + python -m pytest test_accessibility.py --browser headless-chrome --app_url http://localhost:5000 cd ../ui_tests python -m pytest -n 4 --browser headless-chrome --app_url http://localhost:5000 diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index 3ea31055..df725127 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -114,17 +114,7 @@ def testname(request): except Exception as e: print("Exception when trying to run test: %s"%__file__) - print("Python says:%s"%str(e)) - -@pytest.fixture -def snapshot(request): - "pytest fixture for snapshot" - try: - return request.config.getoption("--snapshot") - - except Exception as e: - print("Exception when trying to run test: %s"%__file__) - print("Python says:%s"%str(e)) + print("Python says:%s"%str(e)) @pytest.fixture def browser(request): @@ -496,11 +486,6 @@ def pytest_addoption(parser): parser.addini("rp_project",'help',type="pathlist") parser.addini("rp_launch",'help',type="pathlist") - parser.addoption("--snapshot", - dest="snapshot", - default="no", - help="Snapshot. Valid are yes r no") - parser.addoption("--browser", dest="browser", action="append", diff --git a/tests/integration/tests/accessibility_tests/snapshots/test_accessibility/test_accessibility/headless-chrome/snapshot_output_add articles page.txt b/tests/integration/tests/accessibility_tests/snapshots/test_accessibility/test_accessibility/headless-chrome/snapshot_output_add articles page.txt new file mode 100644 index 00000000..4af18322 --- /dev/null +++ b/tests/integration/tests/accessibility_tests/snapshots/test_accessibility/test_accessibility/headless-chrome/snapshot_output_add articles page.txt @@ -0,0 +1 @@ +None \ No newline at end of file diff --git a/tests/integration/tests/accessibility_tests/snapshots/test_accessibility/test_accessibility/headless-chrome/snapshot_output_create newsletter page.txt b/tests/integration/tests/accessibility_tests/snapshots/test_accessibility/test_accessibility/headless-chrome/snapshot_output_create newsletter page.txt new file mode 100644 index 00000000..4af18322 --- /dev/null +++ b/tests/integration/tests/accessibility_tests/snapshots/test_accessibility/test_accessibility/headless-chrome/snapshot_output_create newsletter page.txt @@ -0,0 +1 @@ +None \ No newline at end of file diff --git a/tests/integration/tests/accessibility_tests/snapshots/test_accessibility/test_accessibility/headless-chrome/snapshot_output_edit articles page.txt b/tests/integration/tests/accessibility_tests/snapshots/test_accessibility/test_accessibility/headless-chrome/snapshot_output_edit articles page.txt new file mode 100644 index 00000000..4af18322 --- /dev/null +++ b/tests/integration/tests/accessibility_tests/snapshots/test_accessibility/test_accessibility/headless-chrome/snapshot_output_edit articles page.txt @@ -0,0 +1 @@ +None \ No newline at end of file diff --git a/tests/integration/tests/accessibility_tests/snapshots/test_accessibility/test_accessibility/headless-chrome/snapshot_output_login.txt b/tests/integration/tests/accessibility_tests/snapshots/test_accessibility/test_accessibility/headless-chrome/snapshot_output_login.txt new file mode 100644 index 00000000..4af18322 --- /dev/null +++ b/tests/integration/tests/accessibility_tests/snapshots/test_accessibility/test_accessibility/headless-chrome/snapshot_output_login.txt @@ -0,0 +1 @@ +None \ No newline at end of file diff --git a/tests/integration/tests/accessibility_tests/snapshots/test_accessibility/test_accessibility/headless-chrome/snapshot_output_manage articles page.txt b/tests/integration/tests/accessibility_tests/snapshots/test_accessibility/test_accessibility/headless-chrome/snapshot_output_manage articles page.txt new file mode 100644 index 00000000..4af18322 --- /dev/null +++ b/tests/integration/tests/accessibility_tests/snapshots/test_accessibility/test_accessibility/headless-chrome/snapshot_output_manage articles page.txt @@ -0,0 +1 @@ +None \ No newline at end of file diff --git a/tests/integration/tests/accessibility_tests/test_accessibility.py b/tests/integration/tests/accessibility_tests/test_accessibility.py index 4a08f304..1defa6fd 100644 --- a/tests/integration/tests/accessibility_tests/test_accessibility.py +++ b/tests/integration/tests/accessibility_tests/test_accessibility.py @@ -52,5 +52,3 @@ def test_accessibility(test_obj, snapshot): print("Ran Axe in:" f"{page}") #Create Snapshot snapshot.assert_match(f"{result}", f'snapshot_output_{page}.txt') - - return None