mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-08-26 01:04:00 -04:00
Added choose_service using services_dao.
This commit is contained in:
@@ -28,11 +28,12 @@ def service_json(id_, name, users, limit=1000, active=False, restricted=True):
|
||||
'restricted': restricted
|
||||
}
|
||||
|
||||
TEST_USER_EMAIL = 'test@user.gov.uk'
|
||||
|
||||
def create_test_user(state):
|
||||
user = User(name='Test User',
|
||||
password='somepassword',
|
||||
email_address='test@user.gov.uk',
|
||||
email_address=TEST_USER_EMAIL,
|
||||
mobile_number='+441234123412',
|
||||
role_id=1,
|
||||
state=state)
|
||||
@@ -49,3 +50,7 @@ def create_another_test_user(state):
|
||||
state=state)
|
||||
users_dao.insert_user(user)
|
||||
return user
|
||||
|
||||
|
||||
def get_test_user():
|
||||
return users_dao.get_user_by_email(TEST_USER_EMAIL)
|
||||
|
||||
@@ -1,165 +1,230 @@
|
||||
from tests import create_test_user
|
||||
from flask import url_for
|
||||
|
||||
|
||||
def test_should_show_overview(app_, db_, db_session):
|
||||
def test_should_show_overview(app_, db_, db_session, active_user, mock_get_service):
|
||||
with app_.test_request_context():
|
||||
with app_.test_client() as client:
|
||||
user = create_test_user('active')
|
||||
client.login(user)
|
||||
response = client.get('/services/123/service-settings')
|
||||
client.login(active_user)
|
||||
service_id = 123
|
||||
response = client.get(url_for(
|
||||
'main.service_settings', service_id=service_id))
|
||||
assert response.status_code == 200
|
||||
assert 'Service settings' in response.get_data(as_text=True)
|
||||
resp_data = response.get_data(as_text=True)
|
||||
assert 'Service settings' in resp_data
|
||||
service = mock_get_service.side_effect(service_id)['data']
|
||||
assert service['name'] in resp_data
|
||||
assert mock_get_service.called
|
||||
|
||||
|
||||
def test_should_show_service_name(app_, db_, db_session):
|
||||
def test_should_show_service_name(app_, db_, db_session, active_user, mock_get_service):
|
||||
with app_.test_request_context():
|
||||
with app_.test_client() as client:
|
||||
user = create_test_user('active')
|
||||
client.login(user)
|
||||
response = client.get('/services/123/service-settings/name')
|
||||
client.login(active_user)
|
||||
service_id = 123
|
||||
response = client.get(url_for(
|
||||
'main.service_name_change', service_id=service_id))
|
||||
assert response.status_code == 200
|
||||
assert 'Change your service name' in response.get_data(as_text=True)
|
||||
resp_data = response.get_data(as_text=True)
|
||||
assert 'Change your service name' in resp_data
|
||||
assert mock_get_service.called
|
||||
service = mock_get_service.side_effect(service_id)['data']
|
||||
assert service['name'] in resp_data
|
||||
|
||||
|
||||
def test_should_redirect_after_change_service_name(app_, db_, db_session):
|
||||
def test_should_redirect_after_change_service_name(app_, db_, db_session, active_user, mock_get_service):
|
||||
with app_.test_request_context():
|
||||
with app_.test_client() as client:
|
||||
user = create_test_user('active')
|
||||
client.login(user)
|
||||
response = client.post('/services/123/service-settings/request-to-go-live')
|
||||
client.login(active_user)
|
||||
service_id = 123
|
||||
response = client.post(url_for(
|
||||
'main.service_name_change', service_id=service_id))
|
||||
|
||||
assert response.status_code == 302
|
||||
assert 'http://localhost/services/123/service-settings' == response.location
|
||||
settings_url = url_for(
|
||||
'main.service_settings', service_id=service_id, _external=True)
|
||||
assert settings_url == response.location
|
||||
assert mock_get_service.called
|
||||
|
||||
|
||||
def test_should_show_service_name_confirmation(app_, db_, db_session):
|
||||
def test_should_show_service_name_confirmation(app_, db_, db_session, active_user, mock_get_service):
|
||||
with app_.test_request_context():
|
||||
with app_.test_client() as client:
|
||||
user = create_test_user('active')
|
||||
client.login(user)
|
||||
response = client.get('/services/123/service-settings/name/confirm')
|
||||
client.login(active_user)
|
||||
service_id = 123
|
||||
response = client.get(url_for(
|
||||
'main.service_name_change_confirm', service_id=service_id))
|
||||
|
||||
assert response.status_code == 200
|
||||
assert 'Change your service name' in response.get_data(as_text=True)
|
||||
resp_data = response.get_data(as_text=True)
|
||||
assert 'Change your service name' in resp_data
|
||||
assert mock_get_service.called
|
||||
|
||||
|
||||
def test_should_redirect_after_service_name_confirmation(app_, db_,
|
||||
db_session):
|
||||
def test_should_redirect_after_service_name_confirmation(app_,
|
||||
db_,
|
||||
db_session,
|
||||
active_user,
|
||||
mock_get_service):
|
||||
with app_.test_request_context():
|
||||
with app_.test_client() as client:
|
||||
user = create_test_user('active')
|
||||
client.login(user)
|
||||
response = client.post('/services/123/service-settings/name/confirm')
|
||||
client.login(active_user)
|
||||
service_id = 123
|
||||
response = client.post(url_for(
|
||||
'main.service_name_change_confirm', service_id=service_id))
|
||||
|
||||
assert response.status_code == 302
|
||||
assert 'http://localhost/services/123/service-settings' == response.location
|
||||
settings_url = url_for(
|
||||
'main.service_settings', service_id=service_id, _external=True)
|
||||
assert settings_url == response.location
|
||||
assert mock_get_service.called
|
||||
|
||||
|
||||
def test_should_show_request_to_go_live(app_, db_, db_session):
|
||||
def test_should_show_request_to_go_live(app_, db_, db_session, active_user, mock_get_service):
|
||||
with app_.test_request_context():
|
||||
with app_.test_client() as client:
|
||||
user = create_test_user('active')
|
||||
client.login(user)
|
||||
response = client.get('/services/123/service-settings/request-to-go-live')
|
||||
client.login(active_user)
|
||||
service_id = 123
|
||||
response = client.get(
|
||||
url_for('main.service_request_to_go_live', service_id=service_id))
|
||||
service = mock_get_service.side_effect(service_id)['data']
|
||||
assert response.status_code == 200
|
||||
resp_data = response.get_data(as_text=True)
|
||||
assert 'Request to go live' in resp_data
|
||||
assert mock_get_service.called
|
||||
assert service['name'] in resp_data
|
||||
|
||||
|
||||
def test_should_redirect_after_request_to_go_live(app_,
|
||||
db_,
|
||||
db_session,
|
||||
active_user,
|
||||
mock_get_service):
|
||||
with app_.test_request_context():
|
||||
with app_.test_client() as client:
|
||||
client.login(active_user)
|
||||
service_id = 123
|
||||
response = client.post(url_for(
|
||||
'main.service_request_to_go_live', service_id=service_id))
|
||||
|
||||
assert response.status_code == 302
|
||||
settings_url = url_for(
|
||||
'main.service_settings', service_id=service_id, _external=True)
|
||||
assert settings_url == response.location
|
||||
assert mock_get_service.called
|
||||
|
||||
|
||||
def test_should_show_status_page(app_, db_, db_session, active_user, mock_get_service):
|
||||
with app_.test_request_context():
|
||||
with app_.test_client() as client:
|
||||
client.login(active_user)
|
||||
service_id = 123
|
||||
response = client.get(url_for(
|
||||
'main.service_status_change', service_id=service_id))
|
||||
|
||||
assert response.status_code == 200
|
||||
assert 'Request to go live' in response.get_data(as_text=True)
|
||||
resp_data = response.get_data(as_text=True)
|
||||
assert 'Turn off all outgoing notifications' in resp_data
|
||||
assert mock_get_service.called
|
||||
|
||||
|
||||
def test_should_redirect_after_request_to_go_live(app_, db_, db_session):
|
||||
def test_should_show_redirect_after_status_change(app_, db_, db_session, active_user, mock_get_service):
|
||||
with app_.test_request_context():
|
||||
with app_.test_client() as client:
|
||||
user = create_test_user('active')
|
||||
client.login(user)
|
||||
response = client.post('/services/123/service-settings/request-to-go-live')
|
||||
client.login(active_user)
|
||||
service_id = 123
|
||||
response = client.post(url_for(
|
||||
'main.service_status_change', service_id=service_id))
|
||||
|
||||
assert response.status_code == 302
|
||||
assert 'http://localhost/services/123/service-settings' == response.location
|
||||
redirect_url = url_for(
|
||||
'main.service_status_change_confirm', service_id=service_id)
|
||||
assert redirect_url == response.location
|
||||
|
||||
|
||||
def test_should_show_status_page(app_, db_, db_session):
|
||||
def test_should_show_status_confirmation(app_, db_, db_session, active_user, mock_get_service):
|
||||
with app_.test_request_context():
|
||||
with app_.test_client() as client:
|
||||
user = create_test_user('active')
|
||||
client.login(user)
|
||||
response = client.get('/services/123/service-settings/status')
|
||||
client.login(active_user)
|
||||
service_id = 123
|
||||
response = client.get(url_for(
|
||||
'main.service_status_change_confirm', service_id=service_id))
|
||||
|
||||
assert response.status_code == 200
|
||||
assert 'Turn off all outgoing notifications' in response.get_data(as_text=True)
|
||||
resp_data = response.get_data(as_text=True)
|
||||
assert 'Turn off all outgoing notifications' in resp_data
|
||||
assert mock_get_service.called
|
||||
|
||||
|
||||
def test_should_show_redirect_after_status_change(app_, db_, db_session):
|
||||
def test_should_redirect_after_status_confirmation(app_, db_, db_session, active_user, mock_get_service):
|
||||
with app_.test_request_context():
|
||||
with app_.test_client() as client:
|
||||
user = create_test_user('active')
|
||||
client.login(user)
|
||||
response = client.post('/services/123/service-settings/status')
|
||||
client.login(active_user)
|
||||
service_id = 123
|
||||
response = client.post(url_for(
|
||||
'main.service_status_change_confirm', service_id=service_id))
|
||||
|
||||
assert response.status_code == 302
|
||||
assert 'http://localhost/services/123/service-settings/status/confirm' == response.location
|
||||
settings_url = url_for(
|
||||
'main.service_settings', service_id=service_id, _external=True)
|
||||
assert settings_url == response.location
|
||||
|
||||
|
||||
def test_should_show_status_confirmation(app_, db_, db_session):
|
||||
def test_should_show_delete_page(app_, db_, db_session, active_user, mock_get_service):
|
||||
with app_.test_request_context():
|
||||
with app_.test_client() as client:
|
||||
user = create_test_user('active')
|
||||
client.login(user)
|
||||
response = client.get('/services/123/service-settings/status/confirm')
|
||||
|
||||
assert response.status_code == 200
|
||||
assert 'Turn off all outgoing notifications' in response.get_data(as_text=True)
|
||||
|
||||
|
||||
def test_should_redirect_after_status_confirmation(app_, db_, db_session):
|
||||
with app_.test_request_context():
|
||||
with app_.test_client() as client:
|
||||
user = create_test_user('active')
|
||||
client.login(user)
|
||||
response = client.post('/services/123/service-settings/status/confirm')
|
||||
|
||||
assert response.status_code == 302
|
||||
assert 'http://localhost/services/123/service-settings' == response.location
|
||||
|
||||
|
||||
def test_should_show_delete_page(app_, db_, db_session):
|
||||
with app_.test_request_context():
|
||||
with app_.test_client() as client:
|
||||
user = create_test_user('active')
|
||||
client.login(user)
|
||||
response = client.get('/services/123/service-settings/delete')
|
||||
client.login(active_user)
|
||||
service_id = 123
|
||||
response = client.get(url_for(
|
||||
'main.service_delete', service_id=service_id))
|
||||
|
||||
assert response.status_code == 200
|
||||
assert 'Delete this service from Notify' in response.get_data(as_text=True)
|
||||
assert mock_get_service.called
|
||||
|
||||
|
||||
def test_should_show_redirect_after_deleting_service(app_, db_, db_session):
|
||||
def test_should_show_redirect_after_deleting_service(app_, db_, db_session, active_user, mock_get_service):
|
||||
with app_.test_request_context():
|
||||
with app_.test_client() as client:
|
||||
user = create_test_user('active')
|
||||
client.login(user)
|
||||
response = client.post('/services/123/service-settings/delete')
|
||||
client.login(active_user)
|
||||
service_id = 123
|
||||
response = client.post(url_for(
|
||||
'main.service_delete', service_id=service_id))
|
||||
|
||||
assert response.status_code == 302
|
||||
assert 'http://localhost/services/123/service-settings/delete/confirm' == response.location
|
||||
delete_url = url_for(
|
||||
'main.service_delete_confirm', service_id=service_id)
|
||||
assert delete_url == response.location
|
||||
|
||||
|
||||
def test_should_show_delete_confirmation(app_, db_, db_session):
|
||||
def test_should_show_delete_confirmation(app_, db_, db_session, active_user, mock_get_service):
|
||||
with app_.test_request_context():
|
||||
with app_.test_client() as client:
|
||||
user = create_test_user('active')
|
||||
client.login(user)
|
||||
response = client.get('/services/123/service-settings/delete/confirm')
|
||||
client.login(active_user)
|
||||
service_id = 123
|
||||
response = client.get(url_for(
|
||||
'main.service_delete_confirm', service_id=service_id))
|
||||
|
||||
assert response.status_code == 200
|
||||
assert 'Delete this service from Notify' in response.get_data(as_text=True)
|
||||
assert mock_get_service.called
|
||||
|
||||
|
||||
def test_should_redirect_delete_confirmation(app_, db_, db_session):
|
||||
def test_should_redirect_delete_confirmation(app_,
|
||||
db_,
|
||||
db_session,
|
||||
active_user,
|
||||
mock_get_service,
|
||||
mock_delete_service):
|
||||
with app_.test_request_context():
|
||||
with app_.test_client() as client:
|
||||
user = create_test_user('active')
|
||||
client.login(user)
|
||||
response = client.post('/services/123/service-settings/delete/confirm')
|
||||
client.login(active_user)
|
||||
service_id = 123
|
||||
response = client.post(url_for(
|
||||
'main.service_delete_confirm', service_id=service_id))
|
||||
|
||||
assert response.status_code == 302
|
||||
assert 'http://localhost/services/123/dashboard' == response.location
|
||||
choose_url = url_for(
|
||||
'main.choose_service', _external=True)
|
||||
assert choose_url == response.location
|
||||
assert mock_get_service.called
|
||||
assert mock_delete_service.called
|
||||
|
||||
@@ -6,7 +6,8 @@ from flask.ext.migrate import Migrate, MigrateCommand
|
||||
from flask.ext.script import Manager
|
||||
from sqlalchemy.schema import MetaData
|
||||
from . import (
|
||||
create_test_user, create_another_test_user, service_json, TestClient)
|
||||
create_test_user, create_another_test_user, service_json, TestClient,
|
||||
get_test_user)
|
||||
from app import create_app, db
|
||||
|
||||
|
||||
@@ -66,6 +67,9 @@ def service_one(request):
|
||||
|
||||
@pytest.fixture(scope='function')
|
||||
def active_user(request, db_, db_session):
|
||||
usr = get_test_user()
|
||||
if usr:
|
||||
return usr
|
||||
return create_test_user('active')
|
||||
|
||||
|
||||
@@ -80,8 +84,13 @@ def mock_send_email(request, mocker):
|
||||
|
||||
|
||||
@pytest.fixture(scope='function')
|
||||
def mock_get_service(mocker):
|
||||
return mocker.patch('app.notifications_api_client.get_service')
|
||||
def mock_get_service(mocker, active_user):
|
||||
def _create(service_id):
|
||||
service = service_json(
|
||||
service_id, "Test Service", [active_user.id], limit=1000,
|
||||
active=False, restricted=True)
|
||||
return {'data': service, 'token': 1}
|
||||
return mocker.patch('app.notifications_api_client.get_service', side_effect=_create)
|
||||
|
||||
|
||||
@pytest.fixture(scope='function')
|
||||
@@ -125,3 +134,12 @@ def mock_get_services(mocker, active_user):
|
||||
mock_class = mocker.patch(
|
||||
'app.notifications_api_client.get_services', side_effect=_create)
|
||||
return mock_class
|
||||
|
||||
|
||||
@pytest.fixture(scope='function')
|
||||
def mock_delete_service(mocker, mock_get_service):
|
||||
def _delete(service_id):
|
||||
return mock_get_service.side_effect(service_id)
|
||||
mock_class = mocker.patch(
|
||||
'app.notifications_api_client.delete_service', side_effect=_delete)
|
||||
return mock_class
|
||||
|
||||
Reference in New Issue
Block a user