Make people sign in to get the agreement

Currently we have a bunch of users who aren’t signed in asking us for
the agreement.

This is bad because:
- it’s slower (for them) than just being able to download it
- it creates work for us

We can’t just offer the agreement to anyone, but we can offer to it to
anyone who’s signed in because we now let people self-select which
version to download when we can’t tell which one to give them.
This commit is contained in:
Chris Hill-Scott
2018-05-08 14:28:08 +01:00
parent 947b67ee1a
commit dc6d66daba
6 changed files with 90 additions and 59 deletions

View File

@@ -88,16 +88,8 @@ def test_get_feedback_page(client, ticket_type, expected_status_code):
(
'agreement',
(
'Please send me a copy of the GOV.UK Notify data sharing '
'and financial agreement.'
)
),
(
'agreement-with-owner',
(
'Please send me a copy of the GOV.UK Notify data sharing '
'and financial agreement for Marine Management '
'Organisation to sign.'
'Please can you tell me if theres an agreement in place '
'between GOV.UK Notify and my organisation?'
)
),
(

View File

@@ -101,7 +101,25 @@ def test_terms_is_generic_if_user_is_not_logged_in(
assert normalize_spaces(page.select('main p')[1].text) == (
'Your organisation must also accept our data sharing and '
'financial agreement. Contact us to get a copy.'
'financial agreement. Sign in to download a copy or find out '
'if one is already in place.'
)
def test_pricing_is_generic_if_user_is_not_logged_in(
client
):
response = client.get(url_for('main.pricing'))
assert response.status_code == 200
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
last_paragraph = page.select('main p')[-1]
assert normalize_spaces(last_paragraph.text) == (
'Sign in to download a copy or find out if one is already '
'in place with your organisation.'
)
assert last_paragraph.select_one('a')['href'] == url_for(
'main.sign_in',
next=url_for('main.pricing', _anchor='paying'),
)
@@ -119,7 +137,7 @@ def test_terms_is_generic_if_user_is_not_logged_in(
),
None,
(
'Contact us to get a copy of the agreement '
'Download the agreement '
'(Cabinet Office has already accepted it).'
),
),
@@ -135,7 +153,7 @@ def test_terms_is_generic_if_user_is_not_logged_in(
'main.agreement',
),
(
'Contact us to get a copy of the agreement '
'Download the agreement '
'(Aylesbury Town Council hasnt accepted it yet).'
),
),
@@ -143,16 +161,16 @@ def test_terms_is_generic_if_user_is_not_logged_in(
'larry@downing-street.gov.uk',
(
'Your organisation must also accept our data sharing and '
'financial agreement. Contact us to get a copy.'
'financial agreement. Download the agreement or contact us '
'to find out if we already have one in place with your '
'organisation.'
),
partial(
url_for,
'main.feedback',
ticket_type='ask-question-give-feedback',
body='agreement-with-owner',
'main.agreement',
),
(
'Contact us to get a copy of the agreement or find out if '
'Download the agreement or contact us to find out if '
'we already have one in place with your organisation.'
),
),
@@ -167,8 +185,8 @@ def test_terms_is_generic_if_user_is_not_logged_in(
'main.agreement',
),
(
'Contact us to get a copy of the agreement (Met Office '
'hasnt accepted it yet).'
'Download the agreement (Met Office hasnt accepted it '
'yet).'
),
),
])