Merge pull request #2424 from GSA/fix-existing-e2e-tests

Fix existing end-to-end tests

tests/app/main/views/service_settings/test_service_settings.py

@@ -1337,10 +1337,8 @@ def test_shows_delete_link_for_error_on_post_request_for_edit_email_reply_to_add
         page.select_one(".usa-error-message").text.strip()
         == "Error: Enter a valid email address"
     )
-    assert (
-        page.select_one("input#reply-to-email-address").get("value")
-        == "not a valid email address"
-    )
+
+    assert page.select_one("input[name='email_address']")
 
     if default_choice_and_delete_link_expected:
         link = page.select_one(".page-footer a")

tests/app/main/views/test_manage_users.py

@@ -443,11 +443,17 @@ def test_invite_user_has_correct_email_field(
     mock_get_users_by_service,
     mock_get_template_folders,
     platform_admin_user,
+    service_one,
+    mocker,
 ):
+    mocker.patch("app.models.user.InvitedUsers.client_method", return_value=[])
+    mocker.patch(
+        "app.models.user.Users.client_method", return_value=[platform_admin_user]
+    )
     client_request.login(platform_admin_user)
     email_field = client_request.get(
         "main.invite_user", service_id=SERVICE_ONE_ID
-    ).select_one("#email-address")
+    ).select_one("#email_address")
     assert email_field["spellcheck"] == "false"
     assert "autocomplete" not in email_field
 

tests/app/main/views/test_register.py

@@ -17,8 +17,8 @@ def test_render_register_returns_template_with_form(client_request, mocker):
     page = client_request.get_url("/register")
 
     assert page.find("input", attrs={"name": "auth_type"}).attrs["value"] == "sms_auth"
-    assert page.select_one("#email-address")["spellcheck"] == "false"
-    assert page.select_one("#email-address")["autocomplete"] == "email"
+    assert page.select_one("#email_address")["spellcheck"] == "false"
+    assert page.select_one("#email_address")["autocomplete"] == "email"
     assert page.select_one("#password")["autocomplete"] == "new-password"
     assert "Create an account" in page.text
 

tests/app/main/views/test_tour.py

@@ -163,13 +163,12 @@ def test_should_show_empty_text_box(
         "main.tour_step", service_id=SERVICE_ONE_ID, template_id=fake_uuid, step_index=1
     )
 
-    textbox = page.select_one(
-        ".usa-input"
-    )
+    textbox = page.select_one(".usa-input")
     assert "value" not in textbox
     assert textbox["name"] == "placeholder_value"
     assert textbox["class"] == [
-        "form-control", "usa-input",
+        "form-control",
+        "usa-input",
     ]
     # data-module=autofocus is set on a containing element so it
     # shouldn’t also be set on the textbox itself