or error_exit
-get_instance_name_from_tags() {
- local instance_id=$1
-
- local instance_name=$($AWS_CLI ec2 describe-tags \
- --filters "Name=resource-id,Values=${instance_id}" \
- --query Tags[0].Value \
- --output text)
- if [ $? != 0 ]; then
- error_exit "Couldn't get instance name for '$instance_id'"
- fi
- echo $instance_name
- return $?
-}
-
-ELB_NAME=""
-
-get_elb_name_for_instance_name() {
- local instance_name=$1
-
- declare -A elb_to_instance_mapping
-
- elb_to_instance_mapping['notify-admin']='notify-admin'
-
- elb_to_instance_mapping['notify-admin-ags']='notify-admin-ags'
-
- local elb_name=${elb_to_instance_mapping[${instance_name}]}
- if [ -z $elb_name ]; then
- msg "No ELB for instance ${instance_name}"
- else
- ELB_NAME=$elb_name
- fi
-}
diff --git a/scripts/deregister_from_elb.sh b/scripts/deregister_from_elb.sh
deleted file mode 100755
index 62bab1612..000000000
--- a/scripts/deregister_from_elb.sh
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2014 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License").
-# You may not use this file except in compliance with the License.
-# A copy of the License is located at
-#
-# http://aws.amazon.com/apache2.0
-#
-# or in the "license" file accompanying this file. This file is distributed
-# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
-# express or implied. See the License for the specific language governing
-# permissions and limitations under the License.
-
-. $(dirname $0)/common_functions.sh
-
-msg "Running AWS CLI with region: $(get_instance_region)"
-
-# get this instance's ID
-INSTANCE_ID=$(get_instance_id)
-if [ $? != 0 -o -z "$INSTANCE_ID" ]; then
- error_exit "Unable to get this instance's ID; cannot continue."
-fi
-
-# Get current time
-msg "Started $(basename $0) at $(/bin/date "+%F %T")"
-start_sec=$(/bin/date +%s.%N)
-
-msg "Getting relevant load balancer"
-INSTANCE_NAME=$(get_instance_name_from_tags $INSTANCE_ID)
-get_elb_name_for_instance_name $INSTANCE_NAME
-get_elb_list $INSTANCE_ID $ELB_NAME
-
-msg "Checking that user set at least one load balancer"
-if test -z "$ELB_LIST"; then
- error_exit "Must have at least one load balancer to deregister from"
-fi
-
-# Loop through all LBs the user set, and attempt to deregister this instance from them.
-for elb in $ELB_LIST; do
- msg "Checking validity of load balancer named '$elb'"
- validate_elb $INSTANCE_ID $elb
- if [ $? != 0 ]; then
- msg "Error validating $elb; cannot continue with this LB"
- continue
- fi
-
- msg "Deregistering $INSTANCE_ID from $elb"
- deregister_instance $INSTANCE_ID $elb
-
- if [ $? != 0 ]; then
- error_exit "Failed to deregister instance $INSTANCE_ID from ELB $elb"
- fi
-done
-
-# Wait for all Deregistrations to finish
-msg "Waiting for instance to de-register from its load balancers"
-for elb in $ELB_LIST; do
- wait_for_state "elb" $INSTANCE_ID "OutOfService" $elb
- if [ $? != 0 ]; then
- error_exit "Failed waiting for $INSTANCE_ID to leave $elb"
- fi
-done
-
-msg "Finished $(basename $0) at $(/bin/date "+%F %T")"
-
-end_sec=$(/bin/date +%s.%N)
-elapsed_seconds=$(echo "$end_sec - $start_sec" | /usr/bin/bc)
-
-msg "Elapsed time: $elapsed_seconds"
diff --git a/scripts/register_with_elb.sh b/scripts/register_with_elb.sh
deleted file mode 100755
index 7cc78006c..000000000
--- a/scripts/register_with_elb.sh
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2014 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License").
-# You may not use this file except in compliance with the License.
-# A copy of the License is located at
-#
-# http://aws.amazon.com/apache2.0
-#
-# or in the "license" file accompanying this file. This file is distributed
-# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
-# express or implied. See the License for the specific language governing
-# permissions and limitations under the License.
-
-. $(dirname $0)/common_functions.sh
-
-msg "Running AWS CLI with region: $(get_instance_region)"
-
-# get this instance's ID
-INSTANCE_ID=$(get_instance_id)
-if [ $? != 0 -o -z "$INSTANCE_ID" ]; then
- error_exit "Unable to get this instance's ID; cannot continue."
-fi
-
-# Get current time
-msg "Started $(basename $0) at $(/bin/date "+%F %T")"
-start_sec=$(/bin/date +%s.%N)
-
-msg "Getting relevant load balancer"
-INSTANCE_NAME=$(get_instance_name_from_tags $INSTANCE_ID)
-get_elb_name_for_instance_name $INSTANCE_NAME
-ELB_LIST=$ELB_NAME
-get_elb_list $INSTANCE_ID $ELB_NAME
-
-msg "Checking that user set at least one load balancer"
-if test -z "$ELB_LIST"; then
- error_exit "Must have at least one load balancer to register to"
-fi
-
-# Loop through all LBs the user set, and attempt to register this instance to them.
-for elb in $ELB_LIST; do
- msg "Checking validity of load balancer named '$elb'"
- validate_elb $INSTANCE_ID $elb
- if [ $? != 0 ]; then
- msg "Error validating $elb; cannot continue with this LB"
- continue
- fi
-
- msg "Registering $INSTANCE_ID to $elb"
- register_instance $INSTANCE_ID $elb
-
- if [ $? != 0 ]; then
- error_exit "Failed to register instance $INSTANCE_ID from ELB $elb"
- fi
-done
-
-# Wait for all Registrations to finish
-msg "Waiting for instance to register to its load balancers"
-for elb in $ELB_LIST; do
- wait_for_state "elb" $INSTANCE_ID "InService" $elb
- if [ $? != 0 ]; then
- error_exit "Failed waiting for $INSTANCE_ID to return to $elb"
- fi
-done
-
-msg "Finished $(basename $0) at $(/bin/date "+%F %T")"
-
-end_sec=$(/bin/date +%s.%N)
-elapsed_seconds=$(echo "$end_sec - $start_sec" | /usr/bin/bc)
-
-msg "Elapsed time: $elapsed_seconds"
diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh
index d8d6b5a39..2b5da0565 100755
--- a/scripts/run_tests.sh
+++ b/scripts/run_tests.sh
@@ -28,7 +28,7 @@ if [[ -z "$VIRTUAL_ENV" ]] && [[ -d venv ]]; then
source ./venv/bin/activate
fi
-flake8 .
+flake8 --enable=T .
display_result $? 1 "Code style check"
npm test
diff --git a/tests/__init__.py b/tests/__init__.py
index 372d34f6c..b5ba0350d 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -53,6 +53,7 @@ def service_json(
created_at=None,
letter_contact_block=None,
inbound_api=None,
+ service_callback_api=None,
permissions=None,
organisation_type='central',
free_sms_fragment_limit=250000,
@@ -84,6 +85,7 @@ def service_json(
'dvla_organisation': '001',
'permissions': permissions,
'inbound_api': inbound_api,
+ 'service_callback_api': service_callback_api,
'prefix_sms': prefix_sms,
}
@@ -366,7 +368,6 @@ def validate_route_permission(mocker,
else:
pytest.fail("Invalid method call {}".format(method))
if resp.status_code != response_code:
- print(resp.status_code)
pytest.fail("Invalid permissions set for endpoint {}".format(route))
return resp
@@ -401,6 +402,5 @@ def validate_route_permission_with_client(mocker,
else:
pytest.fail("Invalid method call {}".format(method))
if resp.status_code != response_code:
- print(resp.status_code)
pytest.fail("Invalid permissions set for endpoint {}".format(route))
return resp
diff --git a/tests/app/main/test_validators.py b/tests/app/main/test_validators.py
index 7c494312b..f7a6f959d 100644
--- a/tests/app/main/test_validators.py
+++ b/tests/app/main/test_validators.py
@@ -99,6 +99,8 @@ def _gen_mock_field(x):
'test@bbsrc.ac.uk',
'test@acas.org.uk',
'test@biglotteryfund.org.uk',
+ 'test@marinemanagement.org.uk',
+ 'test@britishmuseum.org',
])
def test_valid_list_of_white_list_email_domains(
client,
@@ -149,7 +151,7 @@ def test_for_commas_in_placeholders(
):
with pytest.raises(ValidationError) as error:
NoCommasInPlaceHolders()(None, _gen_mock_field('Hello ((name,date))'))
- assert str(error.value) == 'You can’t have commas in your fields'
+ assert str(error.value) == 'You can’t put commas between double brackets'
NoCommasInPlaceHolders()(None, _gen_mock_field('Hello ((name))'))
diff --git a/tests/app/main/views/test_accept_invite.py b/tests/app/main/views/test_accept_invite.py
index ae94139c8..0ff67f30b 100644
--- a/tests/app/main/views/test_accept_invite.py
+++ b/tests/app/main/views/test_accept_invite.py
@@ -315,6 +315,29 @@ def test_signed_in_existing_user_cannot_use_anothers_invite(
assert mock_accept_invite.call_count == 0
+def test_accept_invite_does_not_treat_email_addresses_as_case_sensitive(
+ logged_in_client,
+ mocker,
+ api_user_active,
+ sample_invite,
+ service_one,
+ mock_accept_invite,
+ mock_get_user_by_email
+):
+ mocker.patch('app.main.views.invites.check_token')
+
+ # the email address of api_user_active is 'test@user.gov.uk'
+ sample_invite['email_address'] = 'TEST@user.gov.uk'
+ invite = InvitedUser(**sample_invite)
+ mocker.patch('app.invite_api_client.check_token', return_value=invite)
+ mocker.patch('app.user_api_client.get_users_for_service', return_value=[api_user_active])
+
+ response = logged_in_client.get(url_for('main.accept_invite', token='thisisnotarealtoken'))
+
+ assert response.status_code == 302
+ assert response.location == url_for('main.service_dashboard', service_id=service_one['id'], _external=True)
+
+
def test_new_invited_user_verifies_and_added_to_service(
client,
service_one,
diff --git a/tests/app/main/views/test_api_keys.py b/tests/app/main/views/test_api_keys.py
index 412e9cc69..a874eacad 100644
--- a/tests/app/main/views/test_api_keys.py
+++ b/tests/app/main/views/test_api_keys.py
@@ -8,11 +8,14 @@ from unittest.mock import call
from tests import validate_route_permission
from tests.conftest import (
+ fake_uuid,
mock_get_service,
mock_get_live_service,
mock_get_service_with_letters,
normalize_spaces,
SERVICE_ONE_ID,
+ mock_get_valid_service_callback_api,
+ mock_get_valid_service_inbound_api,
)
@@ -348,8 +351,8 @@ def test_should_update_whitelist(
service_id = str(uuid.uuid4())
data = OrderedDict([
('email_addresses-1', 'test@example.com'),
- ('email_addresses-3', 'test@example.com'),
- ('phone_numbers-0', '07900900000'),
+ ('email_addresses-3', ' test@example.com '),
+ ('phone_numbers-0', '07900900000 '),
('phone_numbers-2', '+1800-555-555'),
])
@@ -391,3 +394,298 @@ def test_should_validate_whitelist_items(
assert jump_links[1]['href'] == '#phone_numbers'
mock_update_whitelist.assert_not_called()
+
+
+@pytest.mark.parametrize('endpoint', [
+ ('main.delivery_status_callback'),
+ ('main.received_text_messages_callback'),
+])
+@pytest.mark.parametrize('url, bearer_token, expected_errors', [
+ ("", "", "Can’t be empty Can’t be empty"),
+ ("http://not_https.com", "1234567890", "Must be a valid https URL"),
+ ("https://test.com", "123456789", "Must be at least 10 characters"),
+])
+def test_callback_forms_validation(
+ client_request,
+ service_one,
+ endpoint,
+ url,
+ bearer_token,
+ expected_errors
+):
+ if endpoint == 'main.received_text_messages_callback':
+ service_one['permissions'] = ['inbound_sms']
+
+ data = {
+ "url": url,
+ "bearer_token": bearer_token,
+ }
+
+ response = client_request.post(
+ endpoint,
+ service_id=service_one['id'],
+ _data=data,
+ _expected_status=200
+ )
+ error_msgs = ' '.join(msg.text.strip() for msg in response.select(".error-message"))
+
+ assert error_msgs == expected_errors
+
+
+@pytest.mark.parametrize('has_inbound_sms, expected_link', [
+ (True, 'main.api_callbacks'),
+ (False, 'main.delivery_status_callback'),
+])
+def test_callbacks_button_links_straight_to_delivery_status_if_service_has_no_inbound_sms(
+ client_request,
+ service_one,
+ mocker,
+ mock_get_notifications,
+ has_inbound_sms,
+ expected_link
+):
+ if has_inbound_sms:
+ service_one['permissions'] = ['inbound_sms']
+
+ page = client_request.get(
+ 'main.api_integration',
+ service_id=service_one['id'],
+ )
+
+ assert page.select('.pill-separate-item')[2]['href'] == url_for(
+ expected_link, service_id=service_one['id']
+ )
+
+
+def test_callbacks_page_redirects_to_delivery_status_if_service_has_no_inbound_sms(
+ client_request,
+ service_one,
+ mocker
+):
+ page = client_request.get(
+ 'main.api_callbacks',
+ service_id=service_one['id'],
+ _follow_redirects=True,
+ )
+
+ assert normalize_spaces(page.select_one('h1').text) == "Callbacks for delivery receipts"
+
+
+@pytest.mark.parametrize('has_inbound_sms, expected_link', [
+ (True, 'main.api_callbacks'),
+ (False, 'main.api_integration'),
+])
+def test_back_link_directs_to_api_integration_from_delivery_callback_if_no_inbound_sms(
+ client_request,
+ service_one,
+ mocker,
+ has_inbound_sms,
+ expected_link
+):
+ if has_inbound_sms:
+ service_one['permissions'] = ['inbound_sms']
+
+ page = client_request.get(
+ 'main.delivery_status_callback',
+ service_id=service_one['id'],
+ _follow_redirects=True,
+ )
+
+ assert page.select_one('.page-footer-back-link')['href'] == url_for(
+ expected_link, service_id=service_one['id']
+ )
+
+
+@pytest.mark.parametrize('endpoint', [
+ ('main.delivery_status_callback'),
+ ('main.received_text_messages_callback'),
+])
+def test_create_delivery_status_and_receive_text_message_callbacks(
+ client_request,
+ service_one,
+ mocker,
+ mock_get_notifications,
+ mock_create_service_inbound_api,
+ mock_create_service_callback_api,
+ endpoint,
+ fake_uuid,
+):
+ if endpoint == 'main.received_text_messages_callback':
+ service_one['permissions'] = ['inbound_sms']
+
+ data = {
+ 'url': "https://test.url.com/",
+ 'bearer_token': '1234567890',
+ 'user_id': fake_uuid
+ }
+
+ client_request.post(
+ endpoint,
+ service_id=service_one['id'],
+ _data=data,
+ )
+
+ if endpoint == 'main.received_text_messages_callback':
+ mock_create_service_inbound_api.assert_called_once_with(
+ service_one['id'],
+ url="https://test.url.com/",
+ bearer_token="1234567890",
+ user_id=fake_uuid,
+ )
+ else:
+ mock_create_service_callback_api.assert_called_once_with(
+ service_one['id'],
+ url="https://test.url.com/",
+ bearer_token="1234567890",
+ user_id=fake_uuid,
+ )
+
+
+@pytest.mark.parametrize('endpoint, fixture', [
+ ('main.delivery_status_callback', mock_get_valid_service_callback_api),
+ ('main.received_text_messages_callback', mock_get_valid_service_inbound_api),
+])
+def test_update_delivery_status_and_receive_text_message_callbacks(
+ client_request,
+ service_one,
+ mocker,
+ mock_get_notifications,
+ mock_update_service_inbound_api,
+ mock_update_service_callback_api,
+ endpoint,
+ fixture,
+ fake_uuid,
+):
+ if endpoint == 'main.received_text_messages_callback':
+ service_one['inbound_api'] = [fake_uuid]
+ service_one['permissions'] = ['inbound_sms']
+ else:
+ service_one['service_callback_api'] = [fake_uuid]
+
+ fixture(mocker)
+
+ data = {
+ 'url': "https://test.url.com/",
+ 'bearer_token': '1234567890',
+ 'user_id': fake_uuid
+ }
+
+ client_request.post(
+ endpoint,
+ service_id=service_one['id'],
+ _data=data,
+ )
+
+ if endpoint == 'main.received_text_messages_callback':
+ mock_update_service_inbound_api.assert_called_once_with(
+ service_one['id'],
+ url="https://test.url.com/",
+ bearer_token="1234567890",
+ user_id=fake_uuid,
+ inbound_api_id=fake_uuid,
+ )
+ else:
+ mock_update_service_callback_api.assert_called_once_with(
+ service_one['id'],
+ url="https://test.url.com/",
+ bearer_token="1234567890",
+ user_id=fake_uuid,
+ callback_api_id=fake_uuid
+ )
+
+
+@pytest.mark.parametrize('endpoint, data, fixture', [
+ (
+ 'main.delivery_status_callback',
+ {"url": "https://hello2.gov.uk", "bearer_token": "bearer_token_set"},
+ mock_get_valid_service_callback_api
+ ),
+ (
+ 'main.received_text_messages_callback',
+ {"url": "https://hello3.gov.uk", "bearer_token": "bearer_token_set"},
+ mock_get_valid_service_inbound_api
+ ),
+])
+def test_update_delivery_status_and_receive_text_message_callbacks_without_changes_do_not_update(
+ client_request,
+ service_one,
+ mocker,
+ mock_get_notifications,
+ mock_update_service_callback_api,
+ mock_update_service_inbound_api,
+ data,
+ fixture,
+ endpoint,
+ fake_uuid,
+):
+ if endpoint == 'main.received_text_messages_callback':
+ service_one['inbound_api'] = [fake_uuid]
+ service_one['permissions'] = ['inbound_sms']
+ else:
+ service_one['service_callback_api'] = [fake_uuid]
+
+ fixture(mocker)
+
+ data['user_id'] = fake_uuid
+
+ client_request.post(
+ endpoint,
+ service_id=service_one['id'],
+ _data=data,
+ )
+
+ if endpoint == 'main.received_text_messages_callback':
+ assert mock_update_service_inbound_api.called is False
+ else:
+ assert mock_update_service_callback_api.called is False
+
+
+@pytest.mark.parametrize('service_callback_api, delivery_url, expected_1st_table_row', [
+ (
+ None, {},
+ 'Callbacks for delivery receipts Not set Change'
+ ),
+ (
+ fake_uuid(), {'url': 'https://delivery.receipts'},
+ 'Callbacks for delivery receipts https://delivery.receipts Change'
+ ),
+])
+@pytest.mark.parametrize('inbound_api, inbound_url, expected_2nd_table_row', [
+ (
+ None, {},
+ 'Callbacks for received text messages Not set Change'
+ ),
+ (
+ fake_uuid(), {'url': 'https://inbound.sms'},
+ 'Callbacks for received text messages https://inbound.sms Change'
+ ),
+])
+def test_callbacks_page_works_when_no_apis_set(
+ client_request,
+ service_one,
+ mocker,
+ service_callback_api,
+ delivery_url,
+ expected_1st_table_row,
+ inbound_api,
+ inbound_url,
+ expected_2nd_table_row,
+):
+ service_one['permissions'] = ['inbound_sms']
+ service_one['inbound_api'] = inbound_api
+ service_one['service_callback_api'] = service_callback_api
+
+ mocker.patch('app.service_api_client.get_service_callback_api', return_value=delivery_url)
+ mocker.patch('app.service_api_client.get_service_inbound_api', return_value=inbound_url)
+
+ page = client_request.get('main.api_callbacks',
+ service_id=service_one['id'],
+ _follow_redirects=True)
+ expected_rows = [
+ expected_1st_table_row,
+ expected_2nd_table_row,
+ ]
+ rows = page.select('tbody tr')
+ assert len(rows) == 2
+ for index, row in enumerate(expected_rows):
+ assert row == normalize_spaces(rows[index].text)
diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py
index a98a4b72a..66163724b 100644
--- a/tests/app/main/views/test_dashboard.py
+++ b/tests/app/main/views/test_dashboard.py
@@ -616,7 +616,6 @@ def test_usage_page(
assert '249,860 free text messages' in table
assert '40 free text messages' in table
assert '960 text messages at 1.65p' in table
-
assert 'April' in table
assert 'February' in table
assert 'March' in table
@@ -626,6 +625,50 @@ def test_usage_page(
assert '1,230 text messages at 1.65p' in table
+@freeze_time("2012-03-31 12:12:12")
+def test_usage_page_with_letters(
+ logged_in_client,
+ service_one,
+ mock_get_usage,
+ mock_get_billable_units,
+ mock_get_free_sms_fragment_limit
+):
+ service_one['permissions'].append('letter')
+ response = logged_in_client.get(url_for('main.usage', service_id=SERVICE_ONE_ID))
+
+ assert response.status_code == 200
+
+ mock_get_billable_units.assert_called_once_with(SERVICE_ONE_ID, 2011)
+ mock_get_usage.assert_called_once_with(SERVICE_ONE_ID, 2011)
+ mock_get_free_sms_fragment_limit.assert_called_with(SERVICE_ONE_ID, 2011)
+
+ page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
+
+ cols = page.find_all('div', {'class': 'column-one-third'})
+ nav = page.find('ul', {'class': 'pill', 'role': 'tablist'})
+ nav_links = nav.find_all('a')
+
+ assert normalize_spaces(nav_links[0].text) == '2010 to 2011 financial year'
+ assert normalize_spaces(nav.find('li', {'aria-selected': 'true'}).text) == '2011 to 2012 financial year'
+ assert normalize_spaces(nav_links[1].text) == '2012 to 2013 financial year'
+ assert '252,190' in cols[1].text
+ assert 'Text messages' in cols[1].text
+
+ table = page.find('table').text.strip()
+
+ assert '249,860 free text messages' in table
+ assert '40 free text messages' in table
+ assert '960 text messages at 1.65p' in table
+ assert 'April' in table
+ assert 'February' in table
+ assert 'March' in table
+ assert '£18.94' in table
+ assert '140 free text messages' in table
+ assert '£20.30' in table
+ assert '1,230 text messages at 1.65p' in table
+ assert '10 letters at 31p' in table
+
+
def test_usage_page_with_year_argument(
logged_in_client,
mock_get_usage,
@@ -986,18 +1029,18 @@ def test_get_free_paid_breakdown_for_billable_units(now, expected_number_of_mont
]
)
assert list(billing_units) == [
- {'free': 100000, 'name': 'April', 'paid': 0},
- {'free': 100000, 'name': 'May', 'paid': 0},
- {'free': 50000, 'name': 'June', 'paid': 50000},
- {'free': 0, 'name': 'July', 'paid': 0},
- {'free': 0, 'name': 'August', 'paid': 0},
- {'free': 0, 'name': 'September', 'paid': 0},
- {'free': 0, 'name': 'October', 'paid': 0},
- {'free': 0, 'name': 'November', 'paid': 0},
- {'free': 0, 'name': 'December', 'paid': 0},
- {'free': 0, 'name': 'January', 'paid': 0},
- {'free': 0, 'name': 'February', 'paid': 2000},
- {'free': 0, 'name': 'March', 'paid': 0}
+ {'free': 100000, 'name': 'April', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0},
+ {'free': 100000, 'name': 'May', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0},
+ {'free': 50000, 'name': 'June', 'paid': 50000, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0},
+ {'free': 0, 'name': 'July', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0},
+ {'free': 0, 'name': 'August', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0},
+ {'free': 0, 'name': 'September', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0},
+ {'free': 0, 'name': 'October', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0},
+ {'free': 0, 'name': 'November', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0},
+ {'free': 0, 'name': 'December', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0},
+ {'free': 0, 'name': 'January', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0},
+ {'free': 0, 'name': 'February', 'paid': 2000, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0},
+ {'free': 0, 'name': 'March', 'paid': 0, 'letter_total': 0, 'letters': [], 'letter_cumulative': 0}
][:expected_number_of_months]
diff --git a/tests/app/main/views/test_jobs.py b/tests/app/main/views/test_jobs.py
index 43a9c784e..2b812ca3f 100644
--- a/tests/app/main/views/test_jobs.py
+++ b/tests/app/main/views/test_jobs.py
@@ -97,7 +97,7 @@ def test_should_show_page_for_one_job(
job_id=fake_uuid,
status=status_argument,
)
- csv_link = page.find('a', {'download': 'download'})
+ csv_link = page.select_one('a[download]')
assert csv_link['href'] == url_for(
'main.view_job_csv',
service_id=service_one['id'],
diff --git a/tests/app/main/views/test_notifications.py b/tests/app/main/views/test_notifications.py
index ff2e94890..2ef218748 100644
--- a/tests/app/main/views/test_notifications.py
+++ b/tests/app/main/views/test_notifications.py
@@ -109,13 +109,19 @@ def test_notification_page_doesnt_link_to_template_in_tour(
@freeze_time("2016-01-01 01:01")
-def test_notification_page_shows_status_of_letter_notification(
+def test_notification_page_shows_page_for_letter_notification(
client_request,
mocker,
fake_uuid,
):
+ count_of_pages = 3
+
mock_get_notification(mocker, fake_uuid, template_type='letter')
+ mocker.patch(
+ 'app.main.views.notifications.get_page_count_for_letter',
+ return_value=count_of_pages
+ )
page = client_request.get(
'main.view_notification',
@@ -131,6 +137,15 @@ def test_notification_page_shows_status_of_letter_notification(
)
assert page.select('p.notification-status') == []
+ letter_images = page.select('main img')
+
+ assert len(letter_images) == count_of_pages
+
+ for index in range(1, count_of_pages + 1):
+ assert page.select('img')[index]['src'].endswith(
+ '.png?page={}'.format(index)
+ )
+
@pytest.mark.parametrize('filetype', [
'pdf', 'png'
@@ -193,6 +208,10 @@ def test_notification_page_has_link_to_send_another_for_sms(
service_one['permissions'] = service_permissions
mock_get_notification(mocker, fake_uuid, template_type=template_type)
+ mocker.patch(
+ 'app.main.views.notifications.get_page_count_for_letter',
+ return_value=1
+ )
page = client_request.get(
'main.view_notification',
@@ -237,6 +256,10 @@ def test_notification_page_has_link_to_download_letter(
):
mock_get_notification(mocker, fake_uuid, template_type=template_type)
+ mocker.patch(
+ 'app.main.views.notifications.get_page_count_for_letter',
+ return_value=1
+ )
page = client_request.get(
'main.view_notification',
diff --git a/tests/app/main/views/test_register.py b/tests/app/main/views/test_register.py
index ba5cc3b9e..b5ba1d508 100644
--- a/tests/app/main/views/test_register.py
+++ b/tests/app/main/views/test_register.py
@@ -39,6 +39,10 @@ def test_logged_in_user_redirects_to_choose_service(
'+4407700900460',
'+1800-555-555',
])
+@pytest.mark.parametrize('password', [
+ 'the quick brown fox',
+ ' the quick brown fox ',
+])
def test_register_creates_new_user_and_redirects_to_continue_page(
client,
mock_send_verify_code,
@@ -48,11 +52,12 @@ def test_register_creates_new_user_and_redirects_to_continue_page(
mock_send_verify_email,
mock_login,
phone_number_to_register_with,
+ password,
):
user_data = {'name': 'Some One Valid',
'email_address': 'notfound@example.gov.uk',
'mobile_number': phone_number_to_register_with,
- 'password': 'validPassword!',
+ 'password': password,
'auth_type': 'sms_auth'
}
diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py
index f3618f384..bc7423dea 100644
--- a/tests/app/main/views/test_send.py
+++ b/tests/app/main/views/test_send.py
@@ -352,6 +352,16 @@ def test_upload_csvfile_with_errors_shows_check_page_with_errors(
'Skip to file contents'
)
),
+ (
+ """
+ phone number, name
+ """,
+ (
+ 'Your file is missing some rows '
+ 'It needs at least one row of data. '
+ 'Skip to file contents'
+ )
+ ),
(
"+447700900986",
(
@@ -440,34 +450,76 @@ def test_upload_csv_invalid_extension(
assert "invalid.txt isn’t a spreadsheet that Notify can read" in resp.get_data(as_text=True)
-def test_upload_valid_csv_shows_file_contents(
- logged_in_client,
- mocker,
+def test_upload_valid_csv_redirects_to_check_page(
+ client_request,
mock_get_service_template_with_placeholders,
mock_s3_upload,
+ fake_uuid,
+):
+ client_request.post(
+ 'main.send_messages', service_id=SERVICE_ONE_ID, template_id=fake_uuid,
+ _data={'file': (BytesIO(''.encode('utf-8')), 'valid.csv')},
+ _expected_status=302,
+ expected_redirect='foo'
+ )
+
+
+@pytest.mark.parametrize('extra_args, expected_recipient, expected_message', [
+ (
+ {},
+ 'To: 07700900001',
+ 'Test Service: A, Template content with & entity',
+ ),
+ (
+ {'row_index': 0},
+ 'To: 07700900001',
+ 'Test Service: A, Template content with & entity',
+ ),
+ (
+ {'row_index': 2},
+ 'To: 07700900003',
+ 'Test Service: C, Template content with & entity',
+ ),
+])
+def test_upload_valid_csv_shows_preview_and_table(
+ client_request,
+ mocker,
+ mock_get_live_service,
+ mock_get_service_template_with_placeholders,
mock_get_users_by_service,
mock_get_detailed_service_for_today,
fake_uuid,
+ extra_args,
+ expected_recipient,
+ expected_message,
):
+ with client_request.session_transaction() as session:
+ session['upload_data'] = {'template_id': fake_uuid}
+
mocker.patch('app.main.views.send.s3download', return_value="""
phone number,name,thing,thing,thing
- 07700900986, Jo, foo, foo, foo
+ 07700900001, A, foo, foo, foo
+ 07700900002, B, foo, foo, foo
+ 07700900003, C, foo, foo, foo
""")
- response = logged_in_client.post(
- url_for('main.send_messages', service_id=SERVICE_ONE_ID, template_id=fake_uuid),
- data={'file': (BytesIO(''.encode('utf-8')), 'valid.csv')},
- follow_redirects=True,
+ page = client_request.get(
+ 'main.check_messages',
+ service_id=SERVICE_ONE_ID,
+ template_type='sms',
+ upload_id=fake_uuid,
+ **extra_args
)
- assert response.status_code == 200
- page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
assert page.h1.text.strip() == 'Preview of Two week reminder'
+ assert page.select_one('.sms-message-recipient').text.strip() == expected_recipient
+ assert page.select_one('.sms-message-wrapper').text.strip() == expected_message
+
for index, cell in enumerate([
'| 2 | ',
- ' 07700900986 | ',
- ' Jo | ',
+ ' 07700900001 | ',
+ ' A | ',
(
' '
' '
@@ -481,6 +533,43 @@ def test_upload_valid_csv_shows_file_contents(
assert normalize_spaces(str(page.select('table tbody td')[index])) == cell
+@pytest.mark.parametrize('row_index, expected_status', [
+ (0, 200),
+ (2, 200),
+ (3, 404),
+])
+def test_404_for_previewing_a_row_out_of_range(
+ client_request,
+ mocker,
+ mock_get_live_service,
+ mock_get_service_template_with_placeholders,
+ mock_get_users_by_service,
+ mock_get_detailed_service_for_today,
+ fake_uuid,
+ row_index,
+ expected_status,
+):
+
+ with client_request.session_transaction() as session:
+ session['upload_data'] = {'template_id': fake_uuid}
+
+ mocker.patch('app.main.views.send.s3download', return_value="""
+ phone number,name,thing,thing,thing
+ 07700900001, A, foo, foo, foo
+ 07700900002, B, foo, foo, foo
+ 07700900003, C, foo, foo, foo
+ """)
+
+ client_request.get(
+ 'main.check_messages',
+ service_id=SERVICE_ONE_ID,
+ template_type='sms',
+ upload_id=fake_uuid,
+ row_index=row_index,
+ _expected_status=expected_status,
+ )
+
+
def test_send_test_doesnt_show_file_contents(
logged_in_client,
mocker,
@@ -1373,6 +1462,20 @@ def test_can_start_letters_job(
@pytest.mark.parametrize('filetype', ['pdf', 'png'])
+@pytest.mark.parametrize('extra_args, expected_values', [
+ (
+ {},
+ {'postcode': 'abc123', 'addressline1': '123 street'},
+ ),
+ (
+ {'row_index': 0},
+ {'postcode': 'abc123', 'addressline1': '123 street'},
+ ),
+ (
+ {'row_index': 1},
+ {'postcode': 'cba321', 'addressline1': '321 avenue'},
+ ),
+])
def test_should_show_preview_letter_message(
filetype,
logged_in_platform_admin_client,
@@ -1382,6 +1485,8 @@ def test_should_show_preview_letter_message(
service_one,
fake_uuid,
mocker,
+ extra_args,
+ expected_values,
):
service_one['permissions'] = ['letter']
mocker.patch('app.service_api_client.get_service', return_value={"data": service_one})
@@ -1391,7 +1496,8 @@ def test_should_show_preview_letter_message(
'app.main.views.send.s3download',
return_value='\n'.join(
['address line 1, postcode'] +
- ['123 street, abc123']
+ ['123 street, abc123'] +
+ ['321 avenue, cba321']
)
)
mocked_preview = mocker.patch(
@@ -1414,7 +1520,8 @@ def test_should_show_preview_letter_message(
service_id=service_id,
template_type='letter',
upload_id=fake_uuid,
- filetype=filetype
+ filetype=filetype,
+ **extra_args
)
)
@@ -1425,6 +1532,7 @@ def test_should_show_preview_letter_message(
assert mocked_preview.call_args[0][0].id == template_id
assert type(mocked_preview.call_args[0][0]) == LetterPreviewTemplate
assert mocked_preview.call_args[0][1] == filetype
+ assert mocked_preview.call_args[0][0].values == expected_values
def test_dont_show_preview_letter_templates_for_bad_filetype(
diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py
index 9f79cfb8d..02d22db84 100644
--- a/tests/app/main/views/test_service_settings.py
+++ b/tests/app/main/views/test_service_settings.py
@@ -7,7 +7,6 @@ from flask import url_for
from werkzeug.exceptions import InternalServerError
import app
-from app.main.views.service_settings import dummy_bearer_token
from app.utils import email_safe
from tests import validate_route_permission, service_json
from tests.conftest import (
@@ -136,7 +135,6 @@ def test_should_show_overview(
'Text messages start with service name On Change',
'International text messages On Change',
'Receive text messages On Change',
- 'Callback URL for received text messages Not set Change',
'Label Value Action',
'Send letters Off Change',
@@ -186,47 +184,6 @@ def test_should_show_overview_for_service_with_more_things_set(
assert row == " ".join(page.find_all('tr')[index + 1].text.split())
-@pytest.mark.parametrize('url, elided_url', [
- ('https://test.url.com/inbound', 'https://test.url.com...'),
- ('https://test.url.com/', 'https://test.url.com...'),
- ('https://test.url.com', 'https://test.url.com'),
-])
-def test_service_settings_show_elided_api_url_if_needed(
- logged_in_platform_admin_client,
- service_one,
- single_reply_to_email_address,
- single_sms_sender,
- single_letter_contact_block,
- mocker,
- fake_uuid,
- url,
- elided_url,
- mock_get_service_settings_page_common,
-):
- service_one['permissions'] = ['sms', 'email', 'inbound_sms']
- service_one['inbound_api'] = [fake_uuid]
-
- mocked_get_fn = mocker.patch(
- 'app.service_api_client.get',
- return_value={'data': {'id': fake_uuid, 'url': url}}
- )
-
- response = logged_in_platform_admin_client.get(
- url_for(
- 'main.service_settings',
- service_id=service_one['id']
- )
- )
- assert response.status_code == 200
- page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
-
- non_empty_trs = [tr.find_all('td') for tr in page.find_all('tr') if tr.find_all('td')]
- api_url = [api_setting[1].text.strip() for api_setting in non_empty_trs
- if api_setting[0].text.strip() == 'Callback URL for received text messages'][0]
- assert api_url == elided_url
- assert mocked_get_fn.called is True
-
-
def test_if_cant_send_letters_then_cant_see_letter_contact_block(
logged_in_client,
service_one,
@@ -1274,34 +1231,6 @@ def test_does_not_show_research_mode_indicator(
assert not element
-@pytest.mark.parametrize('url, bearer_token, expected_errors', [
- ("", "", "Can’t be empty Can’t be empty"),
- ("http://not_https.com", "1234567890", "Must be a valid https URL"),
- ("https://test.com", "123456789", "Must be at least 10 characters"),
-])
-def test_set_inbound_api_validation(
- logged_in_client,
- mock_update_service,
- service_one,
- mock_get_letter_organisations,
- url,
- bearer_token,
- expected_errors,
-):
- service_one['permissions'] = ['inbound_sms']
- response = logged_in_client.post(url_for(
- 'main.service_set_inbound_api',
- service_id=service_one['id']),
- data={"url": url, "bearer_token": bearer_token}
- )
- page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
- error_msgs = ' '.join(msg.text.strip() for msg in page.select(".error-message"))
-
- assert response.status_code == 200
- assert error_msgs == expected_errors
- assert not mock_update_service.called
-
-
@pytest.mark.parametrize('method', ['get', 'post'])
def test_cant_set_letter_contact_block_if_service_cant_send_letters(
logged_in_client,
@@ -1707,113 +1636,6 @@ def test_switch_service_enable_international_sms(
assert mocked_fn.call_args[0][0] == service_one['id']
-def test_set_new_inbound_api_and_valid_bearer_token_calls_create_inbound_api_endpoint(
- logged_in_platform_admin_client,
- service_one,
- mocker,
-):
- service_one['permissions'] = ['inbound_sms']
- service_one['inbound_api'] = []
-
- mocked_post_fn = mocker.patch('app.service_api_client.post', return_value=service_one)
-
- inbound_api_data = {'url': "https://test.url.com/", 'bearer_token': '1234567890'}
- response = logged_in_platform_admin_client.post(
- url_for(
- 'main.service_set_inbound_api',
- service_id=service_one['id']
- ),
- data=inbound_api_data
- )
- assert response.status_code == 302
- assert response.location == url_for('main.service_settings', service_id=service_one['id'], _external=True)
- assert mocked_post_fn.called
-
- inbound_api_data['updated_by_id'] = service_one['users'][0]
- assert mocked_post_fn.call_args == call("/service/{}/inbound-api".format(service_one['id']), inbound_api_data)
-
-
-@pytest.mark.parametrize(
- 'inbound_api_data', [
- {'url': "https://test.url.com/inbound", 'bearer_token': dummy_bearer_token},
- {'url': "https://test.url.com/inbound", 'bearer_token': '1234567890'},
- {'url': "https://test.url.com/", 'bearer_token': 'new_1234567890'},
- ]
-)
-def test_update_inbound_api_and_valid_bearer_token_calls_update_inbound_api_endpoint(
- logged_in_platform_admin_client,
- service_one,
- mocker,
- fake_uuid,
- inbound_api_data,
-):
- service_one['permissions'] = ['inbound_sms']
- service_one['inbound_api'] = [fake_uuid]
-
- initial_api_data = {'data': {'id': fake_uuid, 'url': "https://test.url.com/"}}
-
- mocked_get_fn = mocker.patch('app.service_api_client.get', return_value=initial_api_data)
- mocked_post_fn = mocker.patch('app.service_api_client.post', return_value=service_one)
-
- response = logged_in_platform_admin_client.get(
- url_for(
- 'main.service_set_inbound_api',
- service_id=service_one['id']
- )
- )
- page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
-
- assert page.find('input', {'id': 'url'}).get('value') == initial_api_data['data']['url']
- assert page.find('input', {'id': 'bearer_token'}).get('value') == dummy_bearer_token
-
- response = logged_in_platform_admin_client.post(
- url_for(
- 'main.service_set_inbound_api',
- service_id=service_one['id']
- ),
- data=inbound_api_data
- )
- assert response.status_code == 302
- assert response.location == url_for('main.service_settings', service_id=service_one['id'], _external=True)
- assert mocked_get_fn.called is True
- assert mocked_post_fn.called is True
-
- if inbound_api_data['bearer_token'] == dummy_bearer_token:
- del inbound_api_data['bearer_token']
- inbound_api_data['updated_by_id'] = service_one['users'][0]
-
- assert mocked_post_fn.call_args == call(
- "/service/{}/inbound-api/{}".format(service_one['id'], fake_uuid), inbound_api_data)
-
-
-def test_save_inbound_api_without_changes_does_not_update_inbound_api(
- logged_in_platform_admin_client,
- service_one,
- mocker,
- fake_uuid,
-):
- service_one['permissions'] = ['inbound_sms']
- service_one['inbound_api'] = [fake_uuid]
-
- initial_api_data = {'data': {'id': fake_uuid, 'url': "https://test.url.com/"}}
- inbound_api_data = {'url': initial_api_data['data']['url'], 'bearer_token': dummy_bearer_token}
-
- mocked_get_fn = mocker.patch('app.service_api_client.get', return_value=initial_api_data)
- mocked_post_fn = mocker.patch('app.service_api_client.post', return_value=service_one)
-
- response = logged_in_platform_admin_client.post(
- url_for(
- 'main.service_set_inbound_api',
- service_id=service_one['id']
- ),
- data=inbound_api_data
- )
- assert response.status_code == 302
- assert response.location == url_for('main.service_settings', service_id=service_one['id'], _external=True)
- assert mocked_get_fn.called is True
- assert mocked_post_fn.called is False
-
-
def test_archive_service_after_confirm(
logged_in_platform_admin_client,
service_one,
diff --git a/tests/app/main/views/test_sign_in.py b/tests/app/main/views/test_sign_in.py
index 97b1956ac..563d29751 100644
--- a/tests/app/main/views/test_sign_in.py
+++ b/tests/app/main/views/test_sign_in.py
@@ -77,6 +77,10 @@ def test_logged_in_user_redirects_to_choose_service(
assert response.location == url_for('main.choose_service', _external=True)
+@pytest.mark.parametrize('email_address, password', [
+ ('valid@example.gov.uk', 'val1dPassw0rd!'),
+ (' valid@example.gov.uk ', ' val1dPassw0rd! '),
+])
def test_process_sms_auth_sign_in_return_2fa_template(
client,
api_user_active,
@@ -84,14 +88,17 @@ def test_process_sms_auth_sign_in_return_2fa_template(
mock_get_user,
mock_get_user_by_email,
mock_verify_password,
+ email_address,
+ password,
):
response = client.post(
url_for('main.sign_in'), data={
- 'email_address': 'valid@example.gov.uk',
- 'password': 'val1dPassw0rd!'})
+ 'email_address': email_address,
+ 'password': password})
assert response.status_code == 302
assert response.location == url_for('.two_factor', _external=True)
- mock_verify_password.assert_called_with(api_user_active.id, 'val1dPassw0rd!')
+ mock_verify_password.assert_called_with(api_user_active.id, password)
+ mock_get_user_by_email.assert_called_with('valid@example.gov.uk')
def test_process_email_auth_sign_in_return_2fa_template(
@@ -163,3 +170,30 @@ def test_should_attempt_redirect_when_user_is_pending(
'password': 'val1dPassw0rd!'})
assert response.location == url_for('main.resend_email_verification', _external=True)
assert response.status_code == 302
+
+
+def test_email_address_is_treated_case_insensitively_when_signing_in_as_invited_user(
+ client,
+ mocker,
+ mock_verify_password,
+ api_user_active,
+ sample_invite,
+ mock_accept_invite,
+ mock_send_verify_code
+):
+ sample_invite['email_address'] = 'TEST@user.gov.uk'
+
+ mocker.patch('app.user_api_client.get_user_by_email_or_none', return_value=api_user_active)
+ mocker.patch('app.main.views.sign_in._get_and_verify_user', return_value=api_user_active)
+
+ with client.session_transaction() as session:
+ session['invited_user'] = sample_invite
+
+ response = client.post(
+ url_for('main.sign_in'), data={
+ 'email_address': 'test@user.gov.uk',
+ 'password': 'val1dPassw0rd!'})
+
+ assert mock_accept_invite.called
+ assert response.status_code == 302
+ assert mock_send_verify_code.called
diff --git a/tests/app/main/views/test_templates.py b/tests/app/main/views/test_templates.py
index cc3974357..eb5ae48e0 100644
--- a/tests/app/main/views/test_templates.py
+++ b/tests/app/main/views/test_templates.py
@@ -198,6 +198,53 @@ def test_should_show_sms_template_with_downgraded_unicode_characters(
assert rendered_msg in response.get_data(as_text=True)
+def test_should_let_letter_contact_block_be_edited_if_a_letter_contact_block_exists(
+ mocker,
+ mock_get_service_letter_template,
+ single_letter_contact_block,
+ client_request,
+ service_one,
+ fake_uuid,
+):
+ service_one['permissions'].append('letter')
+ mocker.patch('app.main.views.templates.get_page_count_for_letter', return_value=1)
+
+ page = client_request.get(
+ 'main.view_template',
+ service_id=SERVICE_ONE_ID,
+ template_id=fake_uuid
+ )
+
+ assert page.find('a', {'class': 'edit-template-link-letter-contact'})['href'] == url_for(
+ '.service_edit_letter_contact',
+ service_id=service_one['id'],
+ letter_contact_id='1234',
+ from_template=fake_uuid)
+
+
+def test_should_let_letter_contact_block_be_added_if_no_letter_contact_blocks_exist(
+ mocker,
+ mock_get_service_letter_template,
+ no_letter_contact_blocks,
+ client_request,
+ service_one,
+ fake_uuid,
+):
+ service_one['permissions'].append('letter')
+ mocker.patch('app.main.views.templates.get_page_count_for_letter', return_value=1)
+
+ page = client_request.get(
+ 'main.view_template',
+ service_id=SERVICE_ONE_ID,
+ template_id=fake_uuid
+ )
+
+ assert page.find('a', {'class': 'edit-template-link-letter-contact'})['href'] == url_for(
+ '.service_add_letter_contact',
+ service_id=service_one['id'],
+ from_template=fake_uuid)
+
+
def test_should_show_page_template_with_priority_select_if_platform_admin(
logged_in_platform_admin_client,
platform_admin_user,
diff --git a/tests/app/notify_client/test_invite_client.py b/tests/app/notify_client/test_invite_client.py
index 94e80863d..528c74a36 100644
--- a/tests/app/notify_client/test_invite_client.py
+++ b/tests/app/notify_client/test_invite_client.py
@@ -1,4 +1,40 @@
-from app.notify_client.invite_api_client import InviteApiClient
+from unittest.mock import ANY
+from app import invite_api_client
+
+
+def test_client_creates_invite(
+ app_,
+ mocker,
+ fake_uuid,
+ sample_invite,
+):
+
+ mocker.patch('app.notify_client.current_user')
+
+ mock_post = mocker.patch(
+ 'app.invite_api_client.post',
+ return_value={'data': dict.fromkeys({
+ 'id', 'service', 'from_user', 'email_address',
+ 'permissions', 'status', 'created_at', 'auth_type'
+ })}
+ )
+
+ invite_api_client.create_invite(
+ '12345', '67890', 'test@example.com', 'send_messages', 'sms_auth'
+ )
+
+ mock_post.assert_called_once_with(
+ url='/service/{}/invite'.format('67890'),
+ data={
+ 'auth_type': 'sms_auth',
+ 'email_address': 'test@example.com',
+ 'from_user': '12345',
+ 'service': '67890',
+ 'created_by': ANY,
+ 'permissions': 'send_messages',
+ 'invite_link_host': 'http://localhost:6012',
+ }
+ )
def test_client_returns_invite(mocker, sample_invite):
@@ -10,10 +46,9 @@ def test_client_returns_invite(mocker, sample_invite):
expected_url = '/service/{}/invite'.format(service_id)
- client = InviteApiClient()
mock_get = mocker.patch('app.notify_client.invite_api_client.InviteApiClient.get', return_value=expected_data)
- invites = client.get_invites_for_service(service_id)
+ invites = invite_api_client.get_invites_for_service(service_id)
mock_get.assert_called_once_with(expected_url)
assert len(invites) == 1
diff --git a/tests/conftest.py b/tests/conftest.py
index 004e87052..3e9c5c466 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -2155,7 +2155,14 @@ def mock_get_billable_units(mocker):
'rate': 0.0165,
'billing_units': 100
},
-
+ {
+ 'month': 'February',
+ 'international': False,
+ 'rate_multiplier': 1,
+ 'notification_type': 'letter',
+ 'rate': 0.31,
+ 'billing_units': 10
+ }
]
return mocker.patch(
@@ -2497,3 +2504,65 @@ def valid_token(app_, fake_uuid):
app_.config['SECRET_KEY'],
app_.config['DANGEROUS_SALT']
)
+
+
+@pytest.fixture(scope='function')
+def mock_get_valid_service_inbound_api(mocker):
+ def _get(service_id, inbound_api_id):
+ return {
+ 'created_at': '2017-12-04T10:52:55.289026Z',
+ 'updated_by_id': fake_uuid,
+ 'id': inbound_api_id,
+ 'url': 'https://hello3.gov.uk',
+ 'service_id': service_id,
+ 'updated_at': '2017-12-04T11:28:42.575153Z'
+ }
+
+ return mocker.patch('app.service_api_client.get_service_inbound_api', side_effect=_get)
+
+
+@pytest.fixture(scope='function')
+def mock_get_valid_service_callback_api(mocker):
+ def _get(service_id, callback_api_id):
+ return {
+ 'created_at': '2017-12-04T10:52:55.289026Z',
+ 'updated_by_id': fake_uuid,
+ 'id': callback_api_id,
+ 'url': 'https://hello2.gov.uk',
+ 'service_id': service_id,
+ 'updated_at': '2017-12-04T11:28:42.575153Z'
+ }
+
+ return mocker.patch('app.service_api_client.get_service_callback_api', side_effect=_get)
+
+
+@pytest.fixture(scope='function')
+def mock_create_service_inbound_api(mocker):
+ def _create_service_inbound_api(service_id, url, bearer_token, user_id):
+ return
+
+ return mocker.patch('app.service_api_client.create_service_inbound_api', side_effect=_create_service_inbound_api)
+
+
+@pytest.fixture(scope='function')
+def mock_update_service_inbound_api(mocker):
+ def _update_service_inbound_api(service_id, url, bearer_token, user_id, inbound_api_id):
+ return
+
+ return mocker.patch('app.service_api_client.update_service_inbound_api', side_effect=_update_service_inbound_api)
+
+
+@pytest.fixture(scope='function')
+def mock_create_service_callback_api(mocker):
+ def _create_service_callback_api(service_id, url, bearer_token, user_id):
+ return
+
+ return mocker.patch('app.service_api_client.create_service_callback_api', side_effect=_create_service_callback_api)
+
+
+@pytest.fixture(scope='function')
+def mock_update_service_callback_api(mocker):
+ def _update_service_callback_api(service_id, url, bearer_token, user_id, callback_api_id):
+ return
+
+ return mocker.patch('app.service_api_client.update_service_callback_api', side_effect=_update_service_callback_api)
|