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/resources/test_attachments_resource.py | 4 ++-- service/test/unit/resources/test_root_resource.py | 4 ++-- service/test/unit/resources/test_sandbox_resource.py | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'service/test/unit/resources') diff --git a/service/test/unit/resources/test_attachments_resource.py b/service/test/unit/resources/test_attachments_resource.py index 2aeeb01e..0424c481 100644 --- a/service/test/unit/resources/test_attachments_resource.py +++ b/service/test/unit/resources/test_attachments_resource.py @@ -47,7 +47,7 @@ class AttachmentsResourceTest(unittest.TestCase): def assert_response(_): self.assertEqual(201, request.code) - self.assertEqual('/attachment/%s' % attachment_id, request.headers['Location']) + self.assertEqual('/attachment/%s' % attachment_id, request.responseHeaders.getRawHeaders("location")[0]) response_json = {'ident': attachment_id, 'content-type': 'some mocked type', 'name': 'filename.txt', 'size': 17, 'encoding': 'base64'} self.assertEqual(response_json, json.loads(request.written[0])) @@ -72,7 +72,7 @@ class AttachmentsResourceTest(unittest.TestCase): def assert_response(_): self.assertEqual(500, request.code) - self.assertFalse('Location' in request.headers) + self.assertFalse(request.responseHeaders.hasHeader('Location'.lower())) self.assertIn("message", json.loads(request.written[0])) verify(self.mail_service).save_attachment('some mocked value', 'some mocked type') diff --git a/service/test/unit/resources/test_root_resource.py b/service/test/unit/resources/test_root_resource.py index cc052d8b..f2d7a951 100644 --- a/service/test/unit/resources/test_root_resource.py +++ b/service/test/unit/resources/test_root_resource.py @@ -69,8 +69,8 @@ class TestRootResource(unittest.TestCase): self._test_should_renew_xsrf_cookie() def _mock_ajax_csrf(self, request, csrf_token): - request.headers['x-requested-with'] = 'XMLHttpRequest' - request.headers['x-xsrf-token'] = csrf_token + request.requestHeaders.setRawHeaders('x-requested-with', ['XMLHttpRequest']) + request.requestHeaders.setRawHeaders('x-xsrf-token', [csrf_token]) def test_should_unauthorize_child_resource_ajax_requests_when_csrf_mismatch(self): request = DummyRequest(['/child']) diff --git a/service/test/unit/resources/test_sandbox_resource.py b/service/test/unit/resources/test_sandbox_resource.py index 3db43e12..98b88b2d 100644 --- a/service/test/unit/resources/test_sandbox_resource.py +++ b/service/test/unit/resources/test_sandbox_resource.py @@ -33,6 +33,6 @@ class TestSandBoxResource(unittest.TestCase): yield self.web.get(request) - self.assertEquals(expected_csp_headers, request.outgoingHeaders.get('X-Content-Security-Policy'.lower())) - self.assertEquals(expected_csp_headers, request.outgoingHeaders.get('Content-Security-Policy'.lower())) - self.assertEquals(expected_csp_headers, request.outgoingHeaders.get('X-Webkit-CSP'.lower())) + self.assertEquals(expected_csp_headers, request.responseHeaders.getRawHeaders('X-Content-Security-Policy'.lower())[0]) + self.assertEquals(expected_csp_headers, request.responseHeaders.getRawHeaders('Content-Security-Policy'.lower())[0]) + self.assertEquals(expected_csp_headers, request.responseHeaders.getRawHeaders('X-Webkit-CSP'.lower())[0]) -- cgit v1.2.3