Merge branch 'main' into StephanieAG-patch-1-OTG

Author: hjwp

.github/workflows/tests.yml

@@ -32,7 +32,10 @@ jobs:
           test_chapter_16_javascript,
           test_chapter_18_spiking_custom_auth,
           test_chapter_19_mocking,
-          unit-test
+          test_chapter_20_fixtures_and_wait_decorator,
+          test_chapter_21_server_side_debugging,
+          test_chapter_22_outside_in,
+          unit-test,
         ]
 
     env:

.gitmodules

@@ -50,10 +50,10 @@
 	path = source/chapter_19_mocking/superlists
 	url = [email protected]:hjwp/book-example.git
 [submodule "source/chapter_18/superlists"]
-	path = source/chapter_server_side_debugging/superlists
+	path = source/chapter_21_server_side_debugging/superlists
 	url = [email protected]:hjwp/book-example.git
 [submodule "source/chapter_19/superlists"]
-	path = source/chapter_outside_in/superlists
+	path = source/chapter_22_outside_in/superlists
 	url = [email protected]:hjwp/book-example.git
 [submodule "source/chapter_20/superlists"]
 	path = source/chapter_purist_unit_tests/superlists
@@ -85,8 +85,8 @@
 [submodule "source/chapter_22/superlists"]
 	path = source/chapter_page_pattern/superlists
 	url = [email protected]:hjwp/book-example.git
-[submodule "source/chapter_fixtures_and_wait_decorator/superlists"]
-	path = source/chapter_fixtures_and_wait_decorator/superlists
+[submodule "source/chapter_20_fixtures_and_wait_decorator/superlists"]
+	path = source/chapter_20_fixtures_and_wait_decorator/superlists
 	url = [email protected]:hjwp/book-example.git
 [submodule "source/chapter_12_organising_test_files/superlists"]
 	path = source/chapter_12_organising_test_files/superlists

Makefile

@@ -131,15 +131,15 @@ test_chapter_18_spiking_custom_auth: chapter_18_spiking_custom_auth.html $(TMPDI
 .PHONY: test_chapter_19_mocking
 test_chapter_19_mocking: chapter_19_mocking.html $(TMPDIR) $(VENV)/bin
 	$(VENV)/bin/pytest -s --tb=short ./tests/test_chapter_19_mocking.py
-.PHONY: test_chapter_fixtures_and_wait_decorator
-test_chapter_fixtures_and_wait_decorator: chapter_fixtures_and_wait_decorator.html $(TMPDIR) $(VENV)/bin
-	$(VENV)/bin/pytest -s --tb=short ./tests/test_chapter_fixtures_and_wait_decorator.py
-.PHONY: test_chapter_server_side_debugging
-test_chapter_server_side_debugging: chapter_server_side_debugging.html $(TMPDIR) $(VENV)/bin
-	$(VENV)/bin/pytest -s --tb=short ./tests/test_chapter_server_side_debugging.py
-.PHONY: test_chapter_outside_in
-test_chapter_outside_in: chapter_outside_in.html $(TMPDIR) $(VENV)/bin
-	$(VENV)/bin/pytest -s --tb=short ./tests/test_chapter_outside_in.py
+.PHONY: test_chapter_20_fixtures_and_wait_decorator
+test_chapter_20_fixtures_and_wait_decorator: chapter_20_fixtures_and_wait_decorator.html $(TMPDIR) $(VENV)/bin
+	$(VENV)/bin/pytest -s --tb=short ./tests/test_chapter_20_fixtures_and_wait_decorator.py
+.PHONY: test_chapter_21_server_side_debugging
+test_chapter_21_server_side_debugging: chapter_21_server_side_debugging.html $(TMPDIR) $(VENV)/bin
+	$(VENV)/bin/pytest -s --tb=short ./tests/test_chapter_21_server_side_debugging.py
+.PHONY: test_chapter_22_outside_in
+test_chapter_22_outside_in: chapter_22_outside_in.html $(TMPDIR) $(VENV)/bin
+	$(VENV)/bin/pytest -s --tb=short ./tests/test_chapter_22_outside_in.py
 .PHONY: test_chapter_purist_unit_tests
 test_chapter_purist_unit_tests: chapter_purist_unit_tests.html $(TMPDIR) $(VENV)/bin
 	$(VENV)/bin/pytest -s --tb=short ./tests/test_chapter_purist_unit_tests.py

appendix_IX_cheat_sheet.asciidoc

@@ -122,7 +122,7 @@ Selenium/Functional Testing Best Practices
 
 * Look into BDD tools as another way of structuring your FTs.
 
-Relevant chapters: <<chapter_server_side_debugging>>, <<chapter_CI>>,
+Relevant chapters: <<chapter_21_server_side_debugging>>, <<chapter_CI>>,
 <<chapter_page_pattern>>
 
 Outside-In, Test Isolation Versus Integrated Tests, and Mocking
@@ -161,6 +161,6 @@ If you do find yourself writing tests with lots of mocks, and they feel
 painful, remember &#x201c;__listen to your tests__&#x201d;—ugly, mocky tests may be
 trying to tell you that your code could be simplified.
 
-Relevant chapters: <<chapter_outside_in>>, <<chapter_purist_unit_tests>>,
+Relevant chapters: <<chapter_22_outside_in>>, <<chapter_purist_unit_tests>>,
 <<chapter_hot_lava>>
 

appendix_bdd.asciidoc

@@ -43,7 +43,7 @@ https://pythonhosted.org/behave-django/[behave-django].
 **********************************************************************
 
 ((("code examples, obtaining and using")))I'm
-going to use the example from <<chapter_outside_in>>. 
+going to use the example from <<chapter_22_outside_in>>. 
 We have a basic to-do lists site, and we want to add a new feature:
 logged-in users should be able to view the lists they've authored in one place.
 Up until this point, all lists are effectively anonymous.

appendix_github_links.asciidoc

@@ -38,9 +38,9 @@ Full List of Links for Each Chapter
 <<chapter_17_second_deploy>>:: https://github.com/hjwp/book-example/tree/chapter_17_second_deploy
 <<chapter_18_spiking_custom_auth>>:: https://github.com/hjwp/book-example/tree/chapter_18_spiking_custom_auth
 <<chapter_19_mocking>>:: https://github.com/hjwp/book-example/tree/chapter_19_mocking
-<<chapter_fixtures_and_wait_decorator>>:: https://github.com/hjwp/book-example/tree/chapter_fixtures_and_wait_decorator
-<<chapter_server_side_debugging>>:: https://github.com/hjwp/book-example/tree/chapter_server_side_debugging
-<<chapter_outside_in>>:: https://github.com/hjwp/book-example/tree/chapter_outside_in
+<<chapter_20_fixtures_and_wait_decorator>>:: https://github.com/hjwp/book-example/tree/chapter_20_fixtures_and_wait_decorator
+<<chapter_21_server_side_debugging>>:: https://github.com/hjwp/book-example/tree/chapter_21_server_side_debugging
+<<chapter_22_outside_in>>:: https://github.com/hjwp/book-example/tree/chapter_22_outside_in
 <<chapter_purist_unit_tests>>:: https://github.com/hjwp/book-example/tree/chapter_purist_unit_tests
 <<chapter_CI>>:: https://github.com/hjwp/book-example/tree/chapter_CI
 <<chapter_page_pattern>>:: https://github.com/hjwp/book-example/tree/chapter_page_pattern

atlas.json

@@ -32,9 +32,9 @@
     "part3.asciidoc",
     "chapter_18_spiking_custom_auth.asciidoc",
     "chapter_19_mocking.asciidoc",
-    "chapter_fixtures_and_wait_decorator.asciidoc",
-    "chapter_server_side_debugging.asciidoc",
-    "chapter_outside_in.asciidoc",
+    "chapter_20_fixtures_and_wait_decorator.asciidoc",
+    "chapter_21_server_side_debugging.asciidoc",
+    "chapter_22_outside_in.asciidoc",
     "chapter_purist_unit_tests.asciidoc",
     "chapter_CI.asciidoc",
     "chapter_page_pattern.asciidoc",
@@ -94,4 +94,4 @@
   "templating": false,
   "lang": "en",
   "accent_color": ""
-}
+}

book.asciidoc

@@ -43,9 +43,9 @@ include::chapter_17_second_deploy.asciidoc[]
 include::part3.forbook.asciidoc[]
 include::chapter_18_spiking_custom_auth.asciidoc[]
 include::chapter_19_mocking.asciidoc[]
-include::chapter_fixtures_and_wait_decorator.asciidoc[]
-include::chapter_server_side_debugging.asciidoc[]
-include::chapter_outside_in.asciidoc[]
+include::chapter_20_fixtures_and_wait_decorator.asciidoc[]
+include::chapter_21_server_side_debugging.asciidoc[]
+include::chapter_22_outside_in.asciidoc[]
 include::chapter_purist_unit_tests.asciidoc[]
 include::chapter_CI.asciidoc[]
 include::chapter_page_pattern.asciidoc[]

chapter_07_working_incrementally.asciidoc

@@ -2543,7 +2543,7 @@ YAGNI::
     just because it suggests itself at the time.
     Chances are, you won't use it,
     or you won't have anticipated your future requirements correctly.
-     See <<chapter_outside_in>> for one methodology that helps us avoid this trap.
+     See <<chapter_22_outside_in>> for one methodology that helps us avoid this trap.
     ((("Test-Driven Development (TDD)", "philosophy of", "YAGNI")))
     ((("YAGNI (You ain&#x2019;t gonna need it!)")))