good progress, get tessts running in ci

Author: hjwp

.github/workflows/tests.yml

@@ -32,6 +32,7 @@ jobs:
           test_chapter_16_javascript,
           test_chapter_18_spiking_custom_auth,
           test_chapter_19_mocking,
+          test_chapter_20_fixtures_and_wait_decorator,
           unit-test
         ]
 

chapter_20_fixtures_and_wait_decorator.asciidoc

@@ -1,58 +1,49 @@
 [[chapter_20_fixtures_and_wait_decorator]]
-Test Fixtures and a Decorator for [keep-together]#Explicit Waits#
------------------------------------------------------------------
+== Test Fixtures and a Decorator for [keep-together]#Explicit Waits#
 
-.Warning, Chapter Not Updated.
+.Warning, Chapter Update in progress
 *******************************************************************************
-🚧 Warning, this Chapter is the 2e version, and uses Django 1.11
+🚧 Warning, this Chapter is being updates for Django 4 + Python 3.12.
 
-This chapter and all the following ones are the second edition versions, so they still use Django 1.11, Python 3.8, and so on.
-
-To follow along with this chapter, it’s probably easiest to reset your code to match my example code as it was in the 2e, by resetting to: https://github.com/hjwp/book-example/tree/chapter_19_mocking
-
-And you should also probably delete and re-create your virtualenv with * Python 3.8 or 3.9 * and Django 1.11 (pip install "django <2")
-
-Alternatively, you can muddle through and try and figure out how to make things work with Django 4 etc, but be aware that the listings below won’t be quite right.
+Some code listings may be inconsistent.
 *******************************************************************************
 
-((("authentication", "skipping in FTs")))Now
-that we have a functional authentication system, we want to use it to
-identify users, and be able to show them all the lists they have created.
+((("authentication", "skipping in FTs")))
+Now that we have a functional authentication system, we want to use it to identify users,
+and be able to show them all the lists they have created.
 
-To do that, we're going to have to write FTs that have a logged-in user. Rather
-than making each test go through the (time-consuming) login email dance, we
-want to be able to skip that part.
+To do that, we're going to have to write FTs that have a logged-in user.
+Rather than making each test go through the (time-consuming) login email dance,
+we want to be able to skip that part.
 
 
-
-This is about separation of concerns.  Functional tests aren't like unit tests,
-in that they don't usually have a single assertion. But, conceptually, they
-should be testing a single thing.  There's no need for every single FT to test
-the login/logout mechanisms. If we can figure out a way to "cheat" and skip
-that part, we'll spend less time waiting for duplicated test paths.
+This is about separation of concerns.
+Functional tests aren't like unit tests,
+in that they don't usually have a single assertion.
+But, conceptually, they should be testing a single thing.
+There's no need for every single FT to test the login/logout mechanisms.
+If we can figure out a way to "cheat" and skip that part,
+we'll spend less time waiting for duplicated test paths.
 
 TIP: Don't overdo de-duplication in FTs.  One of the benefits of an FT is that
      it can catch strange and unpredictable interactions between different
      parts of your application.
 
 
-NOTE: This chapter has only just been rewritten for the new edition, so let me
-    know via [email protected] if you spot any problems or have any
-    suggestions for improvement!
-
-
-Skipping the Login Process by Pre-creating a Session
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+=== Skipping the Login Process by Pre-creating a Session
 
 
-((("sessions, pre-creating", id="sessions20")))((("login process, skipping", seealso="authentication")))((("cookies")))It's
-quite common for a user to return to a site and still have a cookie, which
-means they are "pre-authenticated", so this isn't an unrealistic cheat at all.
+((("sessions, pre-creating", id="sessions20")))
+((("login process, skipping", seealso="authentication")))
+((("cookies")))
+It's quite common for a user to return to a site and still have a cookie,
+which means they are "pre-authenticated",
+so this isn't an unrealistic cheat at all.
 Here's how you can set it up:
 
 [role="sourcecode"]
-.functional_tests/test_my_lists.py
+.src/functional_tests/test_my_lists.py
 ====
 [source,python]
 ----
@@ -138,7 +129,7 @@ in a [keep-together]#`./manage.py`# `shell` if you like:
 [role="skipme small-code"]
 [subs="specialcharacters,macros"]
 ----
-$ pass:quotes[*python manage.py shell*]
+$ pass:quotes[*python src/manage.py shell*]
 [...]
 In [1]: from django.contrib.sessions.models import Session
 
@@ -172,26 +163,23 @@ to pull them up into `FunctionalTest`. We'll also tweak them slightly so that
 they can take an arbitrary email address as a parameter:
 
 [role="sourcecode"]
-.functional_tests/base.py (ch18l002)
+.src/functional_tests/base.py (ch20l002)
 ====
 [source,python]
 ----
 class FunctionalTest(StaticLiveServerTestCase):
     [...]
 
     def wait_to_be_logged_in(self, email):
-        self.wait_for(
-            lambda: self.browser.find_element_by_link_text('Log out')
-        )
-        navbar = self.browser.find_element_by_css_selector('.navbar')
+        self.wait_for(lambda: self.browser.find_element(By.LINK_TEXT, "Log out"))
+        navbar = self.browser.find_element(By.CSS_SELECTOR, ".navbar")
         self.assertIn(email, navbar.text)
 
-
     def wait_to_be_logged_out(self, email):
         self.wait_for(
-            lambda: self.browser.find_element_by_name('email')
+            lambda: self.browser.find_element(By.CSS_SELECTOR, "input[name=email]")
         )
-        navbar = self.browser.find_element_by_css_selector('.navbar')
+        navbar = self.browser.find_element(By.CSS_SELECTOR, ".navbar")
         self.assertNotIn(email, navbar.text)
 ----
 ====
@@ -211,7 +199,7 @@ First we use them in 'test_login.py':
 
 
 [role="sourcecode"]
-.functional_tests/test_login.py (ch18l003)
+.src/functional_tests/test_login.py (ch20l003)
 ====
 [source,python]
 ----
@@ -221,7 +209,7 @@ First we use them in 'test_login.py':
         self.wait_to_be_logged_in(email=TEST_EMAIL)
 
         # Now she logs out
-        self.browser.find_element_by_link_text('Log out').click()
+        self.browser.find_element(By.LINK_TEXT, "Log out").click()
 
         # She is logged out
         self.wait_to_be_logged_out(email=TEST_EMAIL)
@@ -233,7 +221,7 @@ Just to make sure we haven't broken anything, we rerun the login test:
 
 [subs="specialcharacters,macros"]
 ----
-$ pass:quotes[*python manage.py test functional_tests.test_login*]
+$ pass:quotes[*python src/manage.py test functional_tests.test_login*]
 [...]
 OK
 ----
@@ -242,12 +230,12 @@ And now we can write a placeholder for the "My Lists" test, to see if
 our pre-authenticated session creator really does work:
 
 [role="sourcecode"]
-.functional_tests/test_my_lists.py (ch18l004)
+.src/functional_tests/test_my_lists.py (ch20l004)
 ====
 [source,python]
 ----
     def test_logged_in_users_lists_are_saved_as_my_lists(self):
-        email = '[email protected]'
+        email = "[email protected]"
         self.browser.get(self.live_server_url)
         self.wait_to_be_logged_out(email)
 
@@ -262,7 +250,7 @@ That gets us:
 
 [subs="specialcharacters,macros"]
 ----
-$ pass:quotes[*python manage.py test functional_tests.test_my_lists*]
+$ pass:quotes[*python src/manage.py test functional_tests.test_my_lists*]
 [...]
 OK
 ----
@@ -328,28 +316,26 @@ pass:[<code>wait_for_row_&#x200b;in_list_table</code>] and the inline `self.wait
 
 
 [role="sourcecode"]
-.functional_tests/base.py (ch18l005)
+.src/functional_tests/base.py (ch20l005)
 ====
 [source,python]
 ----
     @wait
     def wait_for_row_in_list_table(self, row_text):
-        table = self.browser.find_element_by_id('id_list_table')
-        rows = table.find_elements_by_tag_name('tr')
+        table = self.browser.find_element(By.ID, "id_list_table")
+        rows = table.find_elements(By.TAG_NAME, "tr")
         self.assertIn(row_text, [row.text for row in rows])
 
-
     @wait
     def wait_to_be_logged_in(self, email):
-        self.browser.find_element_by_link_text('Log out')
-        navbar = self.browser.find_element_by_css_selector('.navbar')
+        self.browser.find_element(By.LINK_TEXT, "Log out")
+        navbar = self.browser.find_element(By.CSS_SELECTOR, ".navbar")
         self.assertIn(email, navbar.text)
 
-
     @wait
     def wait_to_be_logged_out(self, email):
-        self.browser.find_element_by_name('email')
-        navbar = self.browser.find_element_by_css_selector('.navbar')
+        self.browser.find_element(By.CSS_SELECTOR, "input[name=email]")
+        navbar = self.browser.find_element(By.CSS_SELECTOR, ".navbar")
         self.assertNotIn(email, navbar.text)
 ----
 ====
@@ -371,7 +357,7 @@ timeout occurs.  Here's a first cut:
 
 
 [role="sourcecode"]
-.functional_tests/base.py (ch18l006)
+.src/functional_tests/base.py (ch20l006)
 ====
 [source,python]
 ----
@@ -409,7 +395,7 @@ That's 'almost' right, but not quite;  try running it?
 
 [subs="specialcharacters,macros"]
 ----
-$ pass:quotes[*python manage.py test functional_tests.test_my_lists*]
+$ pass:quotes[*python src/manage.py test functional_tests.test_my_lists*]
 [...]
     self.wait_to_be_logged_out(email)
 TypeError: modified_fn() takes 0 positional arguments but 2 were given
@@ -422,13 +408,13 @@ that have [keep-together]#arguments#:
 
 
 [role="sourcecode currentcontents"]
-.functional_tests/base.py
+.src/functional_tests/base.py
 ====
 [source,python]
 ----
     @wait
     def wait_to_be_logged_in(self, email):
-        self.browser.find_element_by_link_text('Log out')
+        self.browser.find_element(By.LINK_TEXT, "Log out").click()
 ----
 ====
 
@@ -445,7 +431,7 @@ arguments"], apparently (I only just learned that):
 
 
 [role="sourcecode"]
-.functional_tests/base.py (ch18l007)
+.src/functional_tests/base.py (ch20l007)
 ====
 [source,python]
 ----
@@ -476,7 +462,7 @@ is that our decorator now works:
 
 [subs="specialcharacters,macros"]
 ----
-$ pass:quotes[*python manage.py test functional_tests.test_my_lists*]
+$ pass:quotes[*python src/manage.py test functional_tests.test_my_lists*]
 [...]
 OK
 ----
@@ -487,7 +473,7 @@ for our `self.wait_for` helper as well!  Like this:
 
 
 [role="sourcecode"]
-.functional_tests/base.py (ch18l008)
+.src/functional_tests/base.py (ch20l008)
 ====
 [source,python]
 ----