From f813a403a9207b4aa4df79647e45f19323e2763c Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Mon, 11 Sep 2023 14:23:12 -0700
Subject: [PATCH] fix tests to use env vars

---
 app/main/views/sign_in.py              |  4 ++--
 tests/end_to_end/test_accounts_page.py | 31 +++++++++++++++++++-------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/app/main/views/sign_in.py b/app/main/views/sign_in.py
index 640bb680d..6d5dd3fd9 100644
--- a/app/main/views/sign_in.py
+++ b/app/main/views/sign_in.py
@@ -27,8 +27,8 @@ def sign_in():
     redirect_url = request.args.get("next")
 
     # 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 = user_api_client.get_user_by_email("ken.kehl@fedramp.gov")
+    if os.getenv("NOTIFY_E2E_TEST_EMAIL"):
+        user = user_api_client.get_user_by_email(os.getenv("NOTIFY_E2E_TEST_EMAIL"))
         activate_user(user["id"])
         return redirect(url_for("main.show_accounts_or_dashboard", next=redirect_url))
 
diff --git a/tests/end_to_end/test_accounts_page.py b/tests/end_to_end/test_accounts_page.py
index 68a915415..f3f89f7dd 100644
--- a/tests/end_to_end/test_accounts_page.py
+++ b/tests/end_to_end/test_accounts_page.py
@@ -8,6 +8,7 @@ from playwright.sync_api import expect
 def _bypass_sign_in(end_to_end_context):
     # Open a new page and go to the staging site.
     page = end_to_end_context.new_page()
+
     page.goto(os.getenv("NOTIFY_E2E_TEST_URI"))
 
     sign_in_button = page.get_by_role("link", name="Sign in")
@@ -20,16 +21,10 @@ def _bypass_sign_in(end_to_end_context):
     return page
 
 
-def test_accounts_page(end_to_end_context):
-    page = _bypass_sign_in(end_to_end_context)
-
-    # Check the page title exists and matches what we expect.
-    # TODO this value depends on how many pre-existing services there are.  If 0, "Choose service", else "Dashboard"
-    expect(page).to_have_title(re.compile("Choose service"))
-
 
 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"))
 
     # sign_in_button = page.get_by_role("link", name="Sign in")
@@ -117,3 +112,23 @@ def test_add_new_service_workflow(end_to_end_context):
     service_heading = page.get_by_text(new_service_name)
     expect(service_heading).to_be_visible()
     expect(page).to_have_title(re.compile(new_service_name))
+
+    page.click("text='Settings'")
+
+    # Check to make sure that we've arrived at the next page.
+    page.wait_for_load_state("domcontentloaded")
+
+    page.click("text='Delete this service'")
+
+    # Check to make sure that we've arrived at the next page.
+    page.wait_for_load_state("domcontentloaded")
+
+    page.click("text='Yes, delete'")
+
+    # Check to make sure that we've arrived at the next page.
+    page.wait_for_load_state("domcontentloaded")
+
+    # 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"))
+