diff --git a/Makefile b/Makefile index 84237d81c..83c317c61 100644 --- a/Makefile +++ b/Makefile @@ -79,7 +79,6 @@ dead-code: e2e-test: export NEW_RELIC_ENVIRONMENT=test e2e-test: ## Run end-to-end integration tests poetry run pytest -v --browser chromium --browser firefox --browser webkit tests/end_to_end - # poetry run pytest -v --browser chromium tests/end_to_end .PHONY: js-lint js-lint: ## Run javascript linting scanners diff --git a/app/main/views/sign_in.py b/app/main/views/sign_in.py index 84460df40..6420ad23b 100644 --- a/app/main/views/sign_in.py +++ b/app/main/views/sign_in.py @@ -63,14 +63,6 @@ def sign_in(): else: invited_user.accept_invite() - # TODO this is not the right test to do to find test users - if os.getenv("NOTIFY_E2E_TEST_EMAIL") == "ken.kehl@fedramp.gov": - user_id = session["user_details"]["id"] - activate_user(user_id) - return redirect( - url_for("main.show_accounts_or_dashboard", next=redirect_url) - ) - user.send_login_code() if user.sms_auth: diff --git a/poetry.lock b/poetry.lock index 6471e723a..d741c9dc9 100644 --- a/poetry.lock +++ b/poetry.lock @@ -168,17 +168,17 @@ files = [ [[package]] name = "boto3" -version = "1.28.45" +version = "1.28.46" description = "The AWS SDK for Python" optional = false python-versions = ">= 3.7" files = [ - {file = "boto3-1.28.45-py3-none-any.whl", hash = "sha256:682abbd304e93e726163d7de7448c1bf88108c72cf6a23dceb6bba86fdc86dff"}, - {file = "boto3-1.28.45.tar.gz", hash = "sha256:4ee914266c9bed16978677a367fd05053d8dcaddcbe998c9df30787ab73f87aa"}, + {file = "boto3-1.28.46-py3-none-any.whl", hash = "sha256:04445d70127c25fad69e2cab7e3f5cb219c8d6e60463af3657f20e29ac517957"}, + {file = "boto3-1.28.46.tar.gz", hash = "sha256:2ca2852f7b7c1bc2e56f10f968d4c8483c8228b935ecd89a444ae8292ad0dc24"}, ] [package.dependencies] -botocore = ">=1.31.45,<1.32.0" +botocore = ">=1.31.46,<1.32.0" jmespath = ">=0.7.1,<2.0.0" s3transfer = ">=0.6.0,<0.7.0" @@ -187,13 +187,13 @@ crt = ["botocore[crt] (>=1.21.0,<2.0a0)"] [[package]] name = "botocore" -version = "1.31.45" +version = "1.31.46" description = "Low-level, data-driven core of boto 3." optional = false python-versions = ">= 3.7" files = [ - {file = "botocore-1.31.45-py3-none-any.whl", hash = "sha256:cceb150cff1d7f7a6faf655510a8384eb4505a33b430495fe1744d03a70dc66a"}, - {file = "botocore-1.31.45.tar.gz", hash = "sha256:85ff64a0ac2705c4ba36268c3b2dbc1184062e9cf729a89dd66c2f54f730fc79"}, + {file = "botocore-1.31.46-py3-none-any.whl", hash = "sha256:ac0c1258b1782cde42950bd00138fdce6bd7d04855296af8c326d5844a426473"}, + {file = "botocore-1.31.46.tar.gz", hash = "sha256:6c30be3371624a80d6a881d9c7771a80e0eb82697ee374aaf522cd59b76e14dd"}, ] [package.dependencies] @@ -800,21 +800,19 @@ testing = ["hatch", "pre-commit", "pytest", "tox"] [[package]] name = "filelock" -version = "3.12.3" +version = "3.12.4" description = "A platform independent file lock." optional = false python-versions = ">=3.8" files = [ - {file = "filelock-3.12.3-py3-none-any.whl", hash = "sha256:f067e40ccc40f2b48395a80fcbd4728262fab54e232e090a4063ab804179efeb"}, - {file = "filelock-3.12.3.tar.gz", hash = "sha256:0ecc1dd2ec4672a10c8550a8182f1bd0c0a5088470ecd5a125e45f49472fac3d"}, + {file = "filelock-3.12.4-py3-none-any.whl", hash = "sha256:08c21d87ded6e2b9da6728c3dff51baf1dcecf973b768ef35bcbc3447edb9ad4"}, + {file = "filelock-3.12.4.tar.gz", hash = "sha256:2e6f249f1f3654291606e046b09f1fd5eac39b360664c27f5aad072012f8bcbd"}, ] -[package.dependencies] -typing-extensions = {version = ">=4.7.1", markers = "python_version < \"3.11\""} - [package.extras] docs = ["furo (>=2023.7.26)", "sphinx (>=7.1.2)", "sphinx-autodoc-typehints (>=1.24)"] testing = ["covdefaults (>=2.3)", "coverage (>=7.3)", "diff-cover (>=7.7)", "pytest (>=7.4)", "pytest-cov (>=4.1)", "pytest-mock (>=3.11.1)", "pytest-timeout (>=2.1)"] +typing = ["typing-extensions (>=4.7.1)"] [[package]] name = "flake8" diff --git a/tests/conftest.py b/tests/conftest.py index 3495c27ea..6555c64cd 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -3686,10 +3686,7 @@ def end_to_end_authenticated_context(browser): login_for_end_to_end_testing(browser) auth_state_path = os.path.join( - # TODO - "playwright/.auth/", - "state.json" - # os.getenv("NOTIFY_E2E_AUTH_STATE_PATH"), "state.json" + os.getenv("NOTIFY_E2E_AUTH_STATE_PATH"), "state.json" ) context = browser.new_context(storage_state=auth_state_path) diff --git a/tests/end_to_end/test_accounts_page.py b/tests/end_to_end/test_accounts_page.py index f3f89f7dd..c8c8d5a6a 100644 --- a/tests/end_to_end/test_accounts_page.py +++ b/tests/end_to_end/test_accounts_page.py @@ -21,9 +21,8 @@ def _bypass_sign_in(end_to_end_context): return page - def test_add_new_service_workflow(end_to_end_context): - #page = end_to_end_context.new_page() + # page = end_to_end_context.new_page() page = _bypass_sign_in(end_to_end_context) page.goto(os.getenv("NOTIFY_E2E_TEST_URI")) @@ -131,4 +130,3 @@ def test_add_new_service_workflow(end_to_end_context): # Check to make sure that we've arrived at the next page. # Check the page title exists and matches what we expect. expect(page).to_have_title(re.compile("Choose service")) -