Help
-
-
- Tour
- Trial mode
- Pricing
- Delivery and failure diff --git a/app/templates/main_nav.html b/app/templates/main_nav.html index aaa761039..3ce3cc961 100644 --- a/app/templates/main_nav.html +++ b/app/templates/main_nav.html @@ -1,3 +1,51 @@ +{% from "components/banner.html" import banner_wrapper %} + +{% if request.args['help'] %} + {% call banner_wrapper(type='tour') %} +
Get started
+
+
+
+
+ 1.
+
+
+ + Send yourself this example message +
+
+
+
+
+ 2.
+
+
+ + The template pulls in the data you provide +
+
+
+
+ {% endcall %}
+{% else %}
+
+ 3.
+
+
+ + Now try it with your own message +
+ {% if request.args['help'] == '3' %} + {% if first_email_template %} + + Write an email + + {% endif %} + + Write a text message + + {% endif %} +- Finished {{ finished_at|format_datetime }} -
- {% else %} -- Started {{ uploaded_at|format_datetime }} -
- {% endif %} - Uploaded by {{ created_by }} ++ Sent by {{ created_by }} on {{ uploaded_at|format_datetime_short }} +
-
diff --git a/app/templates/views/edit-sms-template.html b/app/templates/views/edit-sms-template.html
index f7a39744a..ee4778fa9 100644
--- a/app/templates/views/edit-sms-template.html
+++ b/app/templates/views/edit-sms-template.html
@@ -26,9 +26,9 @@
) }}
-
diff --git a/app/templates/views/send-test.html b/app/templates/views/send-test.html
index c6b28b1d7..0731ae2c4 100644
--- a/app/templates/views/send-test.html
+++ b/app/templates/views/send-test.html
@@ -11,8 +11,11 @@
{% block maincolumn_content %}
-
- Send a test
+ {% if request.args['help'] %} +Example text message
+ {% else %} +Send a test
+ {% endif %} {% if 'sms' == template.template_type %}
@@ -36,7 +39,7 @@
{% endblock %}
diff --git a/app/templates/views/tour/1.html b/app/templates/views/tour/1.html
deleted file mode 100644
index 1474c8825..000000000
--- a/app/templates/views/tour/1.html
+++ /dev/null
@@ -1,25 +0,0 @@
-{% extends "withoutnav_template.html" %}
-{% from "components/textbox.html" import textbox %}
-{% from "components/page-footer.html" import page_footer %}
-{% from "components/banner.html" import banner_wrapper %}
-
-{% block page_title %}
- {{heading}} – GOV.UK Notify
-{% endblock %}
-
-{% block maincolumn_content %}
-
- {% call banner_wrapper(type='tour') %}
-
-
- 
-
- {% endcall %}
-
-{% endblock %}
diff --git a/tests/app/main/views/test_add_service.py b/tests/app/main/views/test_add_service.py
index 122fcd8d7..fa0993127 100644
--- a/tests/app/main/views/test_add_service.py
+++ b/tests/app/main/views/test_add_service.py
@@ -1,5 +1,5 @@
from flask import url_for, session
-
+from unittest.mock import ANY
import app
@@ -17,6 +17,7 @@ def test_get_should_render_add_service_template(app_,
def test_should_add_service_and_redirect_to_tour_when_no_services(app_,
mocker,
mock_create_service,
+ mock_create_service_template,
mock_get_services_with_no_services,
api_user_active):
with app_.test_request_context():
@@ -34,14 +35,22 @@ def test_should_add_service_and_redirect_to_tour_when_no_services(app_,
user_id=api_user_active.id,
email_from='testing.the.post'
)
+ assert len(mock_create_service_template.call_args_list) == 2
assert session['service_id'] == 101
assert response.status_code == 302
- assert response.location == url_for('main.tour', page=1, _external=True)
+ assert response.location == url_for(
+ 'main.send_test',
+ service_id=101,
+ template_id="Example text message template",
+ help=1,
+ _external=True
+ )
def test_should_add_service_and_redirect_to_dashboard_when_existing_service(app_,
mocker,
mock_create_service,
+ mock_create_service_template,
mock_get_services,
api_user_active):
with app_.test_request_context():
@@ -59,6 +68,7 @@ def test_should_add_service_and_redirect_to_dashboard_when_existing_service(app_
user_id=api_user_active.id,
email_from='testing.the.post'
)
+ assert len(mock_create_service_template.call_args_list) == 0
assert session['service_id'] == 101
assert response.status_code == 302
assert response.location == url_for('main.service_dashboard', service_id=101, _external=True)
diff --git a/tests/app/main/views/test_jobs.py b/tests/app/main/views/test_jobs.py
index 5d0df8d48..3326d0f92 100644
--- a/tests/app/main/views/test_jobs.py
+++ b/tests/app/main/views/test_jobs.py
@@ -70,7 +70,7 @@ def test_should_show_updates_for_one_job_as_json(
assert 'queued' in content['counts']
assert 'Recipient' in content['notifications']
assert 'Status' in content['notifications']
- assert 'Started' in content['status']
+ assert 'Sent by Test User' in content['status']
assert job_json['status'] in content['status']
diff --git a/tests/app/main/views/test_tour.py b/tests/app/main/views/test_tour.py
deleted file mode 100644
index 5ab155bbc..000000000
--- a/tests/app/main/views/test_tour.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import pytest
-from flask import url_for
-
-
-@pytest.mark.parametrize("page", range(1, 5))
-def test_should_render_tour_pages(
- app_,
- api_user_active,
- mocker,
- mock_get_service,
- page
-):
- with app_.test_request_context():
- with app_.test_client() as client:
- response = client.get(url_for('main.tour', page=page))
- assert response.status_code == 200
- assert 'Next' in response.get_data(as_text=True)
{{ heading }}
-- To start off with, you can only send messages to yourself. -
-- We can remove these restrictions when you’re ready. -
- - Next - - {% endcall %} - -{% endblock %} diff --git a/app/templates/views/tour/2.html b/app/templates/views/tour/2.html deleted file mode 100644 index fd321e927..000000000 --- a/app/templates/views/tour/2.html +++ /dev/null @@ -1,37 +0,0 @@ -{% extends "withoutnav_template.html" %} -{% from "components/textbox.html" import textbox %} -{% from "components/page-footer.html" import page_footer %} -{% from "components/banner.html" import banner_wrapper %} - -{% block page_title %} - {{heading}} – GOV.UK Notify -{% endblock %} - -{% block maincolumn_content %} - - {% call banner_wrapper(type='tour') %} -{{ heading }}
-- Set up a template like this: -
-
- 
-
{{ heading }}
-- Add recipients by uploading a .csv spreadsheet: -
-
-
-
- Developers, you can add data automatically using an API -
- - Next - - {% endcall %} - -{% endblock %} diff --git a/app/templates/views/tour/4.html b/app/templates/views/tour/4.html deleted file mode 100644 index 2b845d0fa..000000000 --- a/app/templates/views/tour/4.html +++ /dev/null @@ -1,36 +0,0 @@ -{% extends "withoutnav_template.html" %} -{% from "components/textbox.html" import textbox %} -{% from "components/page-footer.html" import page_footer %} -{% from "components/banner.html" import banner_wrapper %} - -{% block page_title %} - {{ heading }} – GOV.UK Notify -{% endblock %} - -{% block maincolumn_content %} - - {% call banner_wrapper(type='tour') %} -{{ heading }}
-- Notify merges your data with the template and sends the messages -
- - Next - -
-