Merge remote-tracking branch 'origin/main' into dockerci

Author: hjwp

.github/workflows/tests.yml

@@ -31,6 +31,7 @@ jobs:
           test_chapter_15_advanced_forms,
           test_chapter_16_javascript,
           test_chapter_18_spiking_custom_auth,
+          test_chapter_19_mocking,
           unit-test
         ]
 

chapter_15_advanced_forms.asciidoc

@@ -843,12 +843,18 @@ use Django instead, it seems like we need to bring back our custom
 <1> We give `.was-validated` to the `<form>`
 <2> We provide an `<input>` and the most important custom setting will be its
     `class`. As you can see, we can use conditionals even for providing
-    additional `class` -es.
+    additional `class` -es.footnote:[
+We've split the form tag across three lines so it fits nicely in the book.
+If you've not seen that before, it may look a little weird to you,
+but I promise it is valid HTML.
+You don't have to use it if you don't like it though. :)]
+
 <3> If you try to just simply display `form.errors.text` you'll see it ends up
     as a list item in an unordered list. To avoid that, let's just
     select `form.errors.text.0`.
 
-NOTE:  Another fliip-flop! We spent most of the last chapter switching from handcrafted html
+NOTE:  Another fliip-flop!
+  We spent most of the last chapter switching from handcrafted html
   to having our form autogenerated by django, and now we're switching back.
   It's a little frustrating, and I could have gone back and changed the book's text to avoid the back+forth,
   but I prefer to show software development as it really is.

chapter_18_spiking_custom_auth.asciidoc

@@ -842,6 +842,7 @@ form for the login email:
               class="form-control"
               placeholder="your@email.com"
             />
+            {% csrf_token %}
           </div>
         </form>
       </div>