Rename chapter 20

Author: hjwp

.gitmodules

@@ -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,9 +131,9 @@ 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_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_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

appendix_github_links.asciidoc

@@ -38,7 +38,7 @@ 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_20_fixtures_and_wait_decorator>>:: https://github.com/hjwp/book-example/tree/chapter_20_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_purist_unit_tests>>:: https://github.com/hjwp/book-example/tree/chapter_purist_unit_tests

atlas.json

@@ -32,7 +32,7 @@
     "part3.asciidoc",
     "chapter_18_spiking_custom_auth.asciidoc",
     "chapter_19_mocking.asciidoc",
-    "chapter_fixtures_and_wait_decorator.asciidoc",
+    "chapter_20_fixtures_and_wait_decorator.asciidoc",
     "chapter_server_side_debugging.asciidoc",
     "chapter_outside_in.asciidoc",
     "chapter_purist_unit_tests.asciidoc",

book.asciidoc

@@ -43,7 +43,7 @@ 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_20_fixtures_and_wait_decorator.asciidoc[]
 include::chapter_server_side_debugging.asciidoc[]
 include::chapter_outside_in.asciidoc[]
 include::chapter_purist_unit_tests.asciidoc[]

chapter_fixtures_and_wait_decorator.asciidoc renamed to chapter_20_fixtures_and_wait_decorator.asciidoc

@@ -1,4 +1,4 @@
-[[chapter_fixtures_and_wait_decorator]]
+[[chapter_20_fixtures_and_wait_decorator]]
 Test Fixtures and a Decorator for [keep-together]#Explicit Waits#
 -----------------------------------------------------------------
 
@@ -281,8 +281,10 @@ $ *git commit -m "test_my_lists: precreate sessions, move login checks into base
 
 .JSON Test Fixtures Considered Harmful
 *******************************************************************************
-((("JSON fixtures")))((("fixtures", "JSON fixtures")))((("test fixtures")))When
-we pre-populate the database with test data, as we've done here with the
+((("JSON fixtures")))
+((("fixtures", "JSON fixtures")))
+((("test fixtures")))
+When we pre-populate the database with test data, as we've done here with the
 `User` object and its associated `Session` object, what we're doing is setting
 up a "test fixture".
 

source/chapter_fixtures_and_wait_decorator/superlists renamed to source/chapter_20_fixtures_and_wait_decorator/superlists

@@ -21,7 +21,7 @@
     # part 3
     "chapter_18_spiking_custom_auth",
     "chapter_19_mocking",
-    "chapter_fixtures_and_wait_decorator",
+    "chapter_20_fixtures_and_wait_decorator",
     "chapter_server_side_debugging",
     "chapter_outside_in",
     "chapter_purist_unit_tests",

tests/chapters.py

@@ -1,36 +1,35 @@
 #!/usr/bin/env python3
+import os
 import unittest
 
 from book_tester import ChapterTest
 
 
-class Chapter18Test(ChapterTest):
-    chapter_name = 'chapter_fixtures_and_wait_decorator'
-    previous_chapter = 'chapter_19_mocking'
+class Chapter20Test(ChapterTest):
+    chapter_name = "chapter_20_fixtures_and_wait_decorator"
+    previous_chapter = "chapter_19_mocking"
 
     def test_listings_and_commands_and_output(self):
         self.parse_listings()
 
         # sanity checks
-        self.assertEqual(self.listings[0].type, 'code listing')
-        self.assertEqual(self.listings[1].type, 'other command')
-        self.assertEqual(self.listings[2].type, 'output')
+        self.assertEqual(self.listings[0].type, "code listing")
+        self.assertEqual(self.listings[1].type, "other command")
+        self.assertEqual(self.listings[2].type, "output")
 
         # skips
-        #self.skip_with_check(22, 'switch back to master') # comment
+        # self.skip_with_check(22, 'switch back to master') # comment
 
         # prep
         self.start_with_checkout()
         self.prep_database()
-        self.sourcetree.run_command('rm accounts/tests.py')
 
         # hack fast-forward
-        skip = False
-        if skip:
+        if os.environ.get("SKIP"):
             self.pos = 10
-            self.sourcetree.run_command('git checkout {0}'.format(
-                self.sourcetree.get_commit_spec('ch17l004')
-            ))
+            self.sourcetree.run_command(
+                "git checkout {}".format(self.sourcetree.get_commit_spec("ch17l004"))
+            )
 
         while self.pos < len(self.listings):
             print(self.pos)
@@ -43,5 +42,5 @@ def test_listings_and_commands_and_output(self):
         self.check_final_diff(ignore=["moves"])
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()

tests/test_chapter_fixtures_and_wait_decorator.py renamed to tests/test_chapter_20_fixtures_and_wait_decorator.py

@@ -8,7 +8,7 @@
 
 class Chapter18Test(ChapterTest):
     chapter_name = 'chapter_server_side_debugging'
-    previous_chapter = 'chapter_fixtures_and_wait_decorator'
+    previous_chapter = 'chapter_20_fixtures_and_wait_decorator'
 
 
     def test_listings_and_commands_and_output(self):