diff --git a/app/templates/org_nav.html b/app/templates/org_nav.html index fd3cc0c2d..a9f518e11 100644 --- a/app/templates/org_nav.html +++ b/app/templates/org_nav.html @@ -1,6 +1,6 @@ - Services + Usage Team members {% if current_user.platform_admin %} Settings diff --git a/app/templates/views/organisations/organisation/index.html b/app/templates/views/organisations/organisation/index.html index c0ae8a5cd..49b7cf452 100644 --- a/app/templates/views/organisations/organisation/index.html +++ b/app/templates/views/organisations/organisation/index.html @@ -1,18 +1,18 @@ {% extends "org_template.html" %} {% block org_page_title %} - Services + Usage {% endblock %} {% block maincolumn_content %} - Services + Usage {% for service in current_org.live_services %} - {{ service['name'] }} + {{ service['name'] }} {% endfor %} diff --git a/tests/app/main/views/organisations/test_organisation.py b/tests/app/main/views/organisations/test_organisation.py index 634182ec8..bfe84636d 100644 --- a/tests/app/main/views/organisations/test_organisation.py +++ b/tests/app/main/views/organisations/test_organisation.py @@ -72,7 +72,7 @@ def test_view_organisation_shows_the_correct_organisation( org_id=ORGANISATION_ID, ) - assert normalize_spaces(page.select_one('h1').text) == 'Services' + assert normalize_spaces(page.select_one('h1').text) == 'Usage' def test_create_new_organisation( @@ -121,8 +121,8 @@ def test_organisation_services_shows_live_services_only( assert normalize_spaces(services[0].text) == '1' assert normalize_spaces(services[1].text) == '5' - assert services[0].find('a')['href'] == url_for('main.service_dashboard', service_id=SERVICE_ONE_ID) - assert services[1].find('a')['href'] == url_for('main.service_dashboard', service_id=SERVICE_TWO_ID) + assert services[0].find('a')['href'] == url_for('main.usage', service_id=SERVICE_ONE_ID) + assert services[1].find('a')['href'] == url_for('main.usage', service_id=SERVICE_TWO_ID) def test_organisation_trial_mode_services_shows_all_non_live_services( diff --git a/tests/app/test_navigation.py b/tests/app/test_navigation.py index 167ef9fac..8cfb8c2ba 100644 --- a/tests/app/test_navigation.py +++ b/tests/app/test_navigation.py @@ -130,7 +130,7 @@ def test_a_page_should_nave_selected_header_navigation_item( @pytest.mark.parametrize('endpoint, selected_nav_item', [ - ('main.organisation_dashboard', 'Services'), + ('main.organisation_dashboard', 'Usage'), ('main.manage_org_users', 'Team members'), ]) def test_a_page_should_nave_selected_org_navigation_item(