From 358781c87a5f07ea58ba75964bace2b530809c8b Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Tue, 7 Nov 2017 23:22:00 +0100 Subject: [PATCH] tests: change lib tests to use proper pyramid mocks. --- rhodecode/tests/lib/test_libs.py | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/rhodecode/tests/lib/test_libs.py b/rhodecode/tests/lib/test_libs.py index b4658e08..563939ca 100644 --- a/rhodecode/tests/lib/test_libs.py +++ b/rhodecode/tests/lib/test_libs.py @@ -316,27 +316,26 @@ def test_metatags_stylize(tag_data, expected_html): def test_gravatar_url_builder(tmpl_url, email, expected, request_stub): from rhodecode.lib.helpers import gravatar_url - # mock pyramid.threadlocals - def fake_get_current_request(): - request_stub.scheme = 'https' - request_stub.host = 'server.com' - return request_stub - - # mock pylons.tmpl_context def fake_tmpl_context(_url): _c = AttributeDict() _c.visual = AttributeDict() _c.visual.use_gravatar = True _c.visual.gravatar_url = _url - return _c + # mock pyramid.threadlocals + def fake_get_current_request(): + request_stub.scheme = 'https' + request_stub.host = 'server.com' + + request_stub._call_context = fake_tmpl_context(tmpl_url) + return request_stub + with mock.patch('rhodecode.lib.helpers.get_current_request', fake_get_current_request): - fake = fake_tmpl_context(_url=tmpl_url) - with mock.patch('pylons.tmpl_context', fake): - grav = gravatar_url(email_address=email, size=24) - assert grav == expected + + grav = gravatar_url(email_address=email, size=24) + assert grav == expected @pytest.mark.parametrize(