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

Merge pull request #394 from alphagov/tour-after-invite

Browse Source 
When a user accepts an invite, show them the tour
This commit is contained in:
Chris Hill-Scott
2016-04-05 16:27:35 +01:00
parent 8351d98289 686493ed8f
commit e85e68bc64
2 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,8 @@ from datetime import date
from flask import ( from flask import (
render_template, render_template,
redirect,
url_for,
session, session,
flash, flash,
jsonify jsonify
@@ -30,9 +32,7 @@ def service_dashboard(service_id):
if session.get('invited_user'): if session.get('invited_user'):
session.pop('invited_user', None) session.pop('invited_user', None)
message = 'You have successfully accepted your invitation and been added to {}'.format( return redirect(url_for("main.tour", service_id=service_id, page=1))
current_service['name'])
flash(message, 'default_with_tick')
statistics = statistics_api_client.get_statistics_for_service(service_id)['data'] statistics = statistics_api_client.get_statistics_for_service(service_id)['data']
template_statistics = template_statistics_client.get_template_statistics_for_service(service_id) template_statistics = template_statistics_client.get_template_statistics_for_service(service_id)

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

@@ -370,11 +370,7 @@ def test_new_invited_user_verifies_and_added_to_service(app_,
mock_accept_invite.assert_called_with(data['service'], sample_invite['id']) mock_accept_invite.assert_called_with(data['service'], sample_invite['id'])
mock_check_verify_code.assert_called_once_with(new_user_id, '12345', 'sms') mock_check_verify_code.assert_called_once_with(new_user_id, '12345', 'sms')
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser') raw_html = response.data.decode('utf-8')
element = page.find('h2', class_='navigation-service-name').find('a') page = BeautifulSoup(raw_html, 'html.parser')
assert element.text == 'Test Service' element = page.find('h2').text == 'Trial mode'
service_link = element.attrs['href'] assert service_one['id'] in raw_html
assert service_link == '/services/{}/dashboard'.format(service_one['id'])
flash_banner = page.find('div', class_='banner-default-with-tick').string.strip()
assert flash_banner == 'You have successfully accepted your invitation and been added to Test Service'