blunt rename of org (#620)

tests/app/test_navigation.py

@@ -18,7 +18,7 @@ EXCLUDED_ENDPOINTS = tuple(map(Navigation.get_endpoint_with_blueprint, {
     'accessibility_statement',
     'action_blocked',
     'add_data_retention',
-    'add_organisation',
+    'add_organization',
     'add_service',
     'add_service_template',
     'api_callbacks',
@@ -66,17 +66,17 @@ EXCLUDED_ENDPOINTS = tuple(map(Navigation.get_endpoint_with_blueprint, {
     'design_content',
     'documentation',
     'download_notifications_csv',
-    'download_organisation_usage_report',
+    'download_organization_usage_report',
     'edit_and_format_messages',
     'edit_data_retention',
-    'edit_organisation_billing_details',
-    'edit_organisation_domains',
-    'edit_organisation_email_branding',
-    'edit_organisation_go_live_notes',
-    'edit_organisation_name',
-    'edit_organisation_notes',
-    'edit_organisation_type',
-    'edit_organisation_user',
+    'edit_organization_billing_details',
+    'edit_organization_domains',
+    'edit_organization_email_branding',
+    'edit_organization_go_live_notes',
+    'edit_organization_name',
+    'edit_organization_notes',
+    'edit_organization_type',
+    'edit_organization_user',
     'edit_service_billing_details',
     'edit_service_notes',
     'edit_service_template',
@@ -88,7 +88,7 @@ EXCLUDED_ENDPOINTS = tuple(map(Navigation.get_endpoint_with_blueprint, {
     'email_branding_govuk',
     'email_branding_govuk_and_org',
     'email_branding_nhs',
-    'email_branding_organisation',
+    'email_branding_organization',
     'email_branding_request',
     'email_branding_something_else',
     'email_not_received',
@@ -125,7 +125,7 @@ EXCLUDED_ENDPOINTS = tuple(map(Navigation.get_endpoint_with_blueprint, {
     'integration_testing',
     'invite_org_user',
     'invite_user',
-    'link_service_to_organisation',
+    'link_service_to_organization',
     'live_services',
     'live_services_csv',
     'manage_org_users',
@@ -141,12 +141,12 @@ EXCLUDED_ENDPOINTS = tuple(map(Navigation.get_endpoint_with_blueprint, {
     'old_service_dashboard',
     'old_terms',
     'old_using_notify',
-    'organisation_billing',
-    'organisation_dashboard',
-    'organisation_preview_email_branding',
-    'organisation_settings',
-    'organisation_trial_mode_services',
-    'organisations',
+    'organization_billing',
+    'organization_dashboard',
+    'organization_preview_email_branding',
+    'organization_settings',
+    'organization_trial_mode_services',
+    'organizations',
     'performance',
     'platform_admin',
     'platform_admin_list_complaints',
@@ -160,7 +160,7 @@ EXCLUDED_ENDPOINTS = tuple(map(Navigation.get_endpoint_with_blueprint, {
     'register_from_invite',
     'register_from_org_invite',
     'registration_continue',
-    'remove_user_from_organisation',
+    'remove_user_from_organization',
     'remove_user_from_service',
     'request_to_go_live',
     'resend_email_link',
@@ -397,20 +397,20 @@ def test_a_page_should_nave_selected_navigation_item(
 
 
 @pytest.mark.parametrize('endpoint, selected_nav_item', [
-    ('main.organisation_dashboard', 'Usage'),
+    ('main.organization_dashboard', 'Usage'),
     ('main.manage_org_users', 'Team members'),
 ])
 def test_a_page_should_nave_selected_org_navigation_item(
     client_request,
-    mock_get_organisation,
-    mock_get_users_for_organisation,
-    mock_get_invited_users_for_organisation,
+    mock_get_organization,
+    mock_get_users_for_organization,
+    mock_get_invited_users_for_organization,
     endpoint,
     selected_nav_item,
     mocker
 ):
     mocker.patch(
-        'app.organisations_client.get_services_and_usage', return_value={'services': {}}
+        'app.organizations_client.get_services_and_usage', return_value={'services': {}}
     )
     # page = client_request.get(endpoint, org_id=ORGANISATION_ID)
     # selected_nav_item_element = page.select_one('.usa-sidenav a.usa-current')