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

Put a link to the tour in the footer

tests/app/main/views/test_accept_invite.py

@@ -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

tests/app/main/views/test_add_service.py

@@ -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_,

tests/app/main/views/test_tour.py

@@ -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)