remove components related to MOU and agreement (#476)

Co-authored-by: Kenneth Kehl <@kkehl@flexion.us>

tests/app/main/views/organisations/test_organisations.py

@@ -1,12 +1,9 @@
-from unittest import mock
-
 import pytest
 from flask import url_for
 from freezegun import freeze_time
 from notifications_python_client.errors import HTTPError
 
 from tests import organisation_json, service_json
-from tests.app.main.views.test_agreement import MockS3Object
 from tests.conftest import (
     ORGANISATION_ID,
     SERVICE_ONE_ID,
@@ -144,7 +141,6 @@ def test_create_new_organisation(
     mock_create_organisation.assert_called_once_with(
         name='new name',
         organisation_type='federal',
-        agreement_signed=False,
     )
 
 
@@ -360,16 +356,11 @@ def test_gps_can_name_their_organisation(
         service_id=SERVICE_ONE_ID,
         _data=data,
         _expected_status=302,
-        _expected_redirect=url_for(
-            'main.service_agreement',
-            service_id=SERVICE_ONE_ID,
-        )
     )
 
     mock_create_organisation.assert_called_once_with(
         name=expected_service_name,
         organisation_type='nhs_gp',
-        agreement_signed=False,
     )
     mock_update_service_organisation.assert_called_once_with(SERVICE_ONE_ID, ORGANISATION_ID)
 
@@ -430,10 +421,6 @@ def test_nhs_local_assigns_to_selected_organisation(
             'organisations': ORGANISATION_ID,
         },
         _expected_status=302,
-        _expected_redirect=url_for(
-            'main.service_agreement',
-            service_id=SERVICE_ONE_ID,
-        )
     )
     mock_update_service_organisation.assert_called_once_with(SERVICE_ONE_ID, ORGANISATION_ID)
 
@@ -918,10 +905,6 @@ def test_organisation_settings_for_platform_admin(
         'Label Value Action',
         'Name Test organisation Change organization name',
         'Sector Federal government Change sector for the organization',
-        (
-            'Data sharing and financial agreement '
-            'Not signed Change data sharing and financial agreement for the organization'
-        ),
         'Request to go live notes None Change go live notes for the organization',
         'Billing details None Change billing details for the organization',
         'Notes None Change the notes for the organization',
@@ -950,27 +933,6 @@ def test_organisation_settings_for_platform_admin(
         ),
         'federal',
     ),
-    (
-        '.edit_organisation_agreement',
-        (
-            {
-                'value': 'yes',
-                'label': 'Yes',
-                'hint': 'Users will be told their organization has already signed the agreement'
-            },
-            {
-                'value': 'no',
-                'label': 'No',
-                'hint': 'Users will be prompted to sign the agreement before they can go live'
-            },
-            {
-                'value': 'unknown',
-                'label': 'No (but we have some service-specific agreements in place)',
-                'hint': 'Users will not be prompted to sign the agreement'
-            },
-        ),
-        'no',
-    ),
 ))
 @pytest.mark.parametrize('user', (
     pytest.param(
@@ -1024,21 +986,6 @@ def test_view_organisation_settings(
         {'organisation_type': 'state'},
         {'cached_service_ids': [], 'organisation_type': 'state'},
     ),
-    (
-        '.edit_organisation_agreement',
-        {'agreement_signed': 'yes'},
-        {'agreement_signed': True},
-    ),
-    (
-        '.edit_organisation_agreement',
-        {'agreement_signed': 'no'},
-        {'agreement_signed': False},
-    ),
-    (
-        '.edit_organisation_agreement',
-        {'agreement_signed': 'unknown'},
-        {'agreement_signed': None},
-    ),
 ))
 @pytest.mark.parametrize('user', (
     pytest.param(
@@ -1582,137 +1529,3 @@ def test_organisation_billing_page_not_accessible_if_not_platform_admin(
         org_id=ORGANISATION_ID,
         _expected_status=403
     )
-
-
-@pytest.mark.parametrize('signed_by_id, signed_by_name, expected_signatory', [
-    ('1234', None, 'Test User'),
-    (None, 'The Org Manager', 'The Org Manager'),
-    ('1234', 'The Org Manager', 'The Org Manager'),
-])
-def test_organisation_billing_page_when_the_agreement_is_signed_by_a_known_person(
-    organisation_one,
-    client_request,
-    api_user_active,
-    mocker,
-    platform_admin_user,
-    signed_by_id,
-    signed_by_name,
-    expected_signatory,
-):
-    api_user_active['id'] = '1234'
-
-    organisation_one['agreement_signed'] = True
-    organisation_one['agreement_signed_version'] = 2.5
-    organisation_one['agreement_signed_by_id'] = signed_by_id
-    organisation_one['agreement_signed_on_behalf_of_name'] = signed_by_name
-    organisation_one['agreement_signed_at'] = 'Thu, 20 Feb 2020 06:00:00 GMT'
-
-    mocker.patch('app.organisations_client.get_organisation', return_value=organisation_one)
-
-    client_request.login(platform_admin_user)
-
-    mocker.patch('app.user_api_client.get_user', side_effect=[api_user_active])
-
-    page = client_request.get(
-        '.organisation_billing',
-        org_id=ORGANISATION_ID,
-    )
-
-    assert page.h1.string == 'Billing'
-    assert '2.5 of the U.S. 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)
-
-
-def test_organisation_billing_page_when_the_agreement_is_signed_by_an_unknown_person(
-    organisation_one,
-    client_request,
-    platform_admin_user,
-    mocker,
-):
-    organisation_one['agreement_signed'] = True
-    mocker.patch('app.organisations_client.get_organisation', return_value=organisation_one)
-
-    client_request.login(platform_admin_user)
-    page = client_request.get(
-        '.organisation_billing',
-        org_id=ORGANISATION_ID,
-    )
-
-    assert page.h1.string == 'Billing'
-    assert (f'{organisation_one["name"]} has accepted the U.S. 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)
-
-
-@pytest.mark.parametrize('agreement_signed, expected_content', [
-    (False, 'needs to accept'),
-    (None, 'has not accepted'),
-])
-def test_organisation_billing_page_when_the_agreement_is_not_signed(
-    organisation_one,
-    client_request,
-    platform_admin_user,
-    mocker,
-    agreement_signed,
-    expected_content,
-):
-    organisation_one['agreement_signed'] = agreement_signed
-    mocker.patch('app.organisations_client.get_organisation', return_value=organisation_one)
-
-    client_request.login(platform_admin_user)
-    page = client_request.get(
-        '.organisation_billing',
-        org_id=ORGANISATION_ID,
-    )
-
-    assert page.h1.string == 'Billing'
-    assert f'{organisation_one["name"]} {expected_content}' in page.text
-
-
-@pytest.mark.parametrize('expected_status, expected_file_fetched, expected_file_served', (
-    (
-        200, 'agreement.pdf',
-        'U.S. Notify data sharing and financial agreement.pdf',
-    ),
-))
-@mock.patch('app.s3_client.s3_mou_client.current_app')
-def test_download_organisation_agreement(
-    mock_flask_current_app,
-    client_request,
-    platform_admin_user,
-    mocker,
-    expected_status,
-    expected_file_fetched,
-    expected_file_served,
-):
-    mock_flask_current_app.config['MOU_BUCKET_NAME'] = 'test-mou'
-    mocker.patch(
-        'app.models.organisation.organisations_client.get_organisation',
-        return_value=organisation_json(
-        )
-    )
-    mock_get_s3_object = mocker.patch(
-        'app.s3_client.s3_mou_client.get_s3_object',
-        return_value=MockS3Object(b'foo')
-    )
-
-    client_request.login(platform_admin_user)
-    response = client_request.get_response(
-        'main.organisation_download_agreement',
-        org_id=ORGANISATION_ID,
-        _expected_status=expected_status,
-    )
-
-    if expected_file_served:
-        assert response.get_data() == b'foo'
-        assert response.headers['Content-Type'] == 'application/pdf'
-        assert response.headers['Content-Disposition'] == (
-            f'attachment; filename="{expected_file_served}"'
-        )
-        # mock_get_s3_object.assert_called_once_with('test-mou', expected_file_fetched)
-        mock_get_s3_object.assert_called_once()
-    else:
-        assert not expected_file_fetched
-        assert mock_get_s3_object.called is False