darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-23 15:57:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updated support logic to represent new urls structure

Browse Source
This commit is contained in:
chrisw
2017-11-28 11:59:11 +00:00
parent e67ee2b579
commit 6b98e62f4c
3 changed files with 82 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/main/forms.py
View File

@@ -446,8 +446,8 @@ class SupportType(Form):
support_type = RadioField( support_type = RadioField(
'How can we help you?', 'How can we help you?',
choices=[ choices=[
('problem', 'Report a problem'), ('report-problem', 'Report a problem'),
('question', 'Ask a question or give feedback'), ('ask-question-give-feedback', 'Ask a question or give feedback'),
], ],
validators=[DataRequired()] validators=[DataRequired()]
) )

35
app/main/views/feedback.py
View File

@@ -7,6 +7,9 @@ from app.main import main
from app.main.forms import SupportType, Feedback, Problem, Triage from app.main.forms import SupportType, Feedback, Problem, Triage
from datetime import datetime from datetime import datetime
QUESTION_TICKET_TYPE = 'ask-question-give-feedback'
PROBLEM_TICKET_TYPE = "report-problem"
@main.route('/feedback', methods=['GET']) @main.route('/feedback', methods=['GET'])
def old_feedback(): def old_feedback():
@@ -30,7 +33,7 @@ def triage():
if form.validate_on_submit(): if form.validate_on_submit():
return redirect(url_for( return redirect(url_for(
'.feedback', '.feedback',
ticket_type='problem', ticket_type=PROBLEM_TICKET_TYPE,
severe=form.severe.data severe=form.severe.data
)) ))
return render_template( return render_template(
@@ -39,13 +42,27 @@ def triage():
) )
@main.route('/support/submit/<ticket_type>', methods=['GET', 'POST']) @main.route('/support/submit/<ticket_type>')
def feedback(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: try:
form = { form = {
'question': Feedback, QUESTION_TICKET_TYPE: Feedback,
'problem': Problem, PROBLEM_TICKET_TYPE: Problem,
}[ticket_type]() }[ticket_type]()
except KeyError: except KeyError:
abort(404) abort(404)
@@ -60,7 +77,7 @@ def feedback(ticket_type):
urgent = ( urgent = (
in_business_hours() or in_business_hours() or
(ticket_type == 'problem' and severe) (ticket_type == PROBLEM_TICKET_TYPE and severe)
) )
anonymous = ( anonymous = (
@@ -135,7 +152,7 @@ def feedback(ticket_type):
def bat_phone(): def bat_phone():
if current_user.is_authenticated: if current_user.is_authenticated:
return redirect(url_for('main.feedback', ticket_type='problem')) return redirect(url_for('main.feedback', ticket_type=PROBLEM_TICKET_TYPE))
return render_template('views/support/bat-phone.html') return render_template('views/support/bat-phone.html')
@@ -205,7 +222,7 @@ def has_live_services(user_id):
def needs_triage(ticket_type, severe): def needs_triage(ticket_type, severe):
return all(( return all((
ticket_type == 'problem', ticket_type == PROBLEM_TICKET_TYPE,
severe is None, severe is None,
( (
not current_user.is_authenticated or has_live_services(current_user.id) not current_user.is_authenticated or has_live_services(current_user.id)
@@ -216,7 +233,7 @@ def needs_triage(ticket_type, severe):
def needs_escalation(ticket_type, severe): def needs_escalation(ticket_type, severe):
return all(( return all((
ticket_type == 'problem', ticket_type == PROBLEM_TICKET_TYPE,
severe, severe,
not current_user.is_authenticated, not current_user.is_authenticated,
not in_business_hours(), not in_business_hours(),

83
tests/app/main/views/test_feedback.py
View File

@@ -10,7 +10,7 @@ from tests.conftest import (
mock_get_services_with_no_services, mock_get_services_with_no_services,
mock_get_services_with_one_service mock_get_services_with_one_service
) )
from app.main.views.feedback import has_live_services, in_business_hours from app.main.views.feedback import has_live_services, in_business_hours, PROBLEM_TICKET_TYPE, QUESTION_TICKET_TYPE
def no_redirect(): def no_redirect():
@@ -33,8 +33,8 @@ def test_get_support_index_page(
@freeze_time('2016-12-12 12:00:00.000000') @freeze_time('2016-12-12 12:00:00.000000')
@pytest.mark.parametrize('support_type, expected_h1', [ @pytest.mark.parametrize('support_type, expected_h1', [
('problem', 'Report a problem'), (PROBLEM_TICKET_TYPE, 'Report a problem'),
('question', 'Ask a question or give feedback'), (QUESTION_TICKET_TYPE, 'Ask a question or give feedback'),
]) ])
@pytest.mark.parametrize('logged_in, expected_form_field, expected_contact_details', [ @pytest.mark.parametrize('logged_in, expected_form_field, expected_contact_details', [
(True, type(None), 'We’ll reply to test@user.gov.uk'), (True, type(None), 'We’ll reply to test@user.gov.uk'),
@@ -68,8 +68,8 @@ def test_choose_support_type(
@freeze_time('2016-12-12 12:00:00.000000') @freeze_time('2016-12-12 12:00:00.000000')
@pytest.mark.parametrize('ticket_type, expected_status_code', [ @pytest.mark.parametrize('ticket_type, expected_status_code', [
('problem', 200), (PROBLEM_TICKET_TYPE, 200),
('question', 200), (QUESTION_TICKET_TYPE, 200),
('gripe', 404) ('gripe', 404)
]) ])
def test_get_feedback_page(client, ticket_type, expected_status_code): def test_get_feedback_page(client, ticket_type, expected_status_code):
@@ -78,7 +78,7 @@ def test_get_feedback_page(client, ticket_type, expected_status_code):
@freeze_time('2016-12-12 12:00:00.000000') @freeze_time('2016-12-12 12:00:00.000000')
@pytest.mark.parametrize('ticket_type', ['problem', 'question']) @pytest.mark.parametrize('ticket_type', [PROBLEM_TICKET_TYPE, QUESTION_TICKET_TYPE])
def test_passed_non_logged_in_user_details_through_flow(client, mocker, ticket_type): def test_passed_non_logged_in_user_details_through_flow(client, mocker, ticket_type):
mock_post = mocker.patch( mock_post = mocker.patch(
'app.main.views.feedback.requests.post', 'app.main.views.feedback.requests.post',
@@ -115,7 +115,7 @@ def test_passed_non_logged_in_user_details_through_flow(client, mocker, ticket_t
{'feedback': 'blah'}, {'feedback': 'blah'},
{'feedback': 'blah', 'name': 'Ignored', 'email_address': 'ignored@email.com'} {'feedback': 'blah', 'name': 'Ignored', 'email_address': 'ignored@email.com'}
]) ])
@pytest.mark.parametrize('ticket_type', ['problem', 'question']) @pytest.mark.parametrize('ticket_type', [PROBLEM_TICKET_TYPE, QUESTION_TICKET_TYPE])
def test_passes_user_details_through_flow( def test_passes_user_details_through_flow(
logged_in_client, logged_in_client,
mocker, mocker,
@@ -166,8 +166,8 @@ def test_passes_user_details_through_flow(
{'feedback': 'blah'}, {'feedback': 'blah'},
]) ])
@pytest.mark.parametrize('ticket_type, expected_response, things_expected_in_url, expected_error', [ @pytest.mark.parametrize('ticket_type, expected_response, things_expected_in_url, expected_error', [
('problem', 200, [], element.Tag), (PROBLEM_TICKET_TYPE, 200, [], element.Tag),
('question', 302, ['thanks', 'anonymous=True', 'urgent=True'], type(None)), (QUESTION_TICKET_TYPE, 302, ['thanks', 'anonymous=True', 'urgent=True'], type(None)),
]) ])
def test_email_address_required_for_problems( def test_email_address_required_for_problems(
client, client,
@@ -197,18 +197,18 @@ def test_email_address_required_for_problems(
@pytest.mark.parametrize('ticket_type, severe, is_in_business_hours, numeric_urgency, is_urgent', [ @pytest.mark.parametrize('ticket_type, severe, is_in_business_hours, numeric_urgency, is_urgent', [
# business hours, always urgent # business hours, always urgent
('problem', 'yes', True, 10, True), (PROBLEM_TICKET_TYPE, 'yes', True, 10, True),
('question', 'yes', True, 10, True), (QUESTION_TICKET_TYPE, 'yes', True, 10, True),
('problem', 'no', True, 10, True), (PROBLEM_TICKET_TYPE, 'no', True, 10, True),
('question', 'no', True, 10, True), (QUESTION_TICKET_TYPE, 'no', True, 10, True),
# out of hours, non emergency, never urgent # out of hours, non emergency, never urgent
('problem', 'no', False, 1, False), (PROBLEM_TICKET_TYPE, 'no', False, 1, False),
('question', 'no', False, 1, False), (QUESTION_TICKET_TYPE, 'no', False, 1, False),
# out of hours, emergency problems are urgent # out of hours, emergency problems are urgent
('problem', 'yes', False, 10, True), (PROBLEM_TICKET_TYPE, 'yes', False, 10, True),
('question', 'yes', False, 1, False), (QUESTION_TICKET_TYPE, 'yes', False, 1, False),
]) ])
def test_urgency( def test_urgency(
@@ -233,23 +233,23 @@ def test_urgency(
ids, params = zip(*[ ids, params = zip(*[
('non-logged in users always have to triage', ( ('non-logged in users always have to triage', (
'problem', False, False, True, PROBLEM_TICKET_TYPE, False, False, True,
302, partial(url_for, 'main.triage') 302, partial(url_for, 'main.triage')
)), )),
('trial services are never high priority', ( ('trial services are never high priority', (
'problem', False, True, False, PROBLEM_TICKET_TYPE, False, True, False,
200, no_redirect() 200, no_redirect()
)), )),
('we can triage in hours', ( ('we can triage in hours', (
'problem', True, True, True, PROBLEM_TICKET_TYPE, True, True, True,
200, no_redirect() 200, no_redirect()
)), )),
('only problems are high priority', ( ('only problems are high priority', (
'question', False, True, True, QUESTION_TICKET_TYPE, False, True, True,
200, no_redirect() 200, no_redirect()
)), )),
('should triage out of hours', ( ('should triage out of hours', (
'problem', False, True, True, PROBLEM_TICKET_TYPE, False, True, True,
302, partial(url_for, 'main.triage') 302, partial(url_for, 'main.triage')
)) ))
]) ])
@@ -293,7 +293,7 @@ def test_doesnt_lose_message_if_post_across_closing(
mocker.patch('app.main.views.feedback.in_business_hours', return_value=False) mocker.patch('app.main.views.feedback.in_business_hours', return_value=False)
response = logged_in_client.post( response = logged_in_client.post(
url_for('main.feedback', ticket_type='problem'), url_for('main.feedback', ticket_type=PROBLEM_TICKET_TYPE),
data={'feedback': 'foo'}, data={'feedback': 'foo'},
) )
with logged_in_client.session_transaction() as session: with logged_in_client.session_transaction() as session:
@@ -302,7 +302,7 @@ def test_doesnt_lose_message_if_post_across_closing(
assert response.location == url_for('.triage', _external=True) assert response.location == url_for('.triage', _external=True)
response = logged_in_client.get( response = logged_in_client.get(
url_for('main.feedback', ticket_type='problem', severe='yes') url_for('main.feedback', ticket_type=PROBLEM_TICKET_TYPE, severe='yes')
) )
assert response.status_code == 200 assert response.status_code == 200
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser') page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
@@ -357,7 +357,7 @@ def test_triage_redirects_to_correct_url(client, choice, expected_redirect_param
assert response.status_code == 302 assert response.status_code == 302
assert response.location == url_for( assert response.location == url_for(
'main.feedback', 'main.feedback',
ticket_type='problem', ticket_type=PROBLEM_TICKET_TYPE,
severe=expected_redirect_param, severe=expected_redirect_param,
_external=True, _external=True,
) )
@@ -424,7 +424,7 @@ def test_should_be_shown_the_bat_email(
mocker.patch('app.main.views.feedback.in_business_hours', return_value=is_in_business_hours) mocker.patch('app.main.views.feedback.in_business_hours', return_value=is_in_business_hours)
feedback_page = url_for('main.feedback', ticket_type='problem', severe=severe) feedback_page = url_for('main.feedback', ticket_type=PROBLEM_TICKET_TYPE, severe=severe)
response = client.get(feedback_page) response = client.get(feedback_page)
@@ -451,7 +451,7 @@ def test_bat_email_page(
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser') page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
assert page.select('main a')[1].text == 'Fill in this form' assert page.select('main a')[1].text == 'Fill in this form'
assert page.select('main a')[1]['href'] == url_for('main.feedback', ticket_type='problem', severe='no') assert page.select('main a')[1]['href'] == url_for('main.feedback', ticket_type=PROBLEM_TICKET_TYPE, severe='no')
next_page_response = client.get(page.select('main a')[1]['href']) next_page_response = client.get(page.select('main a')[1]['href'])
next_page = BeautifulSoup(next_page_response.data.decode('utf-8'), 'html.parser') next_page = BeautifulSoup(next_page_response.data.decode('utf-8'), 'html.parser')
assert next_page.h1.text.strip() == 'Report a problem' assert next_page.h1.text.strip() == 'Report a problem'
@@ -459,11 +459,11 @@ def test_bat_email_page(
client.login(active_user_with_permissions, mocker, service_one) client.login(active_user_with_permissions, mocker, service_one)
logged_in_response = client.get(bat_phone_page) logged_in_response = client.get(bat_phone_page)
assert logged_in_response.status_code == 302 assert logged_in_response.status_code == 302
assert logged_in_response.location == url_for('main.feedback', ticket_type='problem', _external=True) assert logged_in_response.location == url_for('main.feedback', ticket_type=PROBLEM_TICKET_TYPE, _external=True)
@freeze_time('2016-12-12 12:00:00.000000') @freeze_time('2016-12-12 12:00:00.000000')
@pytest.mark.parametrize('ticket_type', ['problem', 'question']) @pytest.mark.parametrize('ticket_type', [PROBLEM_TICKET_TYPE, QUESTION_TICKET_TYPE])
def test_log_error_on_post(app_, mocker, ticket_type): def test_log_error_on_post(app_, mocker, ticket_type):
mock_post = mocker.patch( mock_post = mocker.patch(
'app.main.views.feedback.requests.post', 'app.main.views.feedback.requests.post',
@@ -510,3 +510,28 @@ def test_thanks(
assert response.status_code == 200 assert response.status_code == 200
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser') page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
assert ' '.join(page.find('main').find('p').text.split()) == message 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,
)