From a0bcdd7d4ddb04e0680093a8d1ba13db301a6852 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Chaves?= Date: Wed, 15 Apr 2020 12:52:57 +0200 Subject: [PATCH] test_downloadermiddleware_uriuserinfo: fix tests --- .../test_downloadermiddleware_uriuserinfo.py | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/tests/test_downloadermiddleware_uriuserinfo.py b/tests/test_downloadermiddleware_uriuserinfo.py index 4b430aeb8..5a0c12506 100644 --- a/tests/test_downloadermiddleware_uriuserinfo.py +++ b/tests/test_downloadermiddleware_uriuserinfo.py @@ -18,25 +18,33 @@ class BaseTestCase: def test_username_and_password(self): req = Request('{}://foo:bar@scrapytest.org/'.format(self.protocol)) - assert self.mw.process_request(req, self.spider) is None + userinfoless_url = '{}://scrapytest.org/'.format(self.protocol) + processed_request = self.mw.process_request(req, self.spider) + assert processed_request.url == userinfoless_url self.assertEqual(req.meta[self.username_field], 'foo') self.assertEqual(req.meta[self.password_field], 'bar') def test_username_and_empty_password(self): req = Request('{}://foo:@scrapytest.org/'.format(self.protocol)) - assert self.mw.process_request(req, self.spider) is None + userinfoless_url = '{}://scrapytest.org/'.format(self.protocol) + processed_request = self.mw.process_request(req, self.spider) + assert processed_request.url == userinfoless_url self.assertEqual(req.meta[self.username_field], 'foo') self.assertEqual(req.meta[self.password_field], '') def test_username_and_no_password(self): req = Request('{}://foo@scrapytest.org/'.format(self.protocol)) - assert self.mw.process_request(req, self.spider) is None + userinfoless_url = '{}://scrapytest.org/'.format(self.protocol) + processed_request = self.mw.process_request(req, self.spider) + assert processed_request.url == userinfoless_url self.assertEqual(req.meta[self.username_field], 'foo') self.assertNotIn(self.password_field, req.meta) def test_empty_username_and_nonempty_password(self): req = Request('{}://:bar@scrapytest.org/'.format(self.protocol)) - assert self.mw.process_request(req, self.spider) is None + userinfoless_url = '{}://scrapytest.org/'.format(self.protocol) + processed_request = self.mw.process_request(req, self.spider) + assert processed_request.url == userinfoless_url self.assertEqual(req.meta[self.username_field], '') self.assertEqual(req.meta[self.password_field], 'bar') @@ -50,7 +58,9 @@ class BaseTestCase: req = Request( '{}://foo%3A:b%40r@scrapytest.org/'.format(self.protocol) ) - assert self.mw.process_request(req, self.spider) is None + userinfoless_url = '{}://scrapytest.org/'.format(self.protocol) + processed_request = self.mw.process_request(req, self.spider) + assert processed_request.url == userinfoless_url self.assertEqual(req.meta[self.username_field], 'foo:') self.assertEqual(req.meta[self.password_field], 'b@r')