more listing fixes in 22

Author: hjwp

chapter_22_outside_in.asciidoc

@@ -386,6 +386,8 @@ Currently there's no place in our base template for us to put any new content.
 Also, the "My Lists" page doesn't need the new item form,
 so we'll put that into a block too, making it optional:
 
+
+
 [role="sourcecode"]
 .src/lists/templates/base.html (ch22l011-1)
 ====
@@ -442,6 +444,8 @@ so we'll put that into a block too, making it optional:
 Meanwhile, in _my_lists.html_ we override the `list_form`
 and say it should be empty...
 
+// TODO: proper commits for these
+
 [role="sourcecode"]
 .src/lists/templates/my_lists.html
 ====
@@ -540,18 +544,20 @@ In this case, the list owner:
 [source,python]
 ----
 from django.contrib.auth import get_user_model
+
 User = get_user_model()
 [...]
-class MyListsTest(TestCase):
 
+
+class MyListsTest(TestCase):
     def test_my_lists_url_renders_my_lists_template(self):
         [...]
 
     def test_passes_correct_owner_to_template(self):
-        User.objects.create(email='[email protected]')
-        correct_user = User.objects.create(email='[email protected]')
-        response = self.client.get('/lists/users/[email protected]/')
-        self.assertEqual(response.context['owner'], correct_user)
+        User.objects.create(email="[email protected]")
+        correct_user = User.objects.create(email="[email protected]")
+        response = self.client.get("/lists/users/[email protected]/")
+        self.assertEqual(response.context["owner"], correct_user)
 ----
 ====
 
@@ -569,12 +575,14 @@ So:
 [source,python]
 ----
 from django.contrib.auth import get_user_model
+
 User = get_user_model()
 [...]
 
+
 def my_lists(request, email):
     owner = User.objects.get(email=email)
-    return render(request, 'my_lists.html', {'owner': owner})
+    return render(request, "my_lists.html", {"owner": owner})
 ----
 ====
 
@@ -588,7 +596,7 @@ the previous test. We just need to add a user for it as well:
 [source,python]
 ----
     def test_my_lists_url_renders_my_lists_template(self):
-        User.objects.create(email='[email protected]')
+        User.objects.create(email="[email protected]")
         [...]
 ----
 ====
@@ -666,7 +674,8 @@ But it won't actually work, because we don't know how to save a list owner yet:
 
 
 ----
-    self.assertEqual(list_.owner, user)
+    self.assertEqual(new_list.owner, user)
+                     ^^^^^^^^^^^^^^
 AttributeError: 'List' object has no attribute 'owner'
 ----
 
@@ -722,30 +731,31 @@ Let's write a test for that:
 
 
 [role="sourcecode"]
-.lists/tests/test_models.py (ch22l018)
+.src/lists/tests/test_models.py (ch22l018)
 ====
 [source,python]
 ----
 from django.contrib.auth import get_user_model
+
 User = get_user_model()
 [...]
 
-class ListModelTest(TestCase):
 
+class ListModelTest(TestCase):
     def test_get_absolute_url(self):
         [...]
 
     def test_lists_can_have_owners(self):
-        user = User.objects.create(email='[email protected]')
-        list_ = List.objects.create(owner=user)
-        self.assertIn(list_, user.list_set.all())
+        user = User.objects.create(email="[email protected]")
+        mylist = List.objects.create(owner=user)
+        self.assertIn(mylist, user.list_set.all())
 ----
 ====
 
 And that gives us a new unit test failure:
 
 ----
-    list_ = List.objects.create(owner=user)
+    mylist = List.objects.create(owner=user)
     [...]
 TypeError: 'owner' is an invalid keyword argument for this function
 ----
@@ -768,7 +778,7 @@ that too:
 
 
 [role="sourcecode"]
-.lists/tests/test_models.py (ch22l020)
+.src/lists/tests/test_models.py (ch22l020)
 ====
 [source,python]
 ----
@@ -780,7 +790,7 @@ that too:
 The correct implementation is this:
 
 [role="sourcecode"]
-.lists/models.py  (ch22l021)
+.src/lists/models.py  (ch22l021)
 ====
 [source,python]
 ----
@@ -845,7 +855,7 @@ Django represents users using a class called `AnonymousUser`, whose
 
 
 [role="sourcecode"]
-.lists/views.py (ch22l023)
+.src/lists/views.py (ch22l023)
 ====
 [source,python]
 ----
@@ -891,7 +901,7 @@ which wanted to be able to access a list "name" based on the text of
 its first item:
 
 [role="sourcecode"]
-.lists/tests/test_models.py (ch19l024)
+.src/lists/tests/test_models.py (ch19l024)
 ====
 [source,python]
 ----
@@ -905,7 +915,7 @@ its first item:
 
 
 [role="sourcecode"]
-.lists/models.py (ch19l025)
+.src/lists/models.py (ch19l025)
 ====
 [source,python]
 ----

tests/test_chapter_22_outside_in.py

@@ -6,30 +6,32 @@
 
 
 class Chapter19Test(ChapterTest):
-    chapter_name = 'chapter_22_outside_in'
-    previous_chapter = 'chapter_21_server_side_debugging'
+    chapter_name = "chapter_22_outside_in"
+    previous_chapter = "chapter_21_server_side_debugging"
 
     def test_listings_and_commands_and_output(self):
         self.parse_listings()
-        #self.prep_virtualenv()
+        # self.prep_virtualenv()
 
         # sanity checks
-        self.assertEqual(self.listings[0].type, 'code listing with git ref')
-        self.assertEqual(self.listings[1].type, 'code listing with git ref')
-        self.assertEqual(self.listings[3].type, 'code listing currentcontents')
+        self.assertEqual(self.listings[0].type, "code listing with git ref")
+        self.assertEqual(self.listings[1].type, "code listing with git ref")
+        self.assertEqual(self.listings[3].type, "code listing currentcontents")
 
         # skips
-        #self.skip_with_check(22, 'switch back to master') # comment
+        # self.skip_with_check(22, 'switch back to master') # comment
 
         self.start_with_checkout()
         self.prep_database()
 
         # hack fast-forward
         if os.environ.get("SKIP"):
-            self.pos = 53
-            self.sourcetree.run_command('git checkout {}'.format(
-                self.sourcetree.get_commit_spec('ch19l025')
-            ))
+            self.pos = 28
+            self.sourcetree.run_command(
+                "git checkout {}".format(
+                    self.sourcetree.get_commit_spec("ch19l011"),
+                )
+            )
 
         while self.pos < len(self.listings):
             print(self.pos, self.listings[self.pos].type)
@@ -39,5 +41,5 @@ def test_listings_and_commands_and_output(self):
         self.check_final_diff(ignore=["moves", "Generated by Django 1.11"])
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     unittest.main()