Merge branch 'main' into deployment-3e

chapter_07_working_incrementally.asciidoc

@@ -257,8 +257,8 @@ and that they get their own unique URL for their list:
     ## as a way of simulating a brand new user session  # <1>
     self.browser.delete_all_cookies()
 
-    # Francis visits the home page.  There is no sign of
-    # Edith's list
+    # Francis visits the home page.  There is no sign of Edith's
+    # list
     self.browser.get(self.live_server_url)
     page_text = self.browser.find_element(By.TAG_NAME, "body").text
     self.assertNotIn("Buy peacock feathers", page_text)
@@ -1018,12 +1018,6 @@ Let's commit our progress so far:
 [subs="specialcharacters,quotes"]
 ----
 $ *git status* # should show 5 changed files and 1 new file, list.html
-// DAVID: I get five changed files:
-// 	modified:   functional_tests/tests.py
-//	modified:   lists/templates/home.html
-//	modified:   lists/tests.py
-//	modified:   lists/views.py
-//	modified:   superlists/urls.py
 $ *git add lists/templates/list.html*
 $ *git diff* # should show we've simplified home.html,
            # moved one test to a new class in lists/tests.py added a new view
@@ -1035,6 +1029,13 @@ $ *git commit -a* # add a message summarising the above, maybe something like
                 # "new URL, view and template to display lists"
 ----
 
+// DAVID: I get five changed files:
+// 	modified:   functional_tests/tests.py
+//	modified:   lists/templates/home.html
+//	modified:   lists/tests.py
+//	modified:   lists/views.py
+//	modified:   superlists/urls.py
+
 // DAVID: the FT is also changed. Also it wasn't just adding a line to urls as
 // it also switched `from list.views import home_page` to `from lists import views`.
 // TBH I'm not sure we really need this para, most readers will skip it.

tests/test_chapter_07_working_incrementally.py

@@ -20,7 +20,7 @@ def test_listings_and_commands_and_output(self):
         self.assertEqual(self.listings[1].type, "output")
 
         # skips
-        self.skip_with_check(53, "should show 4 changed files")  # git
+        self.skip_with_check(53, "should show 5 changed files")  # git
         self.skip_with_check(58, "add a message summarising")  # git
         self.skip_with_check(75, "5 changed files")  # git
         self.skip_with_check(77, "forms x2")  # git