zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-05-14 16:47:02 +02:00
Code Issues Projects Releases Packages Wiki Activity

Update expiration date code and unit test

Browse source
This commit is contained in:
Rebecca Hsieh 2024-04-04 15:35:15 -07:00
parent 0394535f9b
commit 784fcbc26a
No known key found for this signature in database
2 changed files with 5 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/registrar/admin.py
View file

@ -1600,11 +1600,7 @@ class DomainAdmin(ListHeaderAdmin):
# No expiration date was found. Return none. # No expiration date was found. Return none.
extra_context["extended_expiration_date"] = None extra_context["extended_expiration_date"] = None
return super().changeform_view(request, object_id, form_url, extra_context) return super().changeform_view(request, object_id, form_url, extra_context)
new_date = curr_exp_date + relativedelta(years=years_to_extend_by)
if curr_exp_date < date.today():
extra_context["extended_expiration_date"] = date.today() + relativedelta(years=years_to_extend_by)
else:
new_date = domain.registry_expiration_date + relativedelta(years=years_to_extend_by)
extra_context["extended_expiration_date"] = new_date extra_context["extended_expiration_date"] = new_date
else: else:
extra_context["extended_expiration_date"] = None extra_context["extended_expiration_date"] = None

12
src/registrar/tests/test_admin.py
View file

@ -74,11 +74,10 @@ class TestDomainAdmin(MockEppLib, WebTest):
) )
super().setUp() super().setUp()
@skip("TODO for another ticket. This test case is grabbing old db data.")
@patch("registrar.admin.DomainAdmin._get_current_date", return_value=date(2024, 1, 1)) @patch("registrar.admin.DomainAdmin._get_current_date", return_value=date(2024, 1, 1))
def test_extend_expiration_date_button(self, mock_date_today): def test_extend_expiration_date_button(self, mock_date_today):
""" """
Tests if extend_expiration_date button extends correctly Tests if extend_expiration_date modal gives an accurate date
""" """
# Create a ready domain with a preset expiration date # Create a ready domain with a preset expiration date
@ -105,17 +104,11 @@ class TestDomainAdmin(MockEppLib, WebTest):
# Follow the response # Follow the response
response = response.follow() response = response.follow()
# refresh_from_db() does not work for objects with protected=True.
# https://github.com/viewflow/django-fsm/issues/89
new_domain = Domain.objects.get(id=domain.id)
# Check that the current expiration date is what we expect
self.assertEqual(new_domain.expiration_date, date(2025, 5, 25))
# Assert that everything on the page looks correct # Assert that everything on the page looks correct
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
self.assertContains(response, domain.name) self.assertContains(response, domain.name)
self.assertContains(response, "Extend expiration date") self.assertContains(response, "Extend expiration date")
self.assertContains(response, "New expiration date: <b>May 25, 2025</b>")
# Ensure the message we recieve is in line with what we expect # Ensure the message we recieve is in line with what we expect
expected_message = "Successfully extended the expiration date." expected_message = "Successfully extended the expiration date."
@ -127,6 +120,7 @@ class TestDomainAdmin(MockEppLib, WebTest):
extra_tags="", extra_tags="",
fail_silently=False, fail_silently=False,
) )
mock_add_message.assert_has_calls([expected_call], 1) mock_add_message.assert_has_calls([expected_call], 1)
@less_console_noise_decorator @less_console_noise_decorator