send zendesk rather than deskpro tickets

tests/app/main/views/test_feedback.py

@@ -5,13 +5,7 @@ import pytest
 from bs4 import BeautifulSoup, element
 from flask import url_for
 from freezegun import freeze_time
-from notifications_utils.clients import DeskproError
-from tests.conftest import (
-    active_user_with_permissions,
-    mock_get_services,
-    mock_get_services_with_no_services,
-    mock_get_services_with_one_service,
-)
+from notifications_utils.clients.zendesk.zendesk_client import ZendeskError
 from werkzeug.exceptions import InternalServerError
 
 from app.main.views.feedback import (
@@ -20,6 +14,12 @@ from app.main.views.feedback import (
     has_live_services,
     in_business_hours,
 )
+from tests.conftest import (
+    active_user_with_permissions,
+    mock_get_services,
+    mock_get_services_with_no_services,
+    mock_get_services_with_one_service,
+)
 
 
 def no_redirect():
@@ -118,7 +118,7 @@ def test_get_feedback_page_with_prefilled_body(
     user = active_user_with_permissions(fake_uuid)
     user.email_address = 'test@marinemanagement.org.uk'
     mocker.patch('app.user_api_client.get_user', return_value=user)
-    mock_post = mocker.patch('app.main.views.feedback.deskpro_client.create_ticket')
+    mock_post = mocker.patch('app.main.views.feedback.zendesk_client.create_ticket')
     page = client_request.get(
         'main.feedback',
         ticket_type=QUESTION_TICKET_TYPE,
@@ -141,7 +141,7 @@ def test_get_feedback_page_with_prefilled_body(
 @freeze_time('2016-12-12 12:00:00.000000')
 @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):
-    mock_post = mocker.patch('app.main.views.feedback.deskpro_client.create_ticket')
+    mock_post = mocker.patch('app.main.views.feedback.zendesk_client.create_ticket')
 
     data = {'feedback': 'blah', 'name': 'Steve Irwin', 'email_address': 'rip@gmail.com'}
 
@@ -158,7 +158,7 @@ def test_passed_non_logged_in_user_details_through_flow(client, mocker, ticket_t
         user_email='rip@gmail.com',
         user_name='Steve Irwin',
         ticket_type=ticket_type,
-        urgency=ANY,
+        p1=ANY
     )
 
 
@@ -174,7 +174,7 @@ def test_passes_user_details_through_flow(
     ticket_type,
     data
 ):
-    mock_post = mocker.patch('app.main.views.feedback.deskpro_client.create_ticket')
+    mock_post = mocker.patch('app.main.views.feedback.zendesk_client.create_ticket')
 
     resp = logged_in_client.post(
         url_for('main.feedback', ticket_type=ticket_type),
@@ -189,7 +189,7 @@ def test_passes_user_details_through_flow(
         user_email='test@user.gov.uk',
         user_name='Test User',
         ticket_type=ticket_type,
-        urgency=ANY,
+        p1=ANY
     )
     assert mock_post.call_args[1]['message'] == '\n'.join([
         'Environment: http://localhost/',
@@ -221,7 +221,7 @@ def test_email_address_required_for_problems(
     things_expected_in_url,
     expected_error
 ):
-    mocker.patch('app.main.views.feedback.deskpro_client')
+    mocker.patch('app.main.views.feedback.zendesk_client')
     response = client.post(
         url_for('main.feedback', ticket_type=ticket_type),
         data=data,
@@ -234,21 +234,21 @@ def test_email_address_required_for_problems(
     assert isinstance(page.find('span', {'class': 'error-message'}), expected_error)
 
 
-@pytest.mark.parametrize('ticket_type, severe, is_in_business_hours, numeric_urgency, is_urgent', [
+@pytest.mark.parametrize('ticket_type, severe, is_in_business_hours, is_p1', [
 
     # business hours, always urgent
-    (PROBLEM_TICKET_TYPE, 'yes', True, 10, True),
-    (QUESTION_TICKET_TYPE, 'yes', True, 10, True),
-    (PROBLEM_TICKET_TYPE, 'no', True, 10, True),
-    (QUESTION_TICKET_TYPE, 'no', True, 10, True),
+    (PROBLEM_TICKET_TYPE, 'yes', True, True),
+    (QUESTION_TICKET_TYPE, 'yes', True, True),
+    (PROBLEM_TICKET_TYPE, 'no', True, True),
+    (QUESTION_TICKET_TYPE, 'no', True, True),
 
     # out of hours, non emergency, never urgent
-    (PROBLEM_TICKET_TYPE, 'no', False, 1, False),
-    (QUESTION_TICKET_TYPE, 'no', False, 1, False),
+    (PROBLEM_TICKET_TYPE, 'no', False, False),
+    (QUESTION_TICKET_TYPE, 'no', False, False),
 
     # out of hours, emergency problems are urgent
-    (PROBLEM_TICKET_TYPE, 'yes', False, 10, True),
-    (QUESTION_TICKET_TYPE, 'yes', False, 1, False),
+    (PROBLEM_TICKET_TYPE, 'yes', False, True),
+    (QUESTION_TICKET_TYPE, 'yes', False, False),
 
 ])
 def test_urgency(
@@ -257,18 +257,17 @@ def test_urgency(
     ticket_type,
     severe,
     is_in_business_hours,
-    numeric_urgency,
-    is_urgent,
+    is_p1,
 ):
     mocker.patch('app.main.views.feedback.in_business_hours', return_value=is_in_business_hours)
-    mock_post = mocker.patch('app.main.views.feedback.deskpro_client.create_ticket')
+    mock_post = mocker.patch('app.main.views.feedback.zendesk_client.create_ticket')
     response = logged_in_client.post(
         url_for('main.feedback', ticket_type=ticket_type, severe=severe),
         data={'feedback': 'blah', 'email_address': 'test@example.com'},
     )
     assert response.status_code == 302
-    assert response.location == url_for('main.thanks', urgent=is_urgent, anonymous=False, _external=True)
-    assert mock_post.call_args[1]['urgency'] == numeric_urgency
+    assert response.location == url_for('main.thanks', urgent=is_p1, anonymous=False, _external=True)
+    assert mock_post.call_args[1]['p1'] == is_p1
 
 
 ids, params = zip(*[
@@ -506,8 +505,8 @@ def test_bat_email_page(
 @pytest.mark.parametrize('ticket_type', [PROBLEM_TICKET_TYPE, QUESTION_TICKET_TYPE])
 def test_log_error_on_post(app_, mocker, ticket_type):
     mock_post = mocker.patch(
-        'app.main.views.feedback.deskpro_client.create_ticket',
-        side_effect=DeskproError
+        'app.main.views.feedback.zendesk_client.create_ticket',
+        side_effect=ZendeskError(None)
     )
     with app_.test_request_context():
         with app_.test_client() as client:

tests/app/main/views/test_service_settings.py

@@ -561,7 +561,7 @@ def test_should_redirect_after_request_to_go_live(
     single_sms_sender,
     mock_get_service_settings_page_common
 ):
-    mock_post = mocker.patch('app.main.views.service_settings.deskpro_client.create_ticket')
+    mock_post = mocker.patch('app.main.views.service_settings.zendesk_client.create_ticket')
     page = client_request.post(
         'main.submit_request_to_go_live',
         service_id=SERVICE_ONE_ID,