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

Merge pull request #467 from alphagov/tour-footer-link

Browse Source 
Put a link to the tour in the footer
This commit is contained in:
Chris Hill-Scott
2016-04-19 15:55:47 +01:00
parent 352750dcf6 2a080835aa
commit 9b75f7ef8a
11 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/main/views/add_service.py
View File

@@ -42,8 +42,8 @@ def add_service():
restricted=True,
user_id=session['user_id'],
email_from=email_from)
return redirect(url_for('main.tour', service_id=service_id, page=1))
session['service_id'] = service_id
return redirect(url_for('main.tour', page=1))
else:
return render_template(
'views/add-service.html',

3
app/main/views/dashboard.py
View File

@@ -34,7 +34,8 @@ def service_dashboard(service_id):
if session.get('invited_user'):
session.pop('invited_user', None)
return redirect(url_for("main.tour", service_id=service_id, page=1))
session['service_id'] = service_id
return redirect(url_for("main.tour", page=1))
statistics = statistics_api_client.get_statistics_for_service(service_id)['data']
template_statistics = aggregate_usage(template_statistics_client.get_template_statistics_for_service(service_id))

5
app/main/views/tour.py
View File

@@ -12,9 +12,8 @@ headings = [
]
@main.route("/services/<service_id>/tour/<int:page>")
@login_required
def tour(service_id, page):
@main.route("/tour/<int:page>")
def tour(page):
return render_template(
'views/tour/{}.html'.format(page),
current_page=page,

7
app/templates/admin_template.html
View File

@@ -91,8 +91,11 @@
</ul>
</div>
<div class="column-one-third">
<h2>Developers</h2>
<a href="{{ url_for('main.documentation') }}">API documentation</a>
<h2>Documentation</h2>
<ul>
<li><a href="{{ url_for('main.tour', page=1) }}">Take the tour</a></li>
<li><a href="{{ url_for('main.documentation') }}">API documentation</a></li>
</ul>
</div>
</div>
</div>

2
app/templates/views/tour/1.html
View File

@@ -17,7 +17,7 @@
<p>
We can remove these restrictions when you’re ready.
</p>
<a href='{{ url_for('.tour', service_id=current_service.id, page=next_page) }}'>
<a href='{{ url_for('.tour', page=next_page) }}'>
Next
</a>
{% endcall %}

2
app/templates/views/tour/2.html
View File

@@ -29,7 +29,7 @@
>
</picture>
</p>
<a href='{{ url_for('.tour', service_id=current_service.id, page=next_page) }}'>
<a href='{{ url_for('.tour', page=next_page) }}'>
Next
</a>
{% endcall %}

2
app/templates/views/tour/3.html
View File

@@ -32,7 +32,7 @@
<p>
Developers, you can add data automatically using an API
</p>
<a href='{{ url_for('.tour', service_id=current_service.id, page=next_page) }}'>
<a href='{{ url_for('.tour', page=next_page) }}'>
Next
</a>
{% endcall %}

2
app/templates/views/tour/4.html
View File

@@ -14,7 +14,7 @@
<p>
Notify merges your data with the template and sends the messages
</p>
<a href="{{ url_for('.service_dashboard', service_id=current_service.id) }}">
<a href="{{ url_for('.show_all_services_or_dashboard') }}">
Next
</a>
<picture class="banner-tour-image-flush-bottom">

4
tests/app/main/views/test_accept_invite.py
View File

@@ -1,4 +1,4 @@
from flask import url_for
from flask import url_for, session
from bs4 import BeautifulSoup
@@ -372,8 +372,8 @@ def test_new_invited_user_verifies_and_added_to_service(app_,
mock_add_user_to_service.assert_called_with(data['service'], new_user_id, expected_permissions)
mock_accept_invite.assert_called_with(data['service'], sample_invite['id'])
mock_check_verify_code.assert_called_once_with(new_user_id, '12345', 'sms')
assert service_one['id'] == session['service_id']
raw_html = response.data.decode('utf-8')
page = BeautifulSoup(raw_html, 'html.parser')
element = page.find('h2').text == 'Trial mode'
assert service_one['id'] in raw_html

21
tests/app/main/views/test_add_service.py
View File

@@ -1,4 +1,4 @@
from flask import url_for
from flask import url_for, session
import app
@@ -25,15 +25,18 @@ def test_should_add_service_and_redirect_to_next_page(app_,
response = client.post(
url_for('main.add_service'),
data={'name': 'testing the post'})
assert response.status_code == 302
assert response.location == url_for('main.tour', service_id=101, page=1, _external=True)
assert mock_get_services.called
mock_create_service.asset_called_once_with(service_name='testing the post',
active=False,
limit=app_.config['DEFAULT_SERVICE_LIMIT'],
restricted=True,
user_id=api_user_active.id,
email_from='testing.the.post')
mock_create_service.assert_called_once_with(
service_name='testing the post',
active=False,
message_limit=app_.config['DEFAULT_SERVICE_LIMIT'],
restricted=True,
user_id=api_user_active.id,
email_from='testing.the.post'
)
assert session['service_id'] == 101
assert response.status_code == 302
assert response.location == url_for('main.tour', page=1, _external=True)
def test_should_return_form_errors_when_service_name_is_empty(app_,

3
tests/app/main/views/test_tour.py
View File

@@ -14,7 +14,6 @@ def test_should_render_tour_pages(
):
with app_.test_request_context():
with app_.test_client() as client:
client.login(api_user_active, mocker)
response = client.get(url_for('main.tour', service_id=101, page=page))
response = client.get(url_for('main.tour', page=page))
assert response.status_code == 200
assert 'Next' in response.get_data(as_text=True)