From 154271b46efa7b1739d65eb9f89df2e86c03dcd1 Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Mon, 30 Jan 2017 13:59:43 +0000 Subject: [PATCH] TestClient now sets up app.current_session correctly previously it was attempting to do so from outside of a session transaction, so failing. This still only happens when you've called `login` with a mocker and service json blob, which is probably worth reconsidering in the future, but for now, updated logged_in_client to use the extra login args --- tests/__init__.py | 3 ++- tests/conftest.py | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/__init__.py b/tests/__init__.py index b93a487f4..816c1e702 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -18,7 +18,8 @@ class TestClient(FlaskClient): mocker.patch('app.user_api_client.get_user', return_value=user) mocker.patch('app.events_api_client.create_event') if mocker and service: - session['service_id'] = service['id'] + with self.session_transaction() as session: + session['service_id'] = service['id'] mocker.patch('app.service_api_client.get_service', return_value={'data': service}) login_user(user, remember=True) diff --git a/tests/conftest.py b/tests/conftest.py index 3cceeff9f..fe8a987e2 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1354,12 +1354,12 @@ def client(app_): def logged_in_client( client, active_user_with_permissions, + mocker, + service_one, mock_login, - mock_get_user, - mock_get_service, mock_has_permissions ): - client.login(active_user_with_permissions) + client.login(active_user_with_permissions, mocker, service_one) yield client