Move feedback endpoints into own file

Doesn’t make sense to shove more stuff into index.py

app/main/__init__.py

@@ -24,5 +24,6 @@ from app.main.views import (
     manage_users,
     invites,
     all_services,
-    tour
+    tour,
+    feedback
 )

app/main/views/feedback.py

@@ -0,0 +1,42 @@
+import markdown
+import requests
+from flask import render_template, url_for, redirect, flash, current_app, abort
+from app.main import main
+from flask_login import login_required
+from app.main.forms import Feedback
+
+from flask.ext.login import current_user
+
+
+@main.route('/feedback', methods=['GET', 'POST'])
+def feedback():
+    form = Feedback()
+    if form.validate_on_submit():
+        data = {
+            'person_email': current_app.config.get('DESKPRO_PERSON_EMAIL'),
+            'department_id': current_app.config.get('DESKPRO_TEAM_ID'),
+            'subject': 'Notify feedback',
+            'message': '{}\n{}\n{}'.format(
+                form.name.data,
+                form.email_address.data,
+                form.feedback.data)
+        }
+        headers = {
+            "X-DeskPRO-API-Key": current_app.config.get('DESKPRO_API_KEY'),
+            'Content-Type': "application/x-www-form-urlencoded"
+        }
+        resp = requests.post(
+            current_app.config.get('DESKPRO_API_HOST') + '/api/tickets',
+            data=data,
+            headers=headers)
+        if resp.status_code != 201:
+            current_app.logger.error(
+                "Deskpro create ticket request failed with {} '{}'".format(
+                    resp.status_code,
+                    resp.json())
+                )
+            abort(500, "Feedback submission failed")
+        flash("Your feedback has been submitted")
+        return redirect(url_for('.feedback'))
+
+    return render_template('views/feedback.html', form=form)

app/main/views/index.py

@@ -1,11 +1,8 @@
 import markdown
 import os
-import requests
+from flask import (render_template, url_for, redirect, Markup, current_app, abort)
-import json
-from flask import (render_template, url_for, redirect, Markup, flash, current_app, abort)
 from app.main import main
 from flask_login import login_required
-from app.main.forms import Feedback
 
 from flask.ext.login import current_user
 from mdx_gfm import GithubFlavoredMarkdownExtension
@@ -44,40 +41,6 @@ def terms():
     return render_template('views/terms-of-use.html')
 
 
-@main.route('/feedback', methods=['GET', 'POST'])
-def feedback():
-    form = Feedback()
-    if form.validate_on_submit():
-        data = {
-            'person_email': current_app.config.get('DESKPRO_PERSON_EMAIL'),
-            'department_id': current_app.config.get('DESKPRO_TEAM_ID'),
-            'subject': 'Notify feedback',
-            'message': '{}\n{}\n{}'.format(
-                form.name.data,
-                form.email_address.data,
-                form.feedback.data)
-        }
-        headers = {
-            "X-DeskPRO-API-Key": current_app.config.get('DESKPRO_API_KEY'),
-            'Content-Type': "application/x-www-form-urlencoded"
-        }
-        resp = requests.post(
-            current_app.config.get('DESKPRO_API_HOST') + '/api/tickets',
-            data=data,
-            headers=headers)
-        if resp.status_code != 201:
-            current_app.logger.error(
-                "Deskpro create ticket request failed with {} '{}'".format(
-                    resp.status_code,
-                    resp.json())
-                )
-            abort(500, "Feedback submission failed")
-        flash("Your feedback has been submitted")
-        return redirect(url_for('.feedback'))
-
-    return render_template('views/feedback.html', form=form)
-
-
 @main.route('/documentation')
 def documentation():
     curr_dir = os.path.dirname(os.path.realpath(__file__))

tests/app/main/views/test_feedback.py

@@ -0,0 +1,101 @@
+import pytest
+from flask import (url_for, current_app)
+from werkzeug.exceptions import InternalServerError
+from unittest.mock import Mock, ANY
+
+
+def test_logged_in_user_redirects_to_choose_service(app_,
+                                                    api_user_active,
+                                                    mock_get_user,
+                                                    mock_get_user_by_email,
+                                                    mock_login):
+    with app_.test_request_context():
+        with app_.test_client() as client:
+            client.login(api_user_active)
+            response = client.get(url_for('main.index'))
+            assert response.status_code == 302
+
+            response = client.get(url_for('main.sign_in', follow_redirects=True))
+            assert response.location == url_for('main.choose_service', _external=True)
+
+
+def test_get_feedback_page(app_):
+    with app_.test_request_context():
+        with app_.test_client() as client:
+            resp = client.get(url_for('main.feedback'))
+            assert resp.status_code == 200
+
+
+def test_post_feedback_with_no_name_email(app_, mocker):
+    mock_post = mocker.patch(
+        'app.main.views.feedback.requests.post',
+        return_value=Mock(status_code=201))
+    with app_.test_request_context():
+        with app_.test_client() as client:
+            resp = client.post(url_for('main.feedback'), data={'feedback': "blah"})
+            assert resp.status_code == 302
+
+
+def test_post_feedback_with_no_name_email(app_, mocker):
+    mock_post = mocker.patch(
+        'app.main.views.feedback.requests.post',
+        return_value=Mock(status_code=201))
+    with app_.test_request_context():
+        with app_.test_client() as client:
+            resp = client.post(url_for('main.feedback'), data={'feedback': "blah"})
+            assert resp.status_code == 302
+            mock_post.assert_called_with(
+                ANY,
+                data={
+                    'department_id': ANY,
+                    'subject': 'Notify feedback',
+                    'message': '\n\nblah',
+                    'person_email': ANY},
+                headers=ANY)
+
+
+def test_post_feedback_with_name_email(app_, mocker):
+    mock_post = mocker.patch(
+        'app.main.views.feedback.requests.post',
+        return_value=Mock(status_code=201))
+    with app_.test_request_context():
+        with app_.test_client() as client:
+            resp = client.post(
+                url_for('main.feedback'),
+                data={'feedback': "blah", 'name': "Steve Irwin", 'email_address': 'rip@gmail.com'})
+            assert resp.status_code == 302
+            mock_post.assert_called_with(
+                ANY,
+                data={
+                    'subject': 'Notify feedback',
+                    'department_id': ANY,
+                    'message': 'Steve Irwin\nrip@gmail.com\nblah',
+                    'person_email': ANY},
+                headers=ANY)
+
+
+def test_log_error_on_post(app_, mocker):
+    mock_post = mocker.patch(
+        'app.main.views.feedback.requests.post',
+        return_value=Mock(
+            status_code=401,
+            json=lambda: {
+                'error_code': 'invalid_auth',
+                'error_message': 'Please provide a valid API key or token'}))
+    with app_.test_request_context():
+        mock_logger = mocker.patch.object(app_.logger, 'error')
+        with app_.test_client() as client:
+            with pytest.raises(InternalServerError):
+                resp = client.post(
+                    url_for('main.feedback'),
+                    data={'feedback': "blah", 'name': "Steve Irwin", 'email_address': 'rip@gmail.com'})
+            mock_post.assert_called_with(
+                ANY,
+                data={
+                    'subject': 'Notify feedback',
+                    'department_id': ANY,
+                    'message': 'Steve Irwin\nrip@gmail.com\nblah',
+                    'person_email': ANY},
+                headers=ANY)
+            mock_logger.assert_called_with(
+                "Deskpro create ticket request failed with {} '{}'".format(mock_post().status_code, mock_post().json()))

tests/app/main/views/test_index.py

@@ -1,7 +1,5 @@
 import pytest
-from flask import (url_for, current_app)
+from flask import url_for
-from werkzeug.exceptions import InternalServerError
-from unittest.mock import Mock, ANY
 
 
 def test_logged_in_user_redirects_to_choose_service(app_,
@@ -17,85 +15,3 @@ def test_logged_in_user_redirects_to_choose_service(app_,
 
             response = client.get(url_for('main.sign_in', follow_redirects=True))
             assert response.location == url_for('main.choose_service', _external=True)
-
-
-def test_get_feedback_page(app_):
-    with app_.test_request_context():
-        with app_.test_client() as client:
-            resp = client.get(url_for('main.feedback'))
-            assert resp.status_code == 200
-
-
-def test_post_feedback_with_no_name_email(app_, mocker):
-    mock_post = mocker.patch(
-        'app.main.views.index.requests.post',
-        return_value=Mock(status_code=201))
-    with app_.test_request_context():
-        with app_.test_client() as client:
-            resp = client.post(url_for('main.feedback'), data={'feedback': "blah"})
-            assert resp.status_code == 302
-
-
-def test_post_feedback_with_no_name_email(app_, mocker):
-    mock_post = mocker.patch(
-        'app.main.views.index.requests.post',
-        return_value=Mock(status_code=201))
-    with app_.test_request_context():
-        with app_.test_client() as client:
-            resp = client.post(url_for('main.feedback'), data={'feedback': "blah"})
-            assert resp.status_code == 302
-            mock_post.assert_called_with(
-                ANY,
-                data={
-                    'department_id': ANY,
-                    'subject': 'Notify feedback',
-                    'message': '\n\nblah',
-                    'person_email': ANY},
-                headers=ANY)
-
-
-def test_post_feedback_with_name_email(app_, mocker):
-    mock_post = mocker.patch(
-        'app.main.views.index.requests.post',
-        return_value=Mock(status_code=201))
-    with app_.test_request_context():
-        with app_.test_client() as client:
-            resp = client.post(
-                url_for('main.feedback'),
-                data={'feedback': "blah", 'name': "Steve Irwin", 'email_address': 'rip@gmail.com'})
-            assert resp.status_code == 302
-            mock_post.assert_called_with(
-                ANY,
-                data={
-                    'subject': 'Notify feedback',
-                    'department_id': ANY,
-                    'message': 'Steve Irwin\nrip@gmail.com\nblah',
-                    'person_email': ANY},
-                headers=ANY)
-
-
-def test_log_error_on_post(app_, mocker):
-    mock_post = mocker.patch(
-        'app.main.views.index.requests.post',
-        return_value=Mock(
-            status_code=401,
-            json=lambda: {
-                'error_code': 'invalid_auth',
-                'error_message': 'Please provide a valid API key or token'}))
-    with app_.test_request_context():
-        mock_logger = mocker.patch.object(app_.logger, 'error')
-        with app_.test_client() as client:
-            with pytest.raises(InternalServerError):
-                resp = client.post(
-                    url_for('main.feedback'),
-                    data={'feedback': "blah", 'name': "Steve Irwin", 'email_address': 'rip@gmail.com'})
-            mock_post.assert_called_with(
-                ANY,
-                data={
-                    'subject': 'Notify feedback',
-                    'department_id': ANY,
-                    'message': 'Steve Irwin\nrip@gmail.com\nblah',
-                    'person_email': ANY},
-                headers=ANY)
-            mock_logger.assert_called_with(
-                "Deskpro create ticket request failed with {} '{}'".format(mock_post().status_code, mock_post().json()))