From 666e77e699f462f6ca5b71f3693cc4c1f85f302f Mon Sep 17 00:00:00 2001
From: Leo Hemsted <leo.hemsted@digital.cabinet-office.gov.uk>
Date: Thu, 15 Mar 2018 11:02:05 +0000
Subject: [PATCH] redirect (301 MOVED PERMANENTLY) from old choose endpoints

---
 app/main/views/choose_account.py                      | 11 +++++++++++
 app/templates/views/choose-account.html               |  4 ++--
 tests/app/main/views/accounts/test_choose_accounts.py |  4 ++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/main/views/choose_account.py b/app/main/views/choose_account.py
index 9e846670e..a7aa2da1f 100644
--- a/app/main/views/choose_account.py
+++ b/app/main/views/choose_account.py
@@ -1,11 +1,22 @@
 from flask import redirect, render_template, session, url_for
 from flask_login import current_user, login_required
+from werkzeug.routing import RequestRedirect
 
 from app import user_api_client
 from app.main import main
 from app.utils import is_gov_user
 
 
+@main.route("/services")
+def choose_service():
+    raise RequestRedirect(url_for('.choose_account'))
+
+
+@main.route("/services-or-dashboard")
+def services_or_dashboard():
+    raise RequestRedirect(url_for('.show_accounts_or_dashboard'))
+
+
 @main.route("/accounts")
 @login_required
 def choose_account():
diff --git a/app/templates/views/choose-account.html b/app/templates/views/choose-account.html
index df673495e..7f7d793d9 100644
--- a/app/templates/views/choose-account.html
+++ b/app/templates/views/choose-account.html
@@ -1,13 +1,13 @@
 {% extends "withoutnav_template.html" %}
 
 {% block per_page_title %}
-  Choose account
+  Choose service
 {% endblock %}
 
 {% block maincolumn_content %}
 
   <h1 class="heading-large">
-    Choose account
+    Choose service
   </h1>
   <nav class="browse-list">
     <ul>
diff --git a/tests/app/main/views/accounts/test_choose_accounts.py b/tests/app/main/views/accounts/test_choose_accounts.py
index 6dc0fc4df..a4b93e815 100644
--- a/tests/app/main/views/accounts/test_choose_accounts.py
+++ b/tests/app/main/views/accounts/test_choose_accounts.py
@@ -49,7 +49,7 @@ def test_choose_account_should_show_choose_accounts_page(
     resp = client_request.get('main.choose_account')
     page = resp.find('div', {'id': 'content'}).main
 
-    assert normalize_spaces(page.h1.text) == 'Choose account'
+    assert normalize_spaces(page.h1.text) == 'Choose service'
     outer_list_items = page.nav.ul.find_all('li', recursive=False)
 
     assert len(outer_list_items) == 6
@@ -94,7 +94,7 @@ def test_choose_account_should_show_choose_accounts_page_if_no_services(
     links = page.findAll('a')
     assert len(links) == 1
     add_service_link = links[0]
-    assert normalize_spaces(page.h1.text) == 'Choose account'
+    assert normalize_spaces(page.h1.text) == 'Choose service'
     assert normalize_spaces(add_service_link.text) == 'Add a new service…'
     assert add_service_link['href'] == url_for('main.add_service')