lots more in 19

Author: hjwp

chapter_19_mocking.asciidoc

@@ -232,7 +232,7 @@ So let's call `send_mail`, naively:
 
 
 [role="sourcecode"]
-.src/accounts/views.py
+.src/accounts/views.py (ch19l006-1)
 ====
 [source,python]
 ----
@@ -259,7 +259,7 @@ Let's try this:
 
 
 [role="sourcecode"]
-.src/accounts/views.py
+.src/accounts/views.py (ch19l006-2)
 ====
 [source,python]
 ----
@@ -281,7 +281,7 @@ something like this:
 
 
 [role="sourcecode"]
-.src/accounts/views.py
+.src/accounts/views.py (ch19l006)
 ====
 [source,python]
 ----
@@ -512,8 +512,8 @@ First let's get back to our FT and see where it's failing:
 ----
 $ pass:quotes[*python src/manage.py test functional_tests.test_login*]
 [...]
-AssertionError: 'Check your email' not found in 'Superlists\nEnter email to log
-in:\nStart a new To-Do list'
+AssertionError: 'Check your email' not found in 'Superlists\nEnter your email
+to log in\nStart a new To-Do list'
 ----
 
 Submitting the email address currently has no effect,
@@ -586,7 +586,7 @@ And we can get it passing with:
 
 
 [role="sourcecode"]
-.src/accounts/views.py (ch17l014)
+.src/accounts/views.py (ch19l014)
 ====
 [source,python]
 ----
@@ -597,7 +597,7 @@ def send_login_email(request):
     [...]
     messages.success(
         request,
-        "Check your email, we've sent you a link you can use to log in."
+        "Check your email, we've sent you a link you can use to log in.",
     )
     return redirect("/")
 ----
@@ -653,7 +653,7 @@ achieve the same result.  I could write the code like this:
     messages.add_message(
         request,
         messages.SUCCESS,
-        "Check your email, we've sent you a link you can use to log in."
+        "Check your email, we've sent you a link you can use to log in.",
     )
 ----
 ====
@@ -730,15 +730,15 @@ Let's just cheat for now though, by changing the value in the view:
 
 
 [role="sourcecode"]
-.src/accounts/views.py
+.src/accounts/views.py (ch19l016)
 ====
 [source,python]
 ----
     send_mail(
-        'Your login link for Superlists',
-        'Use this link to log in',
-        'noreply@superlists',
-        [email]
+        "Your login link for Superlists",
+        "Use this link to log in",
+        "noreply@superlists",
+        [email],
     )
 ----
 ====
@@ -763,15 +763,14 @@ just cheats:
 
 
 [role="sourcecode"]
-.src/accounts/tests/test_views.py (ch17l017)
+.src/accounts/tests/test_views.py (ch19l017)
 ====
 [source,python]
 ----
 class LoginViewTest(TestCase):
-
     def test_redirects_to_home_page(self):
-        response = self.client.get('/accounts/login?token=abcd123')
-        self.assertRedirects(response, '/')
+        response = self.client.get("/accounts/login?token=abcd123")
+        self.assertRedirects(response, "/")
 ----
 ====
 
@@ -793,7 +792,7 @@ code was 404 (expected 302)
 
 * No view:
 +
-[role="dofirst-ch17l018 small-code"]
+[role="dofirst-ch19l018 small-code"]
 ----
 AttributeError: module 'accounts.views' has no attribute 'login'
 ----
@@ -894,7 +893,7 @@ from accounts.models import Token
 [...]
 
 def send_login_email(request):
-    email = request.POST['email']
+    email = request.POST["email"]
     token = Token.objects.create(email=email)
     send_mail(
         [...]
@@ -904,7 +903,7 @@ def send_login_email(request):
 And now the second test prompts us to actually use the token in the body
 of our email:
 
-[subs="specialcharacters,macros"]
+[subs=""]
 ----
 [...]
 AssertionError:
@@ -918,7 +917,7 @@ So we can insert the token into our email like this:
 
 
 [role="sourcecode"]
-.src/accounts/views.py (ch19l023)
+.src/accounts/views.py (ch17l023)
 ====
 [source,python]
 ----
@@ -1416,7 +1415,7 @@ duplication in our tests.  Let's see how it looks:
 [source,python]
 ----
     @mock.patch("accounts.views.auth")  # <1>
-    def test_calls_authenticate_with_uid_from_get_request(self, mock_auth):  # <1>
+    def test_calls_authenticate_with_uid_from_get_request(self, mock_auth):  # <2>
         self.client.get("/accounts/login?token=abcd123")
         self.assertEqual(
             mock_auth.authenticate.call_args,  # <3>

source/chapter_18_spiking_custom_auth/superlists

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+import os
 import unittest
 
 from book_tester import ChapterTest
@@ -24,11 +25,10 @@ def test_listings_and_commands_and_output(self):
         # self.sourcetree.run_command("rm src/accounts/tests.py")
 
         # hack fast-forward
-        skip = False
-        if skip:
-            self.pos = 100
+        if os.environ.get("SKIP"):
+            self.pos = 40
             self.sourcetree.run_command(
-                "git checkout {0}".format(self.sourcetree.get_commit_spec("ch16l047"))
+                "git checkout {}".format(self.sourcetree.get_commit_spec("ch19l017"))
             )
 
         while self.pos < len(self.listings):