From 78aeb8934b4ee704cbb2d0009a86d9aaf498c6d3 Mon Sep 17 00:00:00 2001 From: Imdad Ahad Date: Tue, 25 Oct 2016 18:13:50 +0100 Subject: [PATCH] Add test to invite nonwhitelist user and refactor --- config.py | 3 ++- tests/app/main/views/test_manage_users.py | 12 ++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/config.py b/config.py index a1d8f2670..837a27fae 100644 --- a/config.py +++ b/config.py @@ -61,7 +61,8 @@ class Config(object): "valtech\.co\.uk", "cgi\.com", "capita\.co\.uk", - "ucds.email"] + "ucds.email" + ] class Development(Config): diff --git a/tests/app/main/views/test_manage_users.py b/tests/app/main/views/test_manage_users.py index f9d7faa61..6cde4873e 100644 --- a/tests/app/main/views/test_manage_users.py +++ b/tests/app/main/views/test_manage_users.py @@ -1,7 +1,9 @@ +import pytest from flask import url_for from bs4 import BeautifulSoup import app from app.notify_client.models import InvitedUser +from app.utils import user_in_whitelist from tests.conftest import service_one as service_1 @@ -129,20 +131,26 @@ def test_should_show_page_for_inviting_user( assert response.status_code == 200 +@pytest.mark.parametrize('email_address, whitelist_user', [ + ('test@example.gov.uk', True), + ('test@nonwhitelist.com', False) +]) def test_invite_user( app_, active_user_with_permissions, mocker, - sample_invite + sample_invite, + email_address, + whitelist_user ): service = service_1(active_user_with_permissions) - email_address = 'test@example.gov.uk' sample_invite['email_address'] = 'test@example.gov.uk' data = [InvitedUser(**sample_invite)] with app_.test_request_context(): with app_.test_client() as client: client.login(active_user_with_permissions, mocker, service) + assert user_in_whitelist(email_address) == whitelist_user mocker.patch('app.invite_api_client.get_invites_for_service', return_value=data) mocker.patch('app.user_api_client.get_users_for_service', return_value=[active_user_with_permissions]) mocker.patch('app.invite_api_client.create_invite', return_value=InvitedUser(**sample_invite))