Merge lp:~robru/bileto/cleanup-login-endpoint into lp:bileto

[Robert Bruce Park]

Fix unhandled /login traceback.

This fixes this production traceback:

2015-08-06 15:36:25,831 ERROR Exception on /login [GET]
Traceback (most recent call last):
  File "/usr/lib/python3/dist-packages/flask/app.py", line 1817, in wsgi_app
    response = self.full_dispatch_request()
  File "/usr/lib/python3/dist-packages/flask/app.py", line 1478, in full_dispatch_request
    response = self.make_response(rv)
  File "/usr/lib/python3/dist-packages/flask/app.py", line 1566, in make_response
    raise ValueError('View function did not return a response')
ValueError: View function did not return a response

Which happens if you GET /login without already being logged in.

[lp:~robru/bileto/cleanup-login-endpoint]

212. By Robert Bruce Park on 2015-08-06

Fix test that relies on dict ordering.

[Robert Bruce Park (robru)]

Looks good in staging.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'tests/test_login.py'
--- tests/test_login.py	2015-07-31 17:08:58 +0000
+++ tests/test_login.py	2015-08-06 16:15:52 +0000
@@ -10,6 +10,16 @@
         ), follow_redirects=False)
         self.assertIn(b'https://localhost/login?next=/</a>.', rv.data)
 
+    def test_login_get(self):
+        rv = self.app.get('/login', follow_redirects=False)
+        self.assertIn(b'<a href="/">/</a>.', rv.data)
+
+    def test_logged_already(self):
+        with self.app.session_transaction() as sesh:
+            sesh['nickname'] = 'bileto'
+        rv = self.app.get('/login', follow_redirects=False)
+        self.assertIn(b'>https://localhost/</a>', rv.data)
+
     def test_logout(self):
         with self.app.session_transaction() as sesh:
             sesh['foo'] = 'bar'

=== modified file 'tests/test_sessions.py'
--- tests/test_sessions.py	2015-08-03 06:19:36 +0000
+++ tests/test_sessions.py	2015-08-06 16:15:52 +0000
@@ -1,4 +1,4 @@
-from pickle import dumps
+from pickle import dumps, loads
 
 from tests.tests import BiletoTestCase
 
@@ -29,4 +29,6 @@
         sesh = PickleSession(app.session_interface.directory, 'grill')
         sesh['foo'] = 'bar'
         with open(sesh.path, 'rb') as pickled:
-            self.assertEqual(pickled.read(), dumps(dict(foo='bar', baz='qux')))
+            self.assertDictEqual(
+                loads(pickled.read()),
+                dict(foo='bar', baz='qux'))

=== modified file 'tickets/login.py'
--- tickets/login.py	2015-08-05 21:21:09 +0000
+++ tickets/login.py	2015-08-06 16:15:52 +0000
@@ -16,6 +16,7 @@
             ask_for=['nickname'],
             ask_for_optional=['fullname', 'email'],
             extensions=[Teams])
+    return redirect('/')
 
 
 @oid.after_login