darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-24 08:16:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove MOU bucket, for now

Browse Source
This commit is contained in:
Ryan Ahearn
2022-09-20 13:59:21 -04:00
parent b823c2d04f
commit 7ce9f8cfcb
9 changed files with 28 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/app/main/views/organisations/test_organisations.py
View File

@@ -1669,7 +1669,7 @@ def test_organisation_billing_page_when_the_agreement_is_signed_by_a_known_perso
assert '2.5 of the US Notify data sharing and financial agreement on 20 February 2020' in normalize_spaces(
page.text)
assert f'{expected_signatory} signed' in page.text
assert page.select_one('main a')['href'] == url_for('.organisation_download_agreement', org_id=ORGANISATION_ID)
# assert page.select_one('main a')['href'] == url_for('.organisation_download_agreement', org_id=ORGANISATION_ID)
def test_organisation_billing_page_when_the_agreement_is_signed_by_an_unknown_person(
@@ -1690,7 +1690,7 @@ def test_organisation_billing_page_when_the_agreement_is_signed_by_an_unknown_pe
assert page.h1.string == 'Billing'
assert (f'{organisation_one["name"]} has accepted the US Notify data '
'sharing and financial agreement.') in page.text
assert page.select_one('main a')['href'] == url_for('.organisation_download_agreement', org_id=ORGANISATION_ID)
# assert page.select_one('main a')['href'] == url_for('.organisation_download_agreement', org_id=ORGANISATION_ID)
@pytest.mark.parametrize('agreement_signed, expected_content', [
@@ -1719,14 +1719,14 @@ def test_organisation_billing_page_when_the_agreement_is_not_signed(
@pytest.mark.parametrize('crown, expected_status, expected_file_fetched, expected_file_served', (
(
True, 200, 'crown.pdf',
'US Notify data sharing and financial agreement.pdf',
),
(
False, 200, 'non-crown.pdf',
'US Notify data sharing and financial agreement (non-crown).pdf',
),
# (
# True, 200, 'crown.pdf',
# 'US Notify data sharing and financial agreement.pdf',
# ),
# (
# False, 200, 'non-crown.pdf',
# 'US Notify data sharing and financial agreement (non-crown).pdf',
# ),
(
None, 404, None,
None,

35
tests/app/main/views/test_agreement.py
View File

@@ -23,21 +23,12 @@ class MockS3Object():
(
True, True,
partial(url_for, 'main.request_to_go_live', service_id=SERVICE_ONE_ID),
[
(
['govuk-link', 'govuk-link--no-visited-state'],
partial(url_for, 'main.service_download_agreement', service_id=SERVICE_ONE_ID),
),
]
[]
),
(
False, False,
partial(url_for, 'main.request_to_go_live', service_id=SERVICE_ONE_ID),
[
(
['govuk-link', 'govuk-link--no-visited-state'],
partial(url_for, 'main.service_download_agreement', service_id=SERVICE_ONE_ID),
),
(
['govuk-button'],
partial(url_for, 'main.service_accept_agreement', service_id=SERVICE_ONE_ID),
@@ -48,10 +39,6 @@ class MockS3Object():
False, True,
partial(url_for, 'main.request_to_go_live', service_id=SERVICE_ONE_ID),
[
(
['govuk-link', 'govuk-link--no-visited-state'],
partial(url_for, 'main.service_download_agreement', service_id=SERVICE_ONE_ID),
),
(
['govuk-button'],
partial(url_for, 'main.service_accept_agreement', service_id=SERVICE_ONE_ID),
@@ -126,14 +113,14 @@ def test_unknown_gps_and_trusts_are_redirected(
@pytest.mark.parametrize('crown, expected_status, expected_file_fetched, expected_file_served', (
(
True, 200, 'crown.pdf',
'US Notify data sharing and financial agreement.pdf',
),
(
False, 200, 'non-crown.pdf',
'US Notify data sharing and financial agreement (non-crown).pdf',
),
# (
# True, 200, 'crown.pdf',
# 'US Notify data sharing and financial agreement.pdf',
# ),
# (
# False, 200, 'non-crown.pdf',
# 'US Notify data sharing and financial agreement (non-crown).pdf',
# ),
(
None, 404, None,
None,
@@ -490,8 +477,8 @@ def test_confirm_agreement_page_persists(
'main.public_download_agreement',
))
@pytest.mark.parametrize('variant, expected_status', (
('crown', 200),
('non-crown', 200),
# ('crown', 200),
# ('non-crown', 200),
('foo', 404),
))
def test_show_public_agreement_page(