From 198bc476bb7475efb389208012a9d9b5c56a1370 Mon Sep 17 00:00:00 2001
From: Leo Hemsted <leo.hemsted@digital.cabinet-office.gov.uk>
Date: Wed, 25 Apr 2018 11:41:38 +0100
Subject: [PATCH] remove old feedback urls

not been hit in the last couple of weeks
---
 app/main/views/feedback.py            | 20 --------------------
 tests/app/main/views/test_feedback.py | 25 -------------------------
 2 files changed, 45 deletions(-)

diff --git a/app/main/views/feedback.py b/app/main/views/feedback.py
index e7d31328d..940fb07f1 100644
--- a/app/main/views/feedback.py
+++ b/app/main/views/feedback.py
@@ -33,11 +33,6 @@ def get_prefilled_message():
     )
 
 
-@main.route('/feedback', methods=['GET'])
-def old_feedback():
-    return redirect(url_for('.support'))
-
-
 @main.route('/support', methods=['GET', 'POST'])
 def support():
     form = SupportType()
@@ -64,21 +59,6 @@ def triage():
     )
 
 
-@main.route('/support/submit/<ticket_type>')
-def old_submit_feedback(ticket_type):
-    try:
-        ticket_type = {
-            'problem': PROBLEM_TICKET_TYPE,
-            'question': QUESTION_TICKET_TYPE,
-        }[ticket_type]
-        return redirect(url_for(
-            '.feedback',
-            ticket_type=ticket_type,
-        ), 301)
-    except KeyError:
-        abort(404)
-
-
 @main.route('/support/<ticket_type>', methods=['GET', 'POST'])
 def feedback(ticket_type):
     try:
diff --git a/tests/app/main/views/test_feedback.py b/tests/app/main/views/test_feedback.py
index 94f1020ef..3338900f1 100644
--- a/tests/app/main/views/test_feedback.py
+++ b/tests/app/main/views/test_feedback.py
@@ -543,28 +543,3 @@ def test_thanks(
     assert response.status_code == 200
     page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
     assert ' '.join(page.find('main').find('p').text.split()) == message
-
-
-@pytest.mark.parametrize('view, old_ticket_type, expected_view, new_ticket_type', [
-    ('old_submit_feedback', 'problem', 'feedback', 'report-problem'),
-    ('old_submit_feedback', 'question', 'feedback', 'ask-question-give-feedback'),
-])
-def test_old_problem_and_question_urls_redirect(
-    client,
-    view,
-    old_ticket_type,
-    expected_view,
-    new_ticket_type
-):
-    response = client.get(
-        url_for(
-            'main.{}'.format(view),
-            ticket_type=old_ticket_type,
-        )
-    )
-    assert response.status_code == 301
-    assert response.location == url_for(
-        'main.{}'.format(expected_view),
-        ticket_type=new_ticket_type,
-        _external=True,
-    )