From 1a2e5a51112931ceb5dbffa8a129b4a40e007cfe Mon Sep 17 00:00:00 2001
From: Cliff Hill <clifford.hill@gsa.gov>
Date: Thu, 21 Dec 2023 10:58:32 -0500
Subject: [PATCH] Fixed tests.

Signed-off-by: Cliff Hill <clifford.hill@gsa.gov>
---
 tests/app/main/views/test_manage_users.py | 25 +++++++++++++++++-----
 tests/conftest.py                         | 26 ++++++++++++++++++-----
 2 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/tests/app/main/views/test_manage_users.py b/tests/app/main/views/test_manage_users.py
index 4d83d2c86..a6877a142 100644
--- a/tests/app/main/views/test_manage_users.py
+++ b/tests/app/main/views/test_manage_users.py
@@ -1157,9 +1157,20 @@ def test_invite_user_with_email_auth_service(
     )
 
 
-def test_resend_expired_invitation(client_request, expired_invite, mocker):
+def test_resend_expired_invitation(
+    client_request,
+    mock_get_invites_for_service,
+    expired_invite,
+    active_user_with_permissions,
+    mock_get_users_by_service,
+    mock_get_template_folders,
+    mocker,
+):
     mock_resend = mocker.patch("app.invite_api_client.resend_invite")
-    mocker.patch("app.invite_api_client.get_invited_user_for_service")
+    mocker.patch(
+        "app.invite_api_client.get_invited_user_for_service",
+        return_value=expired_invite,
+    )
     page = client_request.get(
         "main.resend_invite",
         service_id=SERVICE_ONE_ID,
@@ -1168,8 +1179,11 @@ def test_resend_expired_invitation(client_request, expired_invite, mocker):
     )
     assert normalize_spaces(page.h1.text) == "Team members"
     assert mock_resend.called
-    assert SERVICE_ONE_ID in mock_resend.call_args
-    assert expired_invite["id"] in mock_resend.call_args
+    called_args = set(mock_resend.call_args.args) | set(
+        mock_resend.call_args.kwargs.values()
+    )
+    assert SERVICE_ONE_ID in called_args
+    assert expired_invite["id"] in called_args
 
 
 def test_cancel_invited_user_cancels_user_invitations(
@@ -1183,7 +1197,8 @@ def test_cancel_invited_user_cancels_user_invitations(
 ):
     mock_cancel = mocker.patch("app.invite_api_client.cancel_invited_user")
     mocker.patch(
-        "app.invite_api_client.get_invited_user_for_service", return_value=sample_invite
+        "app.invite_api_client.get_invited_user_for_service",
+        return_value=sample_invite,
     )
 
     page = client_request.get(
diff --git a/tests/conftest.py b/tests/conftest.py
index 8129db7ec..c10e650f3 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1893,11 +1893,27 @@ def sample_invite(mocker, service_one):
 
 
 @pytest.fixture()
-def expired_invite(service_one, sample_invite):
-    expired_invite = {k: v for k, v in sample_invite.items()}
-    expired_invite["status"] = "expired"
-    expired_invite["created_at"] = str(datetime.utcnow() - timedelta(days=3))
-    return expired_invite
+def expired_invite(service_one):
+    id_ = USER_ONE_ID
+    from_user = service_one["users"][0]
+    email_address = "invited_user@test.gsa.gov"
+    service_id = service_one["id"]
+    permissions = "view_activity,send_emails,send_texts,manage_settings,manage_users,manage_api_keys"
+    created_at = str(datetime.utcnow() - timedelta(days=3))
+    auth_type = "sms_auth"
+    folder_permissions = []
+
+    return invite_json(
+        id_,
+        from_user,
+        service_id,
+        email_address,
+        permissions,
+        created_at,
+        "expired",
+        auth_type,
+        folder_permissions,
+    )
 
 
 @pytest.fixture()