diff --git a/src/registrar/tests/test_url_auth.py b/src/registrar/tests/test_url_auth.py index 7e0193e1d..8b0cec83e 100644 --- a/src/registrar/tests/test_url_auth.py +++ b/src/registrar/tests/test_url_auth.py @@ -29,6 +29,8 @@ SAMPLE_KWARGS = { "user_pk": "1", "portfolio_id": "1", "user_id": "1", + "member_pk": "1", + "invitedmember_pk": "1" } # Our test suite will ignore some namespaces. diff --git a/src/registrar/tests/test_views_portfolio.py b/src/registrar/tests/test_views_portfolio.py index 64bcb50a8..1c6ae5001 100644 --- a/src/registrar/tests/test_views_portfolio.py +++ b/src/registrar/tests/test_views_portfolio.py @@ -867,7 +867,7 @@ class TestPortfolio(WebTest): # Verify that the user cannot access the member page self.client.force_login(self.user) - response = self.client.get(reverse("member", kwargs={"pk": 1}), follow=True) + response = self.client.get(reverse("member", kwargs={"member_pk": 1}), follow=True) # Make sure the page is denied self.assertEqual(response.status_code, 403) @@ -886,7 +886,7 @@ class TestPortfolio(WebTest): # Verify that the user cannot access the member page self.client.force_login(self.user) - response = self.client.get(reverse("member", kwargs={"pk": 1}), follow=True) + response = self.client.get(reverse("member", kwargs={"member_pk": 1}), follow=True) # Make sure the page is denied self.assertEqual(response.status_code, 403) @@ -909,7 +909,7 @@ class TestPortfolio(WebTest): # Verify the page can be accessed self.client.force_login(self.user) - response = self.client.get(reverse("member", kwargs={"pk": permission_obj.pk}), follow=True) + response = self.client.get(reverse("member", kwargs={"member_pk": permission_obj.pk}), follow=True) self.assertEqual(response.status_code, 200) # Assert text within the page is correct @@ -942,7 +942,7 @@ class TestPortfolio(WebTest): # Verify the page can be accessed self.client.force_login(self.user) - response = self.client.get(reverse("member", kwargs={"pk": permission_obj.pk}), follow=True) + response = self.client.get(reverse("member", kwargs={"member_pk": permission_obj.pk}), follow=True) self.assertEqual(response.status_code, 200) # Assert text within the page is correct @@ -966,7 +966,7 @@ class TestPortfolio(WebTest): # Verify that the user cannot access the member page self.client.force_login(self.user) - response = self.client.get(reverse("invitedmember", kwargs={"pk": 1}), follow=True) + response = self.client.get(reverse("invitedmember", kwargs={"invitedmember_pk": 1}), follow=True) # Make sure the page is denied self.assertEqual(response.status_code, 403) @@ -985,7 +985,7 @@ class TestPortfolio(WebTest): # Verify that the user cannot access the member page self.client.force_login(self.user) - response = self.client.get(reverse("invitedmember", kwargs={"pk": 1}), follow=True) + response = self.client.get(reverse("invitedmember", kwargs={"invitedmember_pk": 1}), follow=True) # Make sure the page is denied self.assertEqual(response.status_code, 403) @@ -1016,7 +1016,7 @@ class TestPortfolio(WebTest): # Verify the page can be accessed self.client.force_login(self.user) - response = self.client.get(reverse("invitedmember", kwargs={"pk": portfolio_invitation.pk}), follow=True) + response = self.client.get(reverse("invitedmember", kwargs={"invitedmember_pk": portfolio_invitation.pk}), follow=True) self.assertEqual(response.status_code, 200) # Assert text within the page is correct @@ -1054,7 +1054,7 @@ class TestPortfolio(WebTest): # Verify the page can be accessed self.client.force_login(self.user) - response = self.client.get(reverse("invitedmember", kwargs={"pk": portfolio_invitation.pk}), follow=True) + response = self.client.get(reverse("invitedmember", kwargs={"invitedmember_pk": portfolio_invitation.pk}), follow=True) self.assertEqual(response.status_code, 200) # Assert text within the page is correct @@ -1697,7 +1697,7 @@ class TestPortfolioMemberDeleteView(WebTest): self.client.force_login(self.user) # We check X_REQUESTED_WITH bc those return JSON responses response = self.client.post( - reverse("member-delete", kwargs={"pk": upp.pk}), HTTP_X_REQUESTED_WITH="XMLHttpRequest" + reverse("member-delete", kwargs={"member_pk": upp.pk}), HTTP_X_REQUESTED_WITH="XMLHttpRequest" ) self.assertEqual(response.status_code, 400) # Bad request due to active requests @@ -1738,7 +1738,7 @@ class TestPortfolioMemberDeleteView(WebTest): self.client.force_login(self.user) # We check X_REQUESTED_WITH bc those return JSON responses response = self.client.post( - reverse("member-delete", kwargs={"pk": admin_perm_user.pk}), HTTP_X_REQUESTED_WITH="XMLHttpRequest" + reverse("member-delete", kwargs={"member_pk": admin_perm_user.pk}), HTTP_X_REQUESTED_WITH="XMLHttpRequest" ) self.assertEqual(response.status_code, 400) @@ -1795,7 +1795,7 @@ class TestPortfolioMemberDeleteView(WebTest): self.client.force_login(self.user) response = self.client.post( # We check X_REQUESTED_WITH bc those return JSON responses - reverse("member-delete", kwargs={"pk": upp.pk}), + reverse("member-delete", kwargs={"member_pk": upp.pk}), HTTP_X_REQUESTED_WITH="XMLHttpRequest", ) @@ -1862,7 +1862,7 @@ class TestPortfolioMemberDeleteView(WebTest): self.client.force_login(self.user) response = self.client.post( # We check X_REQUESTED_WITH bc those return JSON responses - reverse("member-delete", kwargs={"pk": upp.pk}), + reverse("member-delete", kwargs={"member_pk": upp.pk}), HTTP_X_REQUESTED_WITH="XMLHttpRequest", ) @@ -1939,7 +1939,7 @@ class TestPortfolioMemberDeleteView(WebTest): self.client.force_login(self.user) response = self.client.post( # We check X_REQUESTED_WITH bc those return JSON responses - reverse("member-delete", kwargs={"pk": upp.pk}), + reverse("member-delete", kwargs={"member_pk": upp.pk}), HTTP_X_REQUESTED_WITH="XMLHttpRequest", ) @@ -2000,7 +2000,7 @@ class TestPortfolioMemberDeleteView(WebTest): with patch("django.contrib.messages.error") as mock_error: self.client.force_login(self.user) response = self.client.post( - reverse("member-delete", kwargs={"pk": upp.pk}), + reverse("member-delete", kwargs={"member_pk": upp.pk}), ) # We don't want to do follow=True in response bc that does automatic redirection @@ -2023,7 +2023,7 @@ class TestPortfolioMemberDeleteView(WebTest): # Location is used for a 3xx HTTP status code to indicate that the URL was redirected # and then confirm that we're still on the Manage Members page - self.assertEqual(response.headers["Location"], reverse("member", kwargs={"pk": upp.pk})) + self.assertEqual(response.headers["Location"], reverse("member", kwargs={"member_pk": upp.pk})) @less_console_noise_decorator @override_flag("organization_feature", active=True) @@ -2047,7 +2047,7 @@ class TestPortfolioMemberDeleteView(WebTest): with patch("django.contrib.messages.error") as mock_error: self.client.force_login(self.user) response = self.client.post( - reverse("member-delete", kwargs={"pk": admin_perm_user.pk}), + reverse("member-delete", kwargs={"member_pk": admin_perm_user.pk}), ) self.assertEqual(response.status_code, 302) @@ -2066,7 +2066,7 @@ class TestPortfolioMemberDeleteView(WebTest): # Location is used for a 3xx HTTP status code to indicate that the URL was redirected # and then confirm that we're still on the Manage Members page - self.assertEqual(response.headers["Location"], reverse("member", kwargs={"pk": admin_perm_user.pk})) + self.assertEqual(response.headers["Location"], reverse("member", kwargs={"member_pk": admin_perm_user.pk})) class TestPortfolioInvitedMemberDeleteView(WebTest): @@ -2125,7 +2125,7 @@ class TestPortfolioInvitedMemberDeleteView(WebTest): with patch("django.contrib.messages.success") as mock_success: self.client.force_login(self.user) response = self.client.post( - reverse("invitedmember-delete", kwargs={"pk": invitation.pk}), + reverse("invitedmember-delete", kwargs={"member_pk": invitation.pk}), ) self.assertEqual(response.status_code, 302) @@ -2190,7 +2190,7 @@ class TestPortfolioInvitedMemberDeleteView(WebTest): with patch("django.contrib.messages.success") as mock_success: self.client.force_login(self.user) response = self.client.post( - reverse("invitedmember-delete", kwargs={"pk": invitation.pk}), + reverse("invitedmember-delete", kwargs={"member_pk": invitation.pk}), ) self.assertEqual(response.status_code, 302) @@ -2263,7 +2263,7 @@ class TestPortfolioInvitedMemberDeleteView(WebTest): with patch("django.contrib.messages.success") as mock_success: self.client.force_login(self.user) response = self.client.post( - reverse("invitedmember-delete", kwargs={"pk": invitation.pk}), + reverse("invitedmember-delete", kwargs={"member_pk": invitation.pk}), ) self.assertEqual(response.status_code, 302) @@ -2365,7 +2365,7 @@ class TestPortfolioMemberDomainsView(TestWithUser, WebTest): """Tests that the portfolio member domains view is accessible.""" self.client.force_login(self.user) - response = self.client.get(reverse("member-domains", kwargs={"pk": self.permission.id})) + response = self.client.get(reverse("member-domains", kwargs={"member_pk": self.permission.id})) # Make sure the page loaded, and that we're on the right page self.assertEqual(response.status_code, 200) @@ -2378,7 +2378,7 @@ class TestPortfolioMemberDomainsView(TestWithUser, WebTest): """Tests that the portfolio member domains view is not accessible to user with no perms.""" self.client.force_login(self.user_no_perms) - response = self.client.get(reverse("member-domains", kwargs={"pk": self.permission.id})) + response = self.client.get(reverse("member-domains", kwargs={"member_pk": self.permission.id})) # Make sure the request returns forbidden self.assertEqual(response.status_code, 403) @@ -2390,7 +2390,7 @@ class TestPortfolioMemberDomainsView(TestWithUser, WebTest): """Tests that the portfolio member domains view is not accessible when no authenticated user.""" self.client.logout() - response = self.client.get(reverse("member-domains", kwargs={"pk": self.permission.id})) + response = self.client.get(reverse("member-domains", kwargs={"member_pk": self.permission.id})) # Make sure the request returns redirect to openid login self.assertEqual(response.status_code, 302) # Redirect to openid login @@ -2403,7 +2403,7 @@ class TestPortfolioMemberDomainsView(TestWithUser, WebTest): """Tests that the portfolio member domains view returns not found if user portfolio permission not found.""" self.client.force_login(self.user) - response = self.client.get(reverse("member-domains", kwargs={"pk": "0"})) + response = self.client.get(reverse("member-domains", kwargs={"member_pk": "0"})) # Make sure the response is not found self.assertEqual(response.status_code, 404) @@ -2463,7 +2463,7 @@ class TestPortfolioInvitedMemberDomainsView(TestWithUser, WebTest): """Tests that the portfolio invited member domains view is accessible.""" self.client.force_login(self.user) - response = self.client.get(reverse("invitedmember-domains", kwargs={"pk": self.invitation.id})) + response = self.client.get(reverse("invitedmember-domains", kwargs={"member_pk": self.invitation.id})) # Make sure the page loaded, and that we're on the right page self.assertEqual(response.status_code, 200) @@ -2476,7 +2476,7 @@ class TestPortfolioInvitedMemberDomainsView(TestWithUser, WebTest): """Tests that the portfolio invited member domains view is not accessible to user with no perms.""" self.client.force_login(self.user_no_perms) - response = self.client.get(reverse("invitedmember-domains", kwargs={"pk": self.invitation.id})) + response = self.client.get(reverse("invitedmember-domains", kwargs={"member_pk": self.invitation.id})) # Make sure the request returns forbidden self.assertEqual(response.status_code, 403) @@ -2488,7 +2488,7 @@ class TestPortfolioInvitedMemberDomainsView(TestWithUser, WebTest): """Tests that the portfolio invited member domains view is not accessible when no authenticated user.""" self.client.logout() - response = self.client.get(reverse("invitedmember-domains", kwargs={"pk": self.invitation.id})) + response = self.client.get(reverse("invitedmember-domains", kwargs={"member_pk": self.invitation.id})) # Make sure the request returns redirect to openid login self.assertEqual(response.status_code, 302) # Redirect to openid login @@ -2501,7 +2501,7 @@ class TestPortfolioInvitedMemberDomainsView(TestWithUser, WebTest): """Tests that the portfolio invited member domains view returns not found if user is not a member.""" self.client.force_login(self.user) - response = self.client.get(reverse("invitedmember-domains", kwargs={"pk": "0"})) + response = self.client.get(reverse("invitedmember-domains", kwargs={"member_pk": "0"})) # Make sure the response is not found self.assertEqual(response.status_code, 404) @@ -2566,7 +2566,7 @@ class TestPortfolioMemberDomainsEditView(TestWithUser, WebTest): ], ) # Create url to be used in all tests - self.url = reverse("member-domains-edit", kwargs={"pk": self.portfolio_permission.pk}) + self.url = reverse("member-domains-edit", kwargs={"member_pk": self.portfolio_permission.pk}) def tearDown(self): super().tearDown() @@ -2584,7 +2584,7 @@ class TestPortfolioMemberDomainsEditView(TestWithUser, WebTest): """Tests that the portfolio member domains edit view is accessible.""" self.client.force_login(self.user) - response = self.client.get(reverse("member-domains-edit", kwargs={"pk": self.permission.id})) + response = self.client.get(reverse("member-domains-edit", kwargs={"member_pk": self.permission.id})) # Make sure the page loaded, and that we're on the right page self.assertEqual(response.status_code, 200) @@ -2597,7 +2597,7 @@ class TestPortfolioMemberDomainsEditView(TestWithUser, WebTest): """Tests that the portfolio member domains edit view is not accessible to user with no perms.""" self.client.force_login(self.user_no_perms) - response = self.client.get(reverse("member-domains-edit", kwargs={"pk": self.permission.id})) + response = self.client.get(reverse("member-domains-edit", kwargs={"member_pk": self.permission.id})) # Make sure the request returns forbidden self.assertEqual(response.status_code, 403) @@ -2609,7 +2609,7 @@ class TestPortfolioMemberDomainsEditView(TestWithUser, WebTest): """Tests that the portfolio member domains edit view is not accessible when no authenticated user.""" self.client.logout() - response = self.client.get(reverse("member-domains-edit", kwargs={"pk": self.permission.id})) + response = self.client.get(reverse("member-domains-edit", kwargs={"member_pk": self.permission.id})) # Make sure the request returns redirect to openid login self.assertEqual(response.status_code, 302) # Redirect to openid login @@ -2623,7 +2623,7 @@ class TestPortfolioMemberDomainsEditView(TestWithUser, WebTest): portfolio permission not found.""" self.client.force_login(self.user) - response = self.client.get(reverse("member-domains-edit", kwargs={"pk": "0"})) + response = self.client.get(reverse("member-domains-edit", kwargs={"member_pk": "0"})) # Make sure the response is not found self.assertEqual(response.status_code, 404) @@ -2645,7 +2645,7 @@ class TestPortfolioMemberDomainsEditView(TestWithUser, WebTest): self.assertEqual(UserDomainRole.objects.filter(user=self.user, role=UserDomainRole.Roles.MANAGER).count(), 3) # Check for a success message and a redirect - self.assertRedirects(response, reverse("member-domains", kwargs={"pk": self.portfolio_permission.pk})) + self.assertRedirects(response, reverse("member-domains", kwargs={"member_pk": self.portfolio_permission.pk})) messages = list(response.wsgi_request._messages) self.assertEqual(len(messages), 1) self.assertEqual(str(messages[0]), "The domain assignment changes have been saved.") @@ -2681,7 +2681,7 @@ class TestPortfolioMemberDomainsEditView(TestWithUser, WebTest): self.assertEqual(UserDomainRole.objects.filter(domain=self.domain3, user=self.user).count(), 1) # Check for a success message and a redirect - self.assertRedirects(response, reverse("member-domains", kwargs={"pk": self.portfolio_permission.pk})) + self.assertRedirects(response, reverse("member-domains", kwargs={"member_pk": self.portfolio_permission.pk})) messages = list(response.wsgi_request._messages) self.assertEqual(len(messages), 1) self.assertEqual(str(messages[0]), "The domain assignment changes have been saved.") @@ -2706,7 +2706,7 @@ class TestPortfolioMemberDomainsEditView(TestWithUser, WebTest): self.assertEqual(UserDomainRole.objects.filter(user=self.user).count(), 0) # Check for an error message and a redirect - self.assertRedirects(response, reverse("member-domains", kwargs={"pk": self.portfolio_permission.pk})) + self.assertRedirects(response, reverse("member-domains", kwargs={"member_pk": self.portfolio_permission.pk})) messages = list(response.wsgi_request._messages) self.assertEqual(len(messages), 1) self.assertEqual( @@ -2729,7 +2729,7 @@ class TestPortfolioMemberDomainsEditView(TestWithUser, WebTest): self.assertEqual(UserDomainRole.objects.filter(user=self.user).count(), 0) # Check for an error message and a redirect - self.assertRedirects(response, reverse("member-domains", kwargs={"pk": self.portfolio_permission.pk})) + self.assertRedirects(response, reverse("member-domains", kwargs={"member_pk": self.portfolio_permission.pk})) messages = list(response.wsgi_request._messages) self.assertEqual(len(messages), 1) self.assertEqual( @@ -2749,7 +2749,7 @@ class TestPortfolioMemberDomainsEditView(TestWithUser, WebTest): self.assertEqual(UserDomainRole.objects.filter(user=self.user).count(), 0) # Check for an info message and a redirect - self.assertRedirects(response, reverse("member-domains", kwargs={"pk": self.portfolio_permission.pk})) + self.assertRedirects(response, reverse("member-domains", kwargs={"member_pk": self.portfolio_permission.pk})) messages = list(response.wsgi_request._messages) self.assertEqual(len(messages), 1) self.assertEqual(str(messages[0]), "The domain assignment changes have been saved.") @@ -2772,7 +2772,7 @@ class TestPortfolioMemberDomainsEditView(TestWithUser, WebTest): self.assertEqual(UserDomainRole.objects.filter(user=self.user, role=UserDomainRole.Roles.MANAGER).count(), 0) # Check for an error message and a redirect to edit form - self.assertRedirects(response, reverse("member-domains-edit", kwargs={"pk": self.portfolio_permission.pk})) + self.assertRedirects(response, reverse("member-domains-edit", kwargs={"member_pk": self.portfolio_permission.pk})) messages = list(response.wsgi_request._messages) self.assertEqual(len(messages), 1) self.assertEqual( @@ -2831,7 +2831,7 @@ class TestPortfolioInvitedMemberEditDomainsView(TestWithUser, WebTest): UserPortfolioPermissionChoices.EDIT_MEMBERS, ], ) - self.url = reverse("invitedmember-domains-edit", kwargs={"pk": self.invitation.pk}) + self.url = reverse("invitedmember-domains-edit", kwargs={"member_pk": self.invitation.pk}) def tearDown(self): super().tearDown() @@ -2849,7 +2849,7 @@ class TestPortfolioInvitedMemberEditDomainsView(TestWithUser, WebTest): """Tests that the portfolio invited member domains edit view is accessible.""" self.client.force_login(self.user) - response = self.client.get(reverse("invitedmember-domains-edit", kwargs={"pk": self.invitation.id})) + response = self.client.get(reverse("invitedmember-domains-edit", kwargs={"member_pk": self.invitation.id})) # Make sure the page loaded, and that we're on the right page self.assertEqual(response.status_code, 200) @@ -2862,7 +2862,7 @@ class TestPortfolioInvitedMemberEditDomainsView(TestWithUser, WebTest): """Tests that the portfolio invited member domains edit view is not accessible to user with no perms.""" self.client.force_login(self.user_no_perms) - response = self.client.get(reverse("invitedmember-domains-edit", kwargs={"pk": self.invitation.id})) + response = self.client.get(reverse("invitedmember-domains-edit", kwargs={"member_pk": self.invitation.id})) # Make sure the request returns forbidden self.assertEqual(response.status_code, 403) @@ -2874,7 +2874,7 @@ class TestPortfolioInvitedMemberEditDomainsView(TestWithUser, WebTest): """Tests that the portfolio invited member domains edit view is not accessible when no authenticated user.""" self.client.logout() - response = self.client.get(reverse("invitedmember-domains-edit", kwargs={"pk": self.invitation.id})) + response = self.client.get(reverse("invitedmember-domains-edit", kwargs={"member_pk": self.invitation.id})) # Make sure the request returns redirect to openid login self.assertEqual(response.status_code, 302) # Redirect to openid login @@ -2887,7 +2887,7 @@ class TestPortfolioInvitedMemberEditDomainsView(TestWithUser, WebTest): """Tests that the portfolio invited member domains edit view returns not found if user is not a member.""" self.client.force_login(self.user) - response = self.client.get(reverse("invitedmember-domains-edit", kwargs={"pk": "0"})) + response = self.client.get(reverse("invitedmember-domains-edit", kwargs={"member_pk": "0"})) # Make sure the response is not found self.assertEqual(response.status_code, 404) @@ -2914,7 +2914,7 @@ class TestPortfolioInvitedMemberEditDomainsView(TestWithUser, WebTest): ) # Check for a success message and a redirect - self.assertRedirects(response, reverse("invitedmember-domains", kwargs={"pk": self.invitation.pk})) + self.assertRedirects(response, reverse("invitedmember-domains", kwargs={"member_pk": self.invitation.pk})) messages = list(response.wsgi_request._messages) self.assertEqual(len(messages), 1) self.assertEqual(str(messages[0]), "The domain assignment changes have been saved.") @@ -2971,7 +2971,7 @@ class TestPortfolioInvitedMemberEditDomainsView(TestWithUser, WebTest): ) # Check for a success message and a redirect - self.assertRedirects(response, reverse("invitedmember-domains", kwargs={"pk": self.invitation.pk})) + self.assertRedirects(response, reverse("invitedmember-domains", kwargs={"member_pk": self.invitation.pk})) @less_console_noise_decorator @override_flag("organization_feature", active=True) @@ -3015,7 +3015,7 @@ class TestPortfolioInvitedMemberEditDomainsView(TestWithUser, WebTest): ) # Check for a success message and a redirect - self.assertRedirects(response, reverse("invitedmember-domains", kwargs={"pk": self.invitation.pk})) + self.assertRedirects(response, reverse("invitedmember-domains", kwargs={"member_pk": self.invitation.pk})) # assert that send_domain_invitation_email is not called mock_send_domain_email.assert_not_called() @@ -3035,7 +3035,7 @@ class TestPortfolioInvitedMemberEditDomainsView(TestWithUser, WebTest): self.assertEqual(DomainInvitation.objects.count(), 0) # Check for an error message and a redirect - self.assertRedirects(response, reverse("invitedmember-domains", kwargs={"pk": self.invitation.pk})) + self.assertRedirects(response, reverse("invitedmember-domains", kwargs={"member_pk": self.invitation.pk})) messages = list(response.wsgi_request._messages) self.assertEqual(len(messages), 1) self.assertEqual( @@ -3058,7 +3058,7 @@ class TestPortfolioInvitedMemberEditDomainsView(TestWithUser, WebTest): self.assertEqual(DomainInvitation.objects.count(), 0) # Check for an error message and a redirect - self.assertRedirects(response, reverse("invitedmember-domains", kwargs={"pk": self.invitation.pk})) + self.assertRedirects(response, reverse("invitedmember-domains", kwargs={"member_pk": self.invitation.pk})) messages = list(response.wsgi_request._messages) self.assertEqual(len(messages), 1) self.assertEqual( @@ -3078,7 +3078,7 @@ class TestPortfolioInvitedMemberEditDomainsView(TestWithUser, WebTest): self.assertEqual(DomainInvitation.objects.count(), 0) # Check for an info message and a redirect - self.assertRedirects(response, reverse("invitedmember-domains", kwargs={"pk": self.invitation.pk})) + self.assertRedirects(response, reverse("invitedmember-domains", kwargs={"member_pk": self.invitation.pk})) messages = list(response.wsgi_request._messages) self.assertEqual(len(messages), 1) self.assertEqual(str(messages[0]), "The domain assignment changes have been saved.") @@ -3106,7 +3106,7 @@ class TestPortfolioInvitedMemberEditDomainsView(TestWithUser, WebTest): ) # Check for an error message and a redirect to edit form - self.assertRedirects(response, reverse("invitedmember-domains-edit", kwargs={"pk": self.invitation.pk})) + self.assertRedirects(response, reverse("invitedmember-domains-edit", kwargs={"member_pk": self.invitation.pk})) messages = list(response.wsgi_request._messages) self.assertEqual(len(messages), 1) self.assertEqual( @@ -4089,7 +4089,7 @@ class TestPortfolioMemberEditView(WebTest): mock_send_update_email.return_value = True response = self.client.post( - reverse("member-permissions", kwargs={"pk": basic_permission.id}), + reverse("member-permissions", kwargs={"member_pk": basic_permission.id}), { "role": UserPortfolioRoleChoices.ORGANIZATION_ADMIN, }, @@ -4152,7 +4152,7 @@ class TestPortfolioMemberEditView(WebTest): mock_send_update_email.return_value = False response = self.client.post( - reverse("member-permissions", kwargs={"pk": basic_permission.id}), + reverse("member-permissions", kwargs={"member_pk": basic_permission.id}), { "role": UserPortfolioRoleChoices.ORGANIZATION_ADMIN, }, @@ -4219,7 +4219,7 @@ class TestPortfolioMemberEditView(WebTest): ) response = self.client.post( - reverse("member-permissions", kwargs={"pk": admin_permission.id}), + reverse("member-permissions", kwargs={"member_pk": admin_permission.id}), { "role": UserPortfolioRoleChoices.ORGANIZATION_ADMIN, }, @@ -4257,7 +4257,7 @@ class TestPortfolioMemberEditView(WebTest): mock_send_update_email.return_value = True response = self.client.post( - reverse("member-permissions", kwargs={"pk": basic_permission.id}), + reverse("member-permissions", kwargs={"member_pk": basic_permission.id}), { "role": UserPortfolioRoleChoices.ORGANIZATION_MEMBER, "domain_permissions": UserPortfolioPermissionChoices.VIEW_MANAGED_DOMAINS, @@ -4306,7 +4306,7 @@ class TestPortfolioMemberEditView(WebTest): mock_send_update_email.return_value = True response = self.client.post( - reverse("member-permissions", kwargs={"pk": admin_permission.id}), + reverse("member-permissions", kwargs={"member_pk": admin_permission.id}), { "role": UserPortfolioRoleChoices.ORGANIZATION_MEMBER, "domain_permissions": UserPortfolioPermissionChoices.VIEW_MANAGED_DOMAINS, @@ -4369,7 +4369,7 @@ class TestPortfolioMemberEditView(WebTest): mock_send_update_email.return_value = False response = self.client.post( - reverse("member-permissions", kwargs={"pk": admin_permission.id}), + reverse("member-permissions", kwargs={"member_pk": admin_permission.id}), { "role": UserPortfolioRoleChoices.ORGANIZATION_MEMBER, "domain_permissions": UserPortfolioPermissionChoices.VIEW_MANAGED_DOMAINS, @@ -4429,7 +4429,7 @@ class TestPortfolioMemberEditView(WebTest): # Test missing required admin permissions response = self.client.post( - reverse("member-permissions", kwargs={"pk": permission.id}), + reverse("member-permissions", kwargs={"member_pk": permission.id}), { "role": UserPortfolioRoleChoices.ORGANIZATION_MEMBER, # Missing required admin fields @@ -4461,7 +4461,7 @@ class TestPortfolioMemberEditView(WebTest): admin_permission = UserPortfolioPermission.objects.get(user=self.user, portfolio=self.portfolio) response = self.client.post( - reverse("member-permissions", kwargs={"pk": admin_permission.id}), + reverse("member-permissions", kwargs={"member_pk": admin_permission.id}), { "role": UserPortfolioRoleChoices.ORGANIZATION_MEMBER, "domain_permissions": UserPortfolioPermissionChoices.VIEW_MANAGED_DOMAINS, @@ -4534,7 +4534,7 @@ class TestPortfolioInvitedMemberEditView(WebTest): # Test updating invitation permissions response = self.client.post( - reverse("invitedmember-permissions", kwargs={"pk": self.invitation.id}), + reverse("invitedmember-permissions", kwargs={"member_pk": self.invitation.id}), { "role": UserPortfolioRoleChoices.ORGANIZATION_ADMIN, }, @@ -4577,7 +4577,7 @@ class TestPortfolioInvitedMemberEditView(WebTest): # Test updating invitation permissions response = self.client.post( - reverse("invitedmember-permissions", kwargs={"pk": self.invitation.id}), + reverse("invitedmember-permissions", kwargs={"member_pk": self.invitation.id}), { "role": UserPortfolioRoleChoices.ORGANIZATION_ADMIN, }, @@ -4623,7 +4623,7 @@ class TestPortfolioInvitedMemberEditView(WebTest): # Test updating invitation permissions response = self.client.post( - reverse("invitedmember-permissions", kwargs={"pk": self.admin_invitation.id}), + reverse("invitedmember-permissions", kwargs={"member_pk": self.admin_invitation.id}), { "role": UserPortfolioRoleChoices.ORGANIZATION_MEMBER, "domain_permissions": UserPortfolioPermissionChoices.VIEW_MANAGED_DOMAINS, @@ -4669,7 +4669,7 @@ class TestPortfolioInvitedMemberEditView(WebTest): # Test updating invitation permissions response = self.client.post( - reverse("invitedmember-permissions", kwargs={"pk": self.admin_invitation.id}), + reverse("invitedmember-permissions", kwargs={"member_pk": self.admin_invitation.id}), { "role": UserPortfolioRoleChoices.ORGANIZATION_MEMBER, "domain_permissions": UserPortfolioPermissionChoices.VIEW_MANAGED_DOMAINS, @@ -4715,7 +4715,7 @@ class TestPortfolioInvitedMemberEditView(WebTest): # Test updating invitation permissions response = self.client.post( - reverse("invitedmember-permissions", kwargs={"pk": self.invitation.id}), + reverse("invitedmember-permissions", kwargs={"member_pk": self.invitation.id}), { "role": UserPortfolioRoleChoices.ORGANIZATION_MEMBER, "domain_permissions": UserPortfolioPermissionChoices.VIEW_MANAGED_DOMAINS, @@ -4742,7 +4742,7 @@ class TestPortfolioInvitedMemberEditView(WebTest): # Test updating invitation permissions response = self.client.post( - reverse("invitedmember-permissions", kwargs={"pk": self.admin_invitation.id}), + reverse("invitedmember-permissions", kwargs={"member_pk": self.admin_invitation.id}), { "role": UserPortfolioRoleChoices.ORGANIZATION_ADMIN, }, diff --git a/src/registrar/views/portfolios.py b/src/registrar/views/portfolios.py index d9760ff5a..4321f4c51 100644 --- a/src/registrar/views/portfolios.py +++ b/src/registrar/views/portfolios.py @@ -171,7 +171,7 @@ class PortfolioMemberDeleteView(View): if request.headers.get("X-Requested-With") == "XMLHttpRequest": return JsonResponse({"error": error_message}, status=400) messages.error(request, error_message) - return redirect(reverse("member", kwargs={"pk": member_pk})) + return redirect(reverse("member", kwargs={"member_pk": member_pk})) def _send_removal_notifications(self, request, portfolio_member_permission): """ @@ -356,21 +356,21 @@ class PortfolioMemberDomainsEditView(DetailView, View): added_domain_ids = self._parse_domain_ids(added_domains, "added domains") if added_domain_ids is None: - return redirect(reverse("member-domains", kwargs={"pk": member_pk})) + return redirect(reverse("member-domains", kwargs={"member_pk": member_pk})) removed_domain_ids = self._parse_domain_ids(removed_domains, "removed domains") if removed_domain_ids is None: - return redirect(reverse("member-domains", kwargs={"pk": member_pk})) + return redirect(reverse("member-domains", kwargs={"member_pk": member_pk})) if not (added_domain_ids or removed_domain_ids): messages.success(request, "The domain assignment changes have been saved.") - return redirect(reverse("member-domains", kwargs={"pk": member_pk})) + return redirect(reverse("member-domains", kwargs={"member_pk": member_pk})) try: self._process_added_domains(added_domain_ids, member, request.user, portfolio) self._process_removed_domains(removed_domain_ids, member) messages.success(request, "The domain assignment changes have been saved.") - return redirect(reverse("member-domains", kwargs={"pk": member_pk})) + return redirect(reverse("member-domains", kwargs={"member_pk": member_pk})) except IntegrityError: messages.error( request, @@ -378,7 +378,7 @@ class PortfolioMemberDomainsEditView(DetailView, View): f"please contact {DefaultUserValues.HELP_EMAIL}.", ) logger.error("A database error occurred while saving changes.", exc_info=True) - return redirect(reverse("member-domains-edit", kwargs={"pk": member_pk})) + return redirect(reverse("member-domains-edit", kwargs={"member_pk": member_pk})) except Exception as e: messages.error( request, @@ -386,7 +386,7 @@ class PortfolioMemberDomainsEditView(DetailView, View): f"please contact {DefaultUserValues.HELP_EMAIL}.", ) logger.error(f"An unexpected error occurred: {str(e)}", exc_info=True) - return redirect(reverse("member-domains-edit", kwargs={"pk": member_pk})) + return redirect(reverse("member-domains-edit", kwargs={"member_pk": member_pk})) def _parse_domain_ids(self, domain_data, domain_type): """ @@ -650,21 +650,21 @@ class PortfolioInvitedMemberDomainsEditView(DetailView, View): added_domain_ids = self._parse_domain_ids(added_domains, "added domains") if added_domain_ids is None: - return redirect(reverse("invitedmember-domains", kwargs={"pk": invitedmember_pk})) + return redirect(reverse("invitedmember-domains", kwargs={"invitedmember_pk": invitedmember_pk})) removed_domain_ids = self._parse_domain_ids(removed_domains, "removed domains") if removed_domain_ids is None: - return redirect(reverse("invitedmember-domains", kwargs={"pk": invitedmember_pk})) + return redirect(reverse("invitedmember-domains", kwargs={"invitedmember_pk": invitedmember_pk})) if not (added_domain_ids or removed_domain_ids): messages.success(request, "The domain assignment changes have been saved.") - return redirect(reverse("invitedmember-domains", kwargs={"pk": invitedmember_pk})) + return redirect(reverse("invitedmember-domains", kwargs={"invitedmember_pk": invitedmember_pk})) try: self._process_added_domains(added_domain_ids, email, request.user, portfolio) self._process_removed_domains(removed_domain_ids, email) messages.success(request, "The domain assignment changes have been saved.") - return redirect(reverse("invitedmember-domains", kwargs={"pk": invitedmember_pk})) + return redirect(reverse("invitedmember-domains", kwargs={"invitedmember_pk": invitedmember_pk})) except IntegrityError: messages.error( request, @@ -672,7 +672,7 @@ class PortfolioInvitedMemberDomainsEditView(DetailView, View): f"please contact {DefaultUserValues.HELP_EMAIL}.", ) logger.error("A database error occurred while saving changes.", exc_info=True) - return redirect(reverse("invitedmember-domains-edit", kwargs={"pk": invitedmember_pk})) + return redirect(reverse("invitedmember-domains-edit", kwargs={"invitedmember_pk": invitedmember_pk})) except Exception as e: messages.error( request, @@ -680,7 +680,7 @@ class PortfolioInvitedMemberDomainsEditView(DetailView, View): f"please contact {DefaultUserValues.HELP_EMAIL}.", ) logger.error(f"An unexpected error occurred: {str(e)}.", exc_info=True) - return redirect(reverse("invitedmember-domains-edit", kwargs={"pk": invitedmember_pk})) + return redirect(reverse("invitedmember-domains-edit", kwargs={"invitedmember_pk": invitedmember_pk})) def _parse_domain_ids(self, domain_data, domain_type): """