Merge pull request #133 from hjwp/python3.11-django-4

Python3.11 & Django 4

Author: hjwp

.github/workflows/tests.yml

@@ -3,7 +3,7 @@ name: Book tests
 on: [push]
 
 jobs:
-  build:
+  tests:
 
     runs-on: ubuntu-latest
 
@@ -26,10 +26,10 @@ jobs:
         git config --global user.email "[email protected]"
         git config --global user.name "Elspeth See-Eye"
     
-    - name: Set up Python 3.8
+    - name: Set up Python 3.11
       uses: actions/setup-python@v1
       with:
-        python-version: 3.8
+        python-version: 3.11
 
     - name: Install apt stuff and other dependencies
       run: |
@@ -53,14 +53,40 @@ jobs:
         env
 
     - name: Test chapter 1
+      if: always()
       run: |
         make test_chapter_01
 
     - name: Test chapter 2
+      if: always()
       run: |
         make test_chapter_02_unittest
 
-    - name: Test all chapters in parallel, yolo
+    - name: Test chapter 3
+      if: always()
       run: |
-        make build
-        pytest --tb=short --color=yes --numprocesses=4 tests/test_chapter_*
+        make test_chapter_unit_test_first_view
+
+    - name: Test chapter 4
+      if: always()
+      run: |
+        make test_chapter_philosophy_and_refactoring
+
+    - name: Test chapter 5
+      if: always()
+      run: |
+        make test_chapter_post_and_database
+
+    - name: Test chapter 6
+      if: always()
+      run: |
+        make test_chapter_explicit_waits_1
+
+    - name: Test chapter 7
+      if: always()
+      run: |
+        make test_chapter_working_incrementally
+  # - name: Test all chapters in parallel, yolo
+  #   run: |
+  #     make build
+  #     pytest --tb=short --color=yes --numprocesses=4 tests/test_chapter_*

Makefile

@@ -1,18 +1,33 @@
 SOURCES := $(wildcard *.asciidoc)
 HTML_PAGES := $(patsubst %.asciidoc, %.html, ${SOURCES})
-	RUN_ASCIIDOCTOR = asciidoctor -a source-highlighter=coderay -a stylesheet=asciidoctor.css -a linkcss -a icons=font -a compat-mode -a '!example-caption' -a last-update-label='License: Creative Commons <a href="https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode">CC-BY-NC-ND</a>. Last updated:'
+TESTS := $(patsubst %.asciidoc, test_%, ${SOURCES})
+
+RUN_ASCIIDOCTOR = asciidoctor -a source-highlighter=coderay -a stylesheet=asciidoctor.css -a linkcss -a icons=font -a compat-mode -a '!example-caption' -a last-update-label='License: Creative Commons <a href="https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode">CC-BY-NC-ND</a>. Last updated:'
 RUN_OREILLY_FLAVOURED_ASCIIDOCTOR = ./asciidoc/asciidoctor/bin/asciidoctor -v --trace -d book --safe -b htmlbook --template-dir ./asciidoc/asciidoctor-htmlbook/htmlbook 
 
+export PYTHONHASHSEED = 0
+export PYTHONDONTWRITEBYTECODE = 1
+export MOZ_HEADLESS = 1
+export TMPDIR := $(HOME)/snap/firefox/common/tmp
+
+$(TMPDIR):
+	make -p $(TMPDIR)
+
 book.html: $(SOURCES)
 
-build: $(HTML_PAGES)
+build: $(HTML_PAGES) $(TMPDIR)
 
 test: build
 	git submodule init
-	python3 update_source_repo.py
-	PYTHONHASHSEED=0 PYTHONDONTWRITEBYTECODE=1 \
+	python tests/update_source_repo.py
 	./run_all_tests.sh
 
+testall: build
+	pytest --tb=short --color=yes --numprocesses=auto tests/test_chapter_*
+
+testall4: build
+	pytest --tb=short --color=yes --numprocesses=4 tests/test_chapter_*
+
 %.html: %.asciidoc
 	$(RUN_ASCIIDOCTOR) $<
 
@@ -21,12 +36,10 @@ oreilly.%.asciidoc: %.asciidoc
 
 
 test_%: %.html
-	PYTHONHASHSEED=0 PYTHONDONTWRITEBYTECODE=1 MOZ_HEADLESS=1 \
-	py.test -s --tb=short ./tests/$@.py
+	pytest -s --tb=short ./tests/$@.py
 
 silent_test_%: %.html
-	python3 update_source_repo.py $(subst silent_test_chapter_,,$@)
-	PYTHONHASHSEED=0 PYTHONDONTWRITEBYTECODE=1 MOZ_HEADLESS=1 \
+	python tests/update_source_repo.py $(subst silent_test_chapter_,,$@)
 	py.test --tb=short ./tests/$(subst silent_,,$@).py
 
 clean:

appendix_bdd.asciidoc

@@ -396,8 +396,8 @@ formatting syntax:
 @when('I create a list with first item "{first_item_text}"')
 def create_a_list(context, first_item_text):
     context.browser.get(context.get_url('/'))
-    context.browser.find_element_by_id('id_text').send_keys(first_item_text)
-    context.browser.find_element_by_id('id_text').send_keys(Keys.ENTER)
+    context.browser.find_element(By.ID, 'id_text').send_keys(first_item_text)
+    context.browser.find_element(By.ID, 'id_text').send_keys(Keys.ENTER)
     wait_for_list_item(context, first_item_text)
 ----
 ====
@@ -445,8 +445,8 @@ from selenium.webdriver.common.keys import Keys
 
 @when('I add an item "{item_text}"')
 def add_an_item(context, item_text):
-    context.browser.find_element_by_id('id_text').send_keys(item_text)
-    context.browser.find_element_by_id('id_text').send_keys(Keys.ENTER)
+    context.browser.find_element(By.ID, 'id_text').send_keys(item_text)
+    context.browser.find_element(By.ID, 'id_text').send_keys(Keys.ENTER)
     wait_for_list_item(context, item_text)
 
 
@@ -707,7 +707,7 @@ class ListPage(object):
 
 
     def get_item_input_box(self):
-        return self.test.browser.find_element_by_id('id_text')
+        return self.test.browser.find_element(By.ID, 'id_text')
 ----
 ====
 

chapter_01.asciidoc

@@ -66,9 +66,9 @@ making a few little goat noises as you do it, it may help:
 from selenium import webdriver
 
 browser = webdriver.Firefox()
-browser.get('http://localhost:8000')
+browser.get("http://localhost:8000")
 
-assert 'Django' in browser.title
+assert "Django" in browser.title
 ----
 ====
 
@@ -93,13 +93,13 @@ Let's try running it:
 ----
 $ pass:quotes[*python functional_tests.py*]
 Traceback (most recent call last):
-  File "functional_tests.py", line 4, in <module>
-    browser.get('http://localhost:8000')
-  File ".../selenium/webdriver/remote/webdriver.py", line 333, in get
-    self.execute(Command.GET, {'url': url})
-  File ".../selenium/webdriver/remote/webdriver.py", line 321, in execute
+  File "...python-tdd-book/functional_tests.py", line 4, in <module>
+    browser.get("http://localhost:8000")
+  File ".../selenium/webdriver/remote/webdriver.py", line 449, in get
+    self.execute(Command.GET, {"url": url})
+  File ".../selenium/webdriver/remote/webdriver.py", line 440, in execute
     self.error_handler.check_response(response)
-  File ".../selenium/webdriver/remote/errorhandler.py", line 242, in
+  File ".../selenium/webdriver/remote/errorhandler.py", line 245, in
 check_response
     raise exception_class(message, screen, stacktrace)
 selenium.common.exceptions.WebDriverException: Message: Reached error page: abo
@@ -335,10 +335,10 @@ Changes to be committed:
         new file:   functional_tests.py
         new file:   manage.py
         new file:   superlists/__init__.py
-        new file:   superlists/__pycache__/__init__.cpython-37.pyc
-        new file:   superlists/__pycache__/settings.cpython-37.pyc
-        new file:   superlists/__pycache__/urls.cpython-37.pyc
-        new file:   superlists/__pycache__/wsgi.cpython-37.pyc
+        new file:   superlists/__pycache__/__init__.cpython-311.pyc
+        new file:   superlists/__pycache__/settings.cpython-311.pyc
+        new file:   superlists/__pycache__/urls.cpython-311.pyc
+        new file:   superlists/__pycache__/wsgi.cpython-311.pyc
         new file:   superlists/settings.py
         new file:   superlists/urls.py
         new file:   superlists/wsgi.py
@@ -352,10 +352,10 @@ commit those.  Let's remove them from Git and add them to
 [subs="specialcharacters,macros"]
 ----
 $ pass:[<strong>git rm -r --cached superlists/__pycache__</strong>]
-rm 'superlists/__pycache__/__init__.cpython-37.pyc'
-rm 'superlists/__pycache__/settings.cpython-37.pyc'
-rm 'superlists/__pycache__/urls.cpython-37.pyc'
-rm 'superlists/__pycache__/wsgi.cpython-37.pyc'
+rm 'superlists/__pycache__/__init__.cpython-311.pyc'
+rm 'superlists/__pycache__/settings.cpython-311.pyc'
+rm 'superlists/__pycache__/urls.cpython-311.pyc'
+rm 'superlists/__pycache__/wsgi.cpython-311.pyc'
 $ pass:[<strong>echo "__pycache__" >> .gitignore</strong>]
 $ pass:[<strong>echo "*.pyc" >> .gitignore</strong>]
 ----

chapter_02_unittest.asciidoc

@@ -78,10 +78,10 @@ browser = webdriver.Firefox()
 
 # Edith has heard about a cool new online to-do app. She goes
 # to check out its homepage
-browser.get('http://localhost:8000')
+browser.get("http://localhost:8000")
 
 # She notices the page title and header mention to-do lists
-assert 'To-Do' in browser.title
+assert "To-Do" in browser.title
 
 # She is invited to enter a to-do item straight away
 
@@ -164,8 +164,8 @@ And then, in another shell, run the tests:
 ----
 $ pass:quotes[*python functional_tests.py*]
 Traceback (most recent call last):
-  File "functional_tests.py", line 10, in <module>
-    assert 'To-Do' in browser.title
+  File "...python-tdd-book/functional_tests.py", line 10, in <module>
+    assert "To-Do" in browser.title
 AssertionError
 ----
 
@@ -193,7 +193,7 @@ something like:
 [role="skipme"]
 [source,python]
 ----
-assert 'To-Do' in browser.title, "Browser title was " + browser.title
+assert "To-Do" in browser.title, "Browser title was " + browser.title
 ----
 
 And we could also use a `try/finally` to clean up the old Firefox window. But
@@ -209,27 +209,28 @@ use that!  In [keep-together]#_functional_tests.py_#:
 from selenium import webdriver
 import unittest
 
-class NewVisitorTest(unittest.TestCase):  #<1>
 
-    def setUp(self):  #<3>
+class NewVisitorTest(unittest.TestCase):  # <1>
+    def setUp(self):  # <3>
         self.browser = webdriver.Firefox()
 
-    def tearDown(self):  #<3>
+    def tearDown(self):  # <3>
         self.browser.quit()
 
-    def test_can_start_a_list_and_retrieve_it_later(self):  #<2>
+    def test_can_start_a_list_and_retrieve_it_later(self):  # <2>
         # Edith has heard about a cool new online to-do app. She goes
         # to check out its homepage
-        self.browser.get('http://localhost:8000')
+        self.browser.get("http://localhost:8000")
 
         # She notices the page title and header mention to-do lists
-        self.assertIn('To-Do', self.browser.title)  #<4>
-        self.fail('Finish the test!')  #<5>
+        self.assertIn("To-Do", self.browser.title)  # <4>
+        self.fail("Finish the test!")  # <5>
 
         # She is invited to enter a to-do item straight away
         [...rest of comments as before]
 
-if __name__ == '__main__':  #<6>
+
+if __name__ == "__main__":  # <6>
     unittest.main()
 ----
 ====
@@ -283,13 +284,15 @@ Let's try it!
 $ pass:quotes[*python functional_tests.py*]
 F
 ======================================================================
-FAIL: test_can_start_a_list_and_retrieve_it_later (__main__.NewVisitorTest)
+FAIL: test_can_start_a_list_and_retrieve_it_later
+(__main__.NewVisitorTest.test_can_start_a_list_and_retrieve_it_later)
  ---------------------------------------------------------------------
 Traceback (most recent call last):
-  File "functional_tests.py", line 18, in
+  File "...python-tdd-book/functional_tests.py", line 18, in
 test_can_start_a_list_and_retrieve_it_later
-    self.assertIn('To-Do', self.browser.title)
-AssertionError: 'To-Do' not found in 'Welcome to Django'
+    self.assertIn("To-Do", self.browser.title)
+AssertionError: 'To-Do' not found in 'The install worked successfully!
+Congratulations!'
 
  ---------------------------------------------------------------------
 Ran 1 test in 1.747s
@@ -333,10 +336,10 @@ index d333591..b0f22dc 100644
 +import unittest
 
 -browser = webdriver.Firefox()
--browser.get('http://localhost:8000')
+-browser.get("http://localhost:8000")
 +class NewVisitorTest(unittest.TestCase):
 
--assert 'Django' in browser.title
+-assert "Django" in browser.title
 +    def setUp(self):
 +        self.browser = webdriver.Firefox()
 +