mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-07-18 05:30:21 -04:00
Merge with master.
This commit is contained in:
@@ -13,5 +13,4 @@ def test_should_show_recent_jobs_on_dashboard(app_,
|
||||
response = client.get(url_for('main.service_dashboard', service_id=123))
|
||||
|
||||
assert response.status_code == 200
|
||||
assert 'Test message 1' in response.get_data(as_text=True)
|
||||
assert 'Asdfgg' in response.get_data(as_text=True)
|
||||
assert 'You haven’t sent any text messages yet' in response.get_data(as_text=True)
|
||||
|
||||
@@ -11,8 +11,7 @@ def test_should_return_list_of_all_jobs(app_, db_, db_session, service_one):
|
||||
response = client.get(url_for('main.view_jobs', service_id=101))
|
||||
|
||||
assert response.status_code == 200
|
||||
assert 'Test message 1' in response.get_data(as_text=True)
|
||||
assert 'Final reminder' in response.get_data(as_text=True)
|
||||
assert 'You haven’t sent any notifications yet' in response.get_data(as_text=True)
|
||||
|
||||
|
||||
def test_should_show_page_for_one_job(app_, db_, db_session, service_one):
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
from flask import url_for
|
||||
|
||||
from tests.conftest import mock_register_user
|
||||
|
||||
|
||||
def test_render_register_returns_template_with_form(app_, db_, db_session):
|
||||
response = app_.test_client().get('/register')
|
||||
@@ -12,13 +14,21 @@ def test_process_register_creates_new_user(app_,
|
||||
db_,
|
||||
db_session,
|
||||
mock_send_sms,
|
||||
mock_send_email):
|
||||
mock_send_email,
|
||||
mocker):
|
||||
|
||||
user_data = {
|
||||
'name': 'Some One Valid',
|
||||
'email_address': 'someone@example.gov.uk',
|
||||
'mobile_number': '+4407700900460',
|
||||
'password': 'validPassword!'
|
||||
}
|
||||
|
||||
mock_register_user(mocker, user_data)
|
||||
|
||||
with app_.test_request_context():
|
||||
response = app_.test_client().post('/register',
|
||||
data={'name': 'Some One Valid',
|
||||
'email_address': 'someone@example.gov.uk',
|
||||
'mobile_number': '+4407700900460',
|
||||
'password': 'validPassword!'})
|
||||
data=user_data)
|
||||
assert response.status_code == 302
|
||||
assert response.location == url_for('main.verify', _external=True)
|
||||
|
||||
@@ -57,13 +67,19 @@ def test_should_add_verify_codes_on_session(app_,
|
||||
db_,
|
||||
db_session,
|
||||
mock_send_sms,
|
||||
mock_send_email):
|
||||
mock_send_email,
|
||||
mocker):
|
||||
user_data = {
|
||||
'name': 'Test Codes',
|
||||
'email_address': 'test@example.gov.uk',
|
||||
'mobile_number': '+4407700900460',
|
||||
'password': 'validPassword!'
|
||||
}
|
||||
|
||||
mock_register_user(mocker, user_data)
|
||||
with app_.test_client() as client:
|
||||
response = client.post('/register',
|
||||
data={'name': 'Test Codes',
|
||||
'email_address': 'test_codes@example.gov.uk',
|
||||
'mobile_number': '+4407700900460',
|
||||
'password': 'validPassword!'})
|
||||
data=user_data)
|
||||
assert response.status_code == 302
|
||||
assert 'notify_admin_session' in response.headers.get('Set-Cookie')
|
||||
|
||||
|
||||
@@ -199,6 +199,18 @@ def mock_delete_service_template(mocker):
|
||||
template_id, "Template to delete",
|
||||
"sms", "content to be deleted", service_id)
|
||||
return {'data': template}
|
||||
mock_class = mocker.patch(
|
||||
return mocker.patch(
|
||||
'app.notifications_api_client.delete_service_template', side_effect=_delete)
|
||||
|
||||
|
||||
def mock_register_user(mocker, user_data):
|
||||
data = {
|
||||
"email_address": user_data['email_address'],
|
||||
"failed_login_count": 0,
|
||||
"mobile_number": user_data['mobile_number'],
|
||||
"name": user_data['name'],
|
||||
"state": "pending"
|
||||
}
|
||||
mock_class = mocker.patch('app.main.views.register.UserApiClient')
|
||||
mock_class.register_user.return_value = data
|
||||
return mock_class
|
||||
|
||||
Reference in New Issue
Block a user