Merge pull request #261 from hjwp/tests-16

Enable tests for chapter 16

Author: hjwp

.github/workflows/tests.yml

@@ -28,11 +28,13 @@ jobs:
           test_chapter_12_organising_test_files,
           test_chapter_13_database_layer_validation,
           test_chapter_14_simple_form,
+          # test_chapter_15_advanced_forms,
+          test_chapter_16_javascript,
           unit-test
         ]
     steps:
       - uses: actions/checkout@v4
       - id: foo
-        uses: hjwp/github-actions@v6
+        uses: hjwp/github-actions@v8
         with:
           test_chapter: ${{ matrix.test_chapter }}

.gitmodules

@@ -73,12 +73,6 @@
 [submodule "tests/testrepo"]
     path = tests/testrepo
     url = [email protected]:hjwp/booktesttestrepo.git
-[submodule "asciidoc/asciidoctor"]
-	path = asciidoc/asciidoctor
-	url = https://github.com/asciidoctor/asciidoctor.git
-[submodule "asciidoc/asciidoctor-htmlbook"]
-	path = asciidoc/asciidoctor-htmlbook
-	url = https://github.com/oreillymedia/asciidoctor-htmlbook.git
 [submodule "source/appendix_VI_rest_api_backend/superlists"]
 	path = source/appendix_rest_api/superlists
 	url = [email protected]:hjwp/book-example.git

Makefile

@@ -5,7 +5,6 @@ HTML_PAGES := $(patsubst %.asciidoc, %.html, ${SOURCES})
 TESTS := $(patsubst %.asciidoc, test_%, ${SOURCES})
 
 RUN_ASCIIDOCTOR = asciidoctor -a source-highlighter=pygments -a pygments-style=default -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
@@ -29,10 +28,6 @@ part%.forbook.asciidoc: part%.asciidoc
 
 
 
-.PHONY: oreilly.%.asciidoc
-oreilly.%.asciidoc: %.asciidoc
-	$(RUN_OREILLY_FLAVOURED_ASCIIDOCTOR) $(subst oreilly.,,$@)
-
 book.html: part1.forbook.asciidoc
 book.html: part2.forbook.asciidoc
 book.html: part3.forbook.asciidoc

asciidoc/asciidoctor

@@ -207,7 +207,7 @@ at the bottom of our _base.html_ template:
 [role="sourcecode"]
 .src/lists/templates/base.html (ch16l004)
 ====
-[source,javascript]
+[source,html]
 ----
     </div>
 
@@ -400,7 +400,7 @@ src/lists/static/tests
         ├── jasmine.js
         └── jasmine_favicon.png
 
-3 directories, 9 files
+2 directories, 9 files
 ----
 
 We need to go edit the _SpecRunner.html_ file

asciidoc/asciidoctor-htmlbook

@@ -35,7 +35,6 @@
 </div>"""
 
 
-
 SERVER_COMMAND = """<div class="listingblock server-commands">
 <div class="content">
 <pre><code>elspeth@server:$ <strong>sudo do stuff</strong></code></pre>
@@ -70,14 +69,14 @@
 </pre></div></div></div>"""
 
 
-COMMAND_MADE_WITH_ATS="""
+COMMAND_MADE_WITH_ATS = """
 <div class="listingblock">
 <div class="content">
 <pre><code>$ <strong>grep id_new_item functional_tests/tests/test*</strong></code></pre>
 </div></div>
 """
 
-OUTPUT_WITH_SKIPME="""
+OUTPUT_WITH_SKIPME = """
 <div class="listingblock skipme">
 <div class="content"><div class="highlight"><pre><span class="k">try</span><span class="p">:</span>
     <span class="n">item</span><span class="o">.</span><span class="n">save</span><span class="p">()</span>
@@ -166,33 +165,28 @@
 
 
 CODE_LISTING_WITH_ASCIIDOCTOR_CALLOUTS = """
-<div class="listingblock sourcecode">
-<div class="title">lists/static/tests/tests.html</div>
+<div class="exampleblock sourcecode">
+<div class="title">src/lists/templates/base.html (ch16l004)</div>
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="html">    <span class="tag">&lt;div</span> <span class="attribute-name">id</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">qunit-fixture</span><span class="delimiter">&quot;</span></span><span class="tag">&gt;</span><span class="tag">&lt;/div&gt;</span>
-
-    <span class="tag">&lt;form&gt;</span>  <i class="conum" data-value="1"></i><b>(1)</b>
-        <span class="tag">&lt;input</span> <span class="attribute-name">name</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">text</span><span class="delimiter">&quot;</span></span> <span class="tag">/&gt;</span>
-        <span class="tag">&lt;div</span> <span class="attribute-name">class</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">has-error</span><span class="delimiter">&quot;</span></span><span class="tag">&gt;</span>Error text<span class="tag">&lt;/div&gt;</span>
-    <span class="tag">&lt;/form&gt;</span>
-
-    <span class="tag">&lt;script</span> <span class="attribute-name">src</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">http://code.jquery.com/jquery.min.js</span><span class="delimiter">&quot;</span></span><span class="tag">&gt;</span><span class="tag">&lt;/script&gt;</span>
-    <span class="tag">&lt;script</span> <span class="attribute-name">src</span>=<span class="string"><span class="delimiter">&quot;</span><span class="content">qunit.js</span><span class="delimiter">&quot;</span></span><span class="tag">&gt;</span><span class="tag">&lt;/script&gt;</span>
-    <span class="tag">&lt;script&gt;</span>
-<span class="inline"><span class="comment">/*global $, test, equal */</span>
-
-test(<span class="string"><span class="delimiter">&quot;</span><span class="content">smoke test</span><span class="delimiter">&quot;</span></span>, <span class="keyword">function</span> () {
-    equal(<span class="predefined">$</span>(<span class="string"><span class="delimiter">'</span><span class="content">.has-error</span><span class="delimiter">'</span></span>).is(<span class="string"><span class="delimiter">'</span><span class="content">:visible</span><span class="delimiter">'</span></span>), <span class="predefined-constant">true</span>);  <i class="conum" data-value="2"></i><b>(2)</b> <i class="conum" data-value="3"></i><b>(3)</b>
-    <span class="predefined">$</span>(<span class="string"><span class="delimiter">'</span><span class="content">.has-error</span><span class="delimiter">'</span></span>).hide();  <i class="conum" data-value="4"></i><b>(4)</b>
-    equal(<span class="predefined">$</span>(<span class="string"><span class="delimiter">'</span><span class="content">.has-error</span><span class="delimiter">'</span></span>).is(<span class="string"><span class="delimiter">'</span><span class="content">:visible</span><span class="delimiter">'</span></span>), <span class="predefined-constant">false</span>);  <i class="conum" data-value="5"></i><b>(5)</b>
-});</span>
-
-    <span class="tag">&lt;/script&gt;</span></code></pre>
+<div class="listingblock">
+<div class="content">
+<pre class="pygments highlight"><code data-lang="html"><span></span>    <span class="tok-p">&lt;/</span><span class="tok-nt">div</span><span class="tok-p">&gt;</span>
+
+    <span class="tok-p">&lt;</span><span class="tok-nt">script</span><span class="tok-p">&gt;</span>
+<span class="tok-w">      </span><span class="tok-kd">const</span><span class="tok-w"> </span><span class="tok-nx">textInput</span><span class="tok-w"> </span><span class="tok-o">=</span><span class="tok-w"> </span><span class="tok-nb">document</span><span class="tok-p">.</span><span class="tok-nx">querySelector</span><span class="tok-p">(</span><span class="tok-s2">&quot;#id_text&quot;</span><span class="tok-p">);</span><span class="tok-w">  </span><i class="conum" data-value="1"></i><b>(1)</b>
+<span class="tok-w">      </span><span class="tok-nx">textInput</span><span class="tok-p">.</span><span class="tok-nx">oninput</span><span class="tok-w"> </span><span class="tok-o">=</span><span class="tok-w"> </span><span class="tok-p">()</span><span class="tok-w"> </span><span class="tok-p">=&gt;</span><span class="tok-w"> </span><span class="tok-p">{</span><span class="tok-w">  </span><i class="conum" data-value="2"></i><b>(2)</b> <i class="conum" data-value="3"></i><b>(3)</b>
+<span class="tok-w">        </span><span class="tok-kd">const</span><span class="tok-w"> </span><span class="tok-nx">errorMsg</span><span class="tok-w"> </span><span class="tok-o">=</span><span class="tok-w"> </span><span class="tok-nb">document</span><span class="tok-p">.</span><span class="tok-nx">querySelector</span><span class="tok-p">(</span><span class="tok-s2">&quot;.invalid-feedback&quot;</span><span class="tok-p">);</span>
+<span class="tok-w">        </span><span class="tok-nx">errorMsg</span><span class="tok-p">.</span><span class="tok-nx">style</span><span class="tok-p">.</span><span class="tok-nx">display</span><span class="tok-w"> </span><span class="tok-o">=</span><span class="tok-w"> </span><span class="tok-s2">&quot;none&quot;</span><span class="tok-p">;</span><span class="tok-w">  </span><i class="conum" data-value="4"></i><b>(4)</b>
+<span class="tok-w">      </span><span class="tok-p">}</span>
+<span class="tok-w">    </span><span class="tok-p">&lt;/</span><span class="tok-nt">script</span><span class="tok-p">&gt;</span></code></pre>
+</div>
+</div>
 </div>
 </div>
 """
 
-OUTPUT_WITH_CALLOUTS = '''<div class="listingblock">
+
+OUTPUT_WITH_CALLOUTS = """<div class="listingblock">
 <div class="content">
 <pre>$ <strong>python manage.py test functional_tests.test_list_item_validation</strong>
 Creating test database for alias 'default'...
@@ -222,7 +216,7 @@
 
 FAILED (errors=1)</pre>
 </div>
-</div>'''
+</div>"""
 
 EXAMPLE_DIFF_LISTING = """
 <div class="exampleblock sourcecode small-code">