From 28ce52715394e1b10774a2d29b7d11e194062d05 Mon Sep 17 00:00:00 2001 From: Felix Hammerl Date: Fri, 13 May 2016 11:22:01 +0200 Subject: Issue #691: Refactor to Twisted 16.1.1 --- service/test/unit/config/test_site.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'service/test/unit/config') diff --git a/service/test/unit/config/test_site.py b/service/test/unit/config/test_site.py index 7c381449..b8b23ef0 100644 --- a/service/test/unit/config/test_site.py +++ b/service/test/unit/config/test_site.py @@ -8,15 +8,15 @@ class TestPixelatedSite(unittest.TestCase): def test_add_security_headers(self): request = self.create_request() request.process() - headers = request.headers header_value = "default-src 'self'; style-src 'self' 'unsafe-inline'" - self.assertEqual(headers.get('Content-Security-Policy'), header_value) - self.assertEqual(headers.get('X-Content-Security-Policy'), header_value) - self.assertEqual(headers.get('X-Webkit-CSP'), header_value) - self.assertEqual(headers.get('X-Frame-Options'), 'SAMEORIGIN') - self.assertEqual(headers.get('X-XSS-Protection'), '1; mode=block') - self.assertEqual(headers.get('X-Content-Type-Options'), 'nosniff') + self.assertEquals(header_value, request.responseHeaders.getRawHeaders('X-Content-Security-Policy'.lower())[0]) + self.assertEquals(header_value, request.responseHeaders.getRawHeaders('Content-Security-Policy'.lower())[0]) + self.assertEquals(header_value, request.responseHeaders.getRawHeaders('X-Webkit-CSP'.lower())[0]) + + self.assertEqual('SAMEORIGIN', request.responseHeaders.getRawHeaders('X-Frame-Options'.lower())[0]) + self.assertEqual('1; mode=block', request.responseHeaders.getRawHeaders('X-XSS-Protection'.lower())[0]) + self.assertEqual('nosniff', request.responseHeaders.getRawHeaders('X-Content-Type-Options'.lower())[0]) def test_add_strict_transport_security_header_if_secure(self): request = self.create_request() @@ -24,16 +24,15 @@ class TestPixelatedSite(unittest.TestCase): request.process() - headers = request.headers - self.assertEqual('max-age=31536000; includeSubDomains', headers.get('Strict-Transport-Security')) + self.assertTrue(request.responseHeaders.hasHeader('Strict-Transport-Security'.lower())) + self.assertEqual('max-age=31536000; includeSubDomains', request.responseHeaders.getRawHeaders('Strict-Transport-Security'.lower())[0]) def test_does_not_add_strict_transport_security_header_if_plain_http(self): request = self.create_request() request.process() - headers = request.headers - self.assertFalse('Strict-Transport-Security' in headers) + self.assertFalse(request.responseHeaders.hasHeader('Strict-Transport-Security'.lower())) def create_request(self): channel = LineReceiver() -- cgit v1.2.3