diff --git a/directory/models/entry.py b/directory/models/entry.py index 76b72bea8..14be51a68 100644 --- a/directory/models/entry.py +++ b/directory/models/entry.py @@ -173,7 +173,6 @@ class DirectoryEntry(MetadataPageMixin, Page): ) WARNING_CHOICES = ( - ('no_cookies', 'Use of Cookies'), ('no_cdn', 'Use of CDN'), ('no_analytics', 'Use of Analytics'), ('subdomain', 'Subdomain'), @@ -420,7 +419,6 @@ def __str__(self): def warning_level(self, warnings_ignored=[]): SEVERE_CONDITIONS = { - 'no_cookies': False, 'no_cdn': False, 'no_analytics': False, } diff --git a/directory/strings.py b/directory/strings.py index ef8ef1005..304430261 100644 --- a/directory/strings.py +++ b/directory/strings.py @@ -1,5 +1,4 @@ SEVERE_WARNINGS = [ - ('no_cookies', '{} uses cookies.'), ('no_cdn', '{} uses a CDN.'), ('no_analytics', '{} uses analytics.'), ] diff --git a/directory/tests/factories/entry.py b/directory/tests/factories/entry.py index d60335ddc..b5ba22bf9 100644 --- a/directory/tests/factories/entry.py +++ b/directory/tests/factories/entry.py @@ -117,5 +117,5 @@ class Params: ) severe_warning = factory.Trait( no_failures=True, - no_cookies=False, + no_analytics=False, ) diff --git a/directory/tests/test_directory_warnings.py b/directory/tests/test_directory_warnings.py index c7690806b..d558b47f6 100644 --- a/directory/tests/test_directory_warnings.py +++ b/directory/tests/test_directory_warnings.py @@ -143,7 +143,7 @@ def test_warning_test_absence(self): ) def test_warning_message_suppressed_if_page_ignores_all_triggered_warnings(self): - self.entry.warnings_ignored = ['no_cookies'] + self.entry.warnings_ignored = ['no_analytics'] self.entry.save() self.entry.refresh_from_db() response = self.client.get(self.entry.url, {'warnings': '1'}) @@ -152,22 +152,3 @@ def test_warning_message_suppressed_if_page_ignores_all_triggered_warnings(self) 'We strongly advise you to only visit this landing page using the Tor browser, with the safety slider set to "safest".', status_code=200, ) - - def test_single_warning_message_suppressed_if_page_ignores_that_warning(self): - self.result.no_analytics = False - self.result.save() - self.entry.warnings_ignored = ['no_analytics'] - self.entry.save() - - response = self.client.get(self.entry.url, {'warnings': '1'}) - self.assertContains( - response, - 'uses cookies', - status_code=200, - ) - - self.assertNotContains( - response, - 'uses analytics', - status_code=200, - ) diff --git a/directory/tests/test_models_entries.py b/directory/tests/test_models_entries.py index 14361fbbf..e64536980 100644 --- a/directory/tests/test_models_entries.py +++ b/directory/tests/test_models_entries.py @@ -103,9 +103,9 @@ def test_instance_with_unsafe_onion_addresses_gets_moderate_warning(self): result = ScanResultFactory(safe_onion_address=False) self.assertEqual(result.warning_level(), 'moderate') - def test_instance_with_third_party_cookies_gets_severe_warning(self): + def test_instance_with_third_party_cookies_gets_no_warning(self): result = ScanResultFactory(no_cookies=False) - self.assertEqual(result.warning_level(), 'severe') + self.assertEqual(result.warning_level(), 'none') def test_instance_with_analytics_gets_severe_warning(self): result = ScanResultFactory(no_analytics=False)