Merge pull request #3989 from alphagov/update-pricing-pages

Add a billing details page

tests/app/main/views/test_api_integration.py

@@ -283,7 +283,7 @@ def test_should_create_api_key_with_type_normal(
         _expected_status=200,
     )
 
-    assert page.select_one('span.api-key__key').text.strip() == (
+    assert page.select_one('span.copy-to-clipboard__value').text.strip() == (
         'some_default_key_name_12-{}-{}'.format(SERVICE_ONE_ID, fake_uuid)
     )
 

tests/app/main/views/test_index.py

@@ -100,6 +100,7 @@ def test_hiding_pages_from_search_engines(
     'guidance_index', 'branding_and_customisation',
     'create_and_send_messages', 'edit_and_format_messages',
     'send_files_by_email', 'upload_a_letter', 'who_can_use_notify',
+    'billing_details',
 ])
 def test_static_pages(
     client_request,

tests/app/main/views/test_templates.py

@@ -975,7 +975,7 @@ def test_should_show_template_id_on_template_page(
         template_id=fake_uuid,
         _test_page_title=False,
     )
-    assert fake_uuid in page.select('.api-key__key')[0].text
+    assert fake_uuid in page.select('.copy-to-clipboard__value')[0].text
 
 
 def test_should_hide_template_id_for_broadcast_templates(
@@ -990,7 +990,7 @@ def test_should_hide_template_id_for_broadcast_templates(
         template_id=fake_uuid,
         _test_page_title=False,
     )
-    assert not page.select('.api-key__key')
+    assert not page.select('.copy-to-clipboard__value')
 
 
 def test_should_show_sms_template_with_downgraded_unicode_characters(

tests/app/test_navigation.py

@@ -31,6 +31,7 @@ EXCLUDED_ENDPOINTS = tuple(map(Navigation.get_endpoint_with_blueprint, {
     'archive_user',
     'bat_phone',
     'begin_tour',
+    'billing_details',
     'branding_and_customisation',
     'branding_request',
     'broadcast',
@@ -371,7 +372,11 @@ navigation_instances = (
 )
 
 
-@pytest.mark.parametrize('navigation_instance', navigation_instances)
+@pytest.mark.parametrize(
+    'navigation_instance',
+    navigation_instances,
+    ids=(x.__class__.__name__ for x in navigation_instances)
+)
 def test_navigation_items_are_properly_defined(navigation_instance):
     for endpoint in navigation_instance.endpoints_with_navigation:
         assert (
@@ -399,7 +404,11 @@ def test_excluded_navigation_items_are_properly_defined():
         ), f'{endpoint} found more than once in EXCLUDED_ENDPOINTS'
 
 
-@pytest.mark.parametrize('navigation_instance', navigation_instances)
+@pytest.mark.parametrize(
+    'navigation_instance',
+    navigation_instances,
+    ids=(x.__class__.__name__ for x in navigation_instances)
+)
 def test_all_endpoints_are_covered(navigation_instance):
     covered_endpoints = (
         navigation_instance.endpoints_with_navigation +
@@ -411,7 +420,11 @@ def test_all_endpoints_are_covered(navigation_instance):
         assert endpoint in covered_endpoints, f'{endpoint} is not listed or excluded'
 
 
-@pytest.mark.parametrize('navigation_instance', navigation_instances)
+@pytest.mark.parametrize(
+    'navigation_instance',
+    navigation_instances,
+    ids=(x.__class__.__name__ for x in navigation_instances)
+)
 @pytest.mark.xfail(raises=KeyError)
 def test_raises_on_invalid_navigation_item(
     client_request, navigation_instance