Merge remote-tracking branch 'atlas/main'

Author: hjwp

acknowledgments.asciidoc

@@ -79,6 +79,7 @@ and make it up to you in any way I can.
 And finally thanks to you, the latest reader, for deciding to check out
 the book!  I hope you enjoy it.
 
+[role="pagebreak-before less_space"]
 === Additional Thanks for the Second Edition
 
 Thanks to my wonderful editor for the second edition, Nan Barber, and to

ai_preface.asciidoc

@@ -68,7 +68,7 @@ when working with AI.
 
 === Leaky Abstractions and the Importance of Experience
 
-https://www.joelonsoftware.com/2002/11/11/the-law-of-leaky-abstractions/["Leaky abstractions"]
+https://oreil.ly/PgWjL["Leaky abstractions"]
 are a diagnosis of a common problem in software development,
 whereby higher-level abstractions fail in subtle ways,
 and the complexities of the underlying system leak through.

appendix_IX_cheat_sheet.asciidoc

@@ -32,21 +32,16 @@ Relevant chapters:
 <<chapter_02_unittest>>,
 <<chapter_03_unit_test_first_view>>.
 
-
+[role="pagebreak-before less_space"]
 === The Basic TDD Workflow: Red/Green/Refactor
 
+[role="two-col"]
 * Red, Green, Refactor((("cheat sheet", "TDD workflow")))((("Test-Driven Development (TDD)", "overall process of")))
-
 * Double-loop TDD (<<Double-Loop-TDD-diagram2>>)
-
 * Triangulation
-
 * The scratchpad
-
 * "3 Strikes and Refactor"
-
 * "Working State to Working State"
-
 * "YAGNI"
 
 
@@ -68,9 +63,9 @@ Relevant chapters:
   Ensure your components work together: web server, static content, database.((("cheat sheet", "moving beyond dev-only testing")))
 
 * Build a production environment early, and automate deployment to it.
-    - PaaS vs. VPS
+    - PaaS versus VPS
     - Docker
-    - Ansible vs Terraform
+    - Ansible versus Terraform
 
 * Think through deployment pain points: the database, static files,
   dependencies, how to customise settings, and so on.
@@ -82,7 +77,7 @@ Relevant chapters:
 <<part2>>,
 <<chapter_25_CI>>.
 
-
+[role="pagebreak-before less_space"]
 === General Testing Best Practices
 
 * Each test should test one thing.((("cheat sheet", "testing best practices")))((("testing best practices")))
@@ -109,7 +104,7 @@ Relevant chapters:
 * Use explicit rather than implicit waits, and the interaction/wait pattern.
 
 * Avoid duplication of test code--helper methods in a base class and the
-  Page pattern are possible solutions.
+  page pattern are possible solutions.
 
 * Avoid double-testing functionality.
   If you have a test that covers a time-consuming process (e.g., login),
@@ -140,6 +135,6 @@ Be aware that integration tests will get slower and slower over time.
 Find ways to shift the bulk of your testing to unit tests
 as your project grows in size and complexity.
 
-Relevant chapters:
+Relevant chapter:
 <<chapter_27_hot_lava>>.
 

appendix_X_what_to_do_next.asciidoc

@@ -36,7 +36,7 @@ and compare how much faster they are than running against Postgres.
 Set it up so that your local machine uses SQLite for testing,
 but your CI server uses Postgres.
 
-Does any of your functionality actually depend on postgres-specific features?
+Does any of your functionality actually depend on Postgres-specific features?
 What should you do then?
 
 
@@ -120,7 +120,7 @@ without needing to refresh the page...
 
 `pytest` lets you write unit tests with less boilerplate.
 Try converting some of your unit tests to using 'py.test'.
-You may need to use a plug-in to get it to play nicely with Django.
+You may need to use a plugin to get it to play nicely with Django.
 
 
 === Check Out coverage.py

appendix_bdd.asciidoc

@@ -62,7 +62,7 @@ In the Python world, we have a couple of equivalent test running tools,
 http://lettuce.it/[Lettuce] and http://pythonhosted.org/behave/[Behave].
 Of these, only Behave was compatible with Python 3 at the time of writing,
 so that's what we'll use.
-We'll also use a plug-in called
+We'll also use a plugin called
 https://pythonhosted.org/behave-django/[behave-django].
 
 

appendix_github_links.asciidoc

@@ -10,15 +10,15 @@ So, if you ever want to compare your code against mine,
 you can take a look at it there.
 
 Each chapter has its own branch named after it, like so:
-https://github.com/hjwp/book-example/tree/chapter_01
+https://github.com/hjwp/book-example/tree/chapter_01.
 
 Be aware that each branch contains all of the commits for that chapter,
 so its state represents the code at the 'end' of the chapter.
 
 === Full List of Links for Each Chapter
 
 |===
-| Chapter | Github Branch Name & Hyperlink
+| Chapter | GitHub branch name & hyperlink
 
 | <<chapter_01>>
 | https://github.com/hjwp/book-example/tree/chapter_01[chapter_01]
@@ -152,7 +152,7 @@ https://github.com/hjwp/book-example/archive/chapter_04_philosophy_and_refactori
 === Don't Let it Become a Crutch!
 
 Try not to sneak a peek at the answers unless you're really, really stuck.
-Like I said at the beginning of the <<chapter_03_unit_test_first_view>>,
+Like I said at the beginning of <<chapter_03_unit_test_first_view>>,
 there's a lot of value in debugging errors all by yourself,
 and in real life, there's no "harrys repo" to check against
 and find all the answers.

atlas.json

@@ -9,7 +9,6 @@
     "preface.asciidoc",
     "ai_preface.asciidoc",
     "pre-requisite-installations.asciidoc",
-    "video_plug.asciidoc",
     "acknowledgments.asciidoc",
     "part1.asciidoc",
     "chapter_01.asciidoc",

bibliography.asciidoc

@@ -9,8 +9,8 @@ and which I enthusiastically recommend.
 ++++
 <ul class="simplelist">
 <li>Kent Beck, <em>Test Driven Development: By Example</em>, Addison-Wesley</li>
-<li>Martin Fowler, <em>Refactoring_, Addison-Wesley</em></li>
-<li>Ross Anderson, <em>Security Engineering, Third Edition</em>, Addison-Wesley: https://www.cl.cam.ac.uk/archive/rja14/book.html</li>
+<li>Martin Fowler, <em>Refactoring, Addison-Wesley</em></li>
+<li>Ross Anderson, <em>Security Engineering, Third Edition</em>, Addison-Wesley: <em>https://www.cl.cam.ac.uk/archive/rja14/book.html</em></li>
 <li id="GOOSGBT">Steve Freeman and Nat Pryce, <em>Growing Object-Oriented Software Guided by Tests</em>, Addison-Wesley</li>
 <li>Hal Abelson, Jerry Sussman and Julie Sussman, <em>Structure and Interpretation of Computer Programs</em> (SICP), MIT Press</li>
 <li>Dave Farley, <em>Modern Software Engineering</em>,  Addison-Wesley</li>

book.asciidoc

@@ -14,7 +14,7 @@ include::praise.forbook.asciidoc[]
 include::preface.asciidoc[]
 include::ai_preface.asciidoc[]
 include::pre-requisite-installations.asciidoc[]
-include::video_plug.asciidoc[]
+//include::video_plug.asciidoc[]
 include::acknowledgments.asciidoc[]
 
 include::part1.forbook.asciidoc[]

chapter_01.asciidoc

@@ -113,6 +113,7 @@ UnknownError@chrome://remote/content/shared/webdriver/Errors.sys.mjs:530:5
 [...]
 ----
 
+[role="pagebreak-before"]
 You should see a browser window pop up trying to open _localhost:8000_,
 showing the "Unable to connect" error page.
 If you switch back to your console,
@@ -144,7 +145,7 @@ image::images/tdd3_0102.png["A pop-up window saying 'Firefox is trying to instal
 This happens when Firefox has automatically downloaded a new version,
 in the background.
 When Selenium tries to load a fresh Firefox session,
-it wants to install the latest version of its "geckodriver" plug-in.
+it wants to install the latest version of its "geckodriver" plugin.
 
 To resolve the issue, you have to close the Selenium browser window,
 go back to your main browser window
@@ -204,6 +205,7 @@ NOTE: Make sure your project folder looks exactly like this!
 
 The _superlists_ folder is intended for stuff that applies to the whole project--like _settings.py_, which is used to store global configuration information for the site.
 
+[role="pagebreak-before"]
 But the main thing to notice is _manage.py_.
 That's Django's Swiss Army knife,
 and one of the things it can do is run((("development server", "running with manage.py")))((("manage.py file", "running a development server"))) a development server.
@@ -273,7 +275,7 @@ image::images/tdd3_0103.png["Screenshot of Django Installed Successfully Screen"
 So many introductions to TDD ((("Roman numerals in examples")))use Roman numerals in their examples
 that it has become a running joke--I even started writing one myself.
 If you're curious, you can find it
-on https://github.com/hjwp/tdd-roman-numeral-calculator/[my GitHub page].
+on https://github.com/hjwp/tdd-roman-numeral-calculator[my GitHub page].
 
 Roman numerals, as an example, are both good and bad.
 It's a nice "toy" problem, reasonably limited in scope,
@@ -291,7 +293,7 @@ more like real life, and less like that of a toy project.
 
 *******************************************************************************
 
-
+[role="pagebreak-before less_space"]
 === Starting a Git Repository
 
 ((("Git", "starting repositories")))
@@ -332,9 +334,10 @@ $ *ls*
 db.sqlite3  functional_tests.py  manage.py  superlists
 
 $ *git init .*
-Initialised empty Git repository in ...goat-book/.git/
+Initialized empty Git repository in ...goat-book/.git/
 ----
 
+[role="pagebreak-before less_space"]
 .Setting the Default Branch Name in Git
 *******************************************************************************
 
@@ -353,7 +356,7 @@ hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
 hint: 'development'. The just-created branch can be renamed via this command:
 hint:
 hint: 	git branch -m <name>
-Initialised empty Git repository in ...goat-book/.git/
+Initialized empty Git repository in ...goat-book/.git/
 ----
 
 Consider following the advice and choosing an explicit default branch name.((("default branch name in Git")))((("Git", "default branch name, choosing")))
@@ -367,7 +370,7 @@ $ *git config --global init.defaultBranch main*
 # then let's re-create our git repo by deleting and starting again:
 $ *rm -rf .git*
 $ *git init .*
-Initialised empty Git repository in ...goat-book/.git/
+Initialized empty Git repository in ...goat-book/.git/
 ----
 
 *******************************************************************************
@@ -393,6 +396,7 @@ $ *echo "db.sqlite3" >> .gitignore*
 $ *echo ".venv" >> .gitignore*
 ----
 
+[role="pagebreak-before"]
 Next we can add the rest of the contents of the current "." folder:
 
 [subs="specialcharacters,macros"]
@@ -436,6 +440,7 @@ $ pass:[<strong>echo "__pycache__" >> .gitignore</strong>]
 $ pass:[<strong>echo "*.pyc" >> .gitignore</strong>]
 ----
 
+[role="pagebreak-before"]
 Now let's see where we are...
 
 
@@ -479,13 +484,14 @@ $ *git add .gitignore*
 $ *git commit*
 ----
 
+[role="pagebreak-before"]
 When you type `git commit`, it will pop up an editor window for you to write your commit message in.
 Mine looked like <<first_git_commit>>.footnote:[
 Did a strange terminal-based editor (the dreaded Vim) pop up and you had no idea what to do?
 Or did you see a message about account identity and `git config --global
 user.username`?
 Check out the Git manual and its
-http://git-scm.com/book/en/Customizing-Git-Git-Configuration[basic configuration section.]
+http://git-scm.com/book/en/Customizing-Git-Git-Configuration[basic configuration section].
 PS: To quit Vim, it's Esc, then `:q!`]
 
 [[first_git_commit]]