diff --git a/src/registrar/tests/common.py b/src/registrar/tests/common.py index 4d399fd29..d28171155 100644 --- a/src/registrar/tests/common.py +++ b/src/registrar/tests/common.py @@ -704,22 +704,19 @@ class MockEppLib(TestCase): "alg": 1, "pubKey": "AQPJ////4Q==", } - dnssecExtensionWithDsData: Mapping[Any, Any] = { - "dsData": [common.DSData(**addDsData1)], # type: ignore - } - dnssecExtensionWithMultDsData: Mapping[str, Any] = { + dnssecExtensionWithDsData = extensions.DNSSECExtension(**{ + "dsData": [common.DSData(**addDsData1)], + }) + dnssecExtensionWithMultDsData = extensions.DNSSECExtension(**{ "dsData": [ common.DSData(**addDsData1), # type: ignore common.DSData(**addDsData2), # type: ignore ], - } - dnssecExtensionWithKeyData: Mapping[str, Any] = { + }) + dnssecExtensionWithKeyData = extensions.DNSSECExtension(**{ "keyData": [common.DNSSECKeyData(**keyDataDict)], # type: ignore - } - dnssecExtensionRemovingDsData: Mapping[Any, Any] = { - "dsData": None, - "keyData": None, - } + }) + dnssecExtensionRemovingDsData = extensions.DNSSECExtension() def mockSend(self, _request, cleaned): """Mocks the registry.send function used inside of domain.py @@ -765,7 +762,7 @@ class MockEppLib(TestCase): return MagicMock( res_data=[self.mockDataInfoDomain], extensions=[ - extensions.DNSSECExtension(**self.dnssecExtensionWithDsData) + self.dnssecExtensionWithDsData ], ) elif getattr(_request, "name", None) == "dnssec-multdsdata.gov": @@ -775,7 +772,7 @@ class MockEppLib(TestCase): return MagicMock( res_data=[self.mockDataInfoDomain], extensions=[ - extensions.DNSSECExtension(**self.dnssecExtensionWithMultDsData) + self.dnssecExtensionWithMultDsData ], ) elif getattr(_request, "name", None) == "dnssec-keydata.gov": @@ -785,7 +782,7 @@ class MockEppLib(TestCase): return MagicMock( res_data=[self.mockDataInfoDomain], extensions=[ - extensions.DNSSECExtension(**self.dnssecExtensionWithKeyData) + self.dnssecExtensionWithKeyData ], ) elif getattr(_request, "name", None) == "dnssec-none.gov": diff --git a/src/registrar/tests/test_models_domain.py b/src/registrar/tests/test_models_domain.py index 2a0a820ec..05f56e0f4 100644 --- a/src/registrar/tests/test_models_domain.py +++ b/src/registrar/tests/test_models_domain.py @@ -1035,9 +1035,8 @@ class TestRegistrantDNSSEC(MockEppLib): """ domain, _ = Domain.objects.get_or_create(name="dnssec-dsdata.gov") - domain.dnssecdata = extensions.DNSSECExtension( - **self.dnssecExtensionWithDsData - ) + domain.dnssecdata = self.dnssecExtensionWithDsData + # get the DNS SEC extension added to the UpdateDomain command and # verify that it is properly sent # args[0] is the _request sent to registry @@ -1046,7 +1045,7 @@ class TestRegistrantDNSSEC(MockEppLib): self.assertEquals( args[0].extensions[0], self.createUpdateExtension( - extensions.DNSSECExtension(**self.dnssecExtensionWithDsData) + self.dnssecExtensionWithDsData ), ) # test that the dnssecdata getter is functioning properly @@ -1079,7 +1078,7 @@ class TestRegistrantDNSSEC(MockEppLib): ) self.assertEquals( - dnssecdata_get.dsData, self.dnssecExtensionWithDsData["dsData"] + dnssecdata_get.dsData, self.dnssecExtensionWithDsData.dsData ) def test_dnssec_is_idempotent(self): @@ -1096,15 +1095,15 @@ class TestRegistrantDNSSEC(MockEppLib): 3 - setter causes the getter to call info domain on next get from cache 4 - UpdateDomain command is not called on second setter (no change) 5 - getter properly parses dnssecdata from InfoDomain response and sets to cache - + """ domain, _ = Domain.objects.get_or_create(name="dnssec-dsdata.gov") # set the dnssecdata once - domain.dnssecdata = extensions.DNSSECExtension(**self.dnssecExtensionWithDsData) + domain.dnssecdata = self.dnssecExtensionWithDsData # set the dnssecdata again - domain.dnssecdata = extensions.DNSSECExtension(**self.dnssecExtensionWithDsData) + domain.dnssecdata = self.dnssecExtensionWithDsData # test that the dnssecdata getter is functioning properly dnssecdata_get = domain.dnssecdata self.mockedSendFunction.assert_has_calls( @@ -1141,7 +1140,7 @@ class TestRegistrantDNSSEC(MockEppLib): ) self.assertEquals( - dnssecdata_get.dsData, self.dnssecExtensionWithDsData["dsData"] + dnssecdata_get.dsData, self.dnssecExtensionWithDsData.dsData ) def test_user_adds_dnssec_data_multiple_dsdata(self): @@ -1159,7 +1158,7 @@ class TestRegistrantDNSSEC(MockEppLib): domain, _ = Domain.objects.get_or_create(name="dnssec-multdsdata.gov") - domain.dnssecdata = extensions.DNSSECExtension(**self.dnssecExtensionWithMultDsData) + domain.dnssecdata = self.dnssecExtensionWithMultDsData # get the DNS SEC extension added to the UpdateDomain command # and verify that it is properly sent # args[0] is the _request sent to registry @@ -1168,7 +1167,7 @@ class TestRegistrantDNSSEC(MockEppLib): self.assertEquals( args[0].extensions[0], self.createUpdateExtension( - extensions.DNSSECExtension(**self.dnssecExtensionWithMultDsData) + self.dnssecExtensionWithMultDsData ), ) # test that the dnssecdata getter is functioning properly @@ -1195,7 +1194,7 @@ class TestRegistrantDNSSEC(MockEppLib): ) self.assertEquals( - dnssecdata_get.dsData, self.dnssecExtensionWithMultDsData["dsData"] + dnssecdata_get.dsData, self.dnssecExtensionWithMultDsData.dsData ) def test_user_removes_dnssec_data(self): @@ -1215,8 +1214,8 @@ class TestRegistrantDNSSEC(MockEppLib): domain, _ = Domain.objects.get_or_create(name="dnssec-dsdata.gov") # dnssecdata_get_initial = domain.dnssecdata # call to force initial mock # domain._invalidate_cache() - domain.dnssecdata = extensions.DNSSECExtension(**self.dnssecExtensionWithDsData) - domain.dnssecdata = extensions.DNSSECExtension(**self.dnssecExtensionRemovingDsData) + domain.dnssecdata = self.dnssecExtensionWithDsData + domain.dnssecdata = self.dnssecExtensionRemovingDsData # get the DNS SEC extension added to the UpdateDomain command and # verify that it is properly sent # args[0] is the _request sent to registry @@ -1225,7 +1224,7 @@ class TestRegistrantDNSSEC(MockEppLib): self.assertEquals( args[0].extensions[0], self.createUpdateExtension( - extensions.DNSSECExtension(**self.dnssecExtensionWithDsData), + self.dnssecExtensionWithDsData, remove=True, ), ) @@ -1281,7 +1280,7 @@ class TestRegistrantDNSSEC(MockEppLib): domain, _ = Domain.objects.get_or_create(name="dnssec-keydata.gov") - domain.dnssecdata = extensions.DNSSECExtension(**self.dnssecExtensionWithKeyData) + domain.dnssecdata = self.dnssecExtensionWithKeyData # get the DNS SEC extension added to the UpdateDomain command # and verify that it is properly sent # args[0] is the _request sent to registry @@ -1290,7 +1289,7 @@ class TestRegistrantDNSSEC(MockEppLib): self.assertEquals( args[0].extensions[0], self.createUpdateExtension( - extensions.DNSSECExtension(**self.dnssecExtensionWithKeyData) + self.dnssecExtensionWithKeyData ), ) # test that the dnssecdata getter is functioning properly @@ -1317,7 +1316,7 @@ class TestRegistrantDNSSEC(MockEppLib): ) self.assertEquals( - dnssecdata_get.keyData, self.dnssecExtensionWithKeyData["keyData"] + dnssecdata_get.keyData, self.dnssecExtensionWithKeyData.keyData ) def test_update_is_unsuccessful(self): @@ -1330,7 +1329,7 @@ class TestRegistrantDNSSEC(MockEppLib): domain, _ = Domain.objects.get_or_create(name="dnssec-invalid.gov") with self.assertRaises(RegistryError) as err: - domain.dnssecdata = extensions.DNSSECExtension(**self.dnssecExtensionWithDsData) + domain.dnssecdata = self.dnssecExtensionWithDsData self.assertTrue( err.is_client_error() or err.is_session_error() or err.is_server_error() )