more on testing 16

Author: hjwp

chapter_16_javascript.asciidoc

@@ -642,11 +642,12 @@ If you refresh the browser, you should see that all passes:
 [role="jasmine-output"]
 [subs="specialcharacters,quotes"]
 ----
-2 specs, 0 failures, randomized with seed 12345        finished in 0.01s
+2 specs, 0 failures, randomized with seed 12345      finished in 0.005s
+
 
 Superlists tests
   * check we know how to hide things
-  * sense check our html fixture
+  * sense-check our html fixture
 ----
 ====
 
@@ -664,7 +665,7 @@ Now that we're acquainted with our JavaScript testing tools,
 we can switch back to just one test and start to write the real thing:
 
 [role="sourcecode small-code"]
-.src/lists/static/tests/spec.js (ch16l012)
+.src/lists/static/tests/Spec.js (ch16l012)
 ====
 [source,javascript]
 ----
@@ -706,7 +707,7 @@ That gives us our expected failure:
 [role="jasmine-output"]
 [subs="specialcharacters,quotes"]
 ----
-2 specs, 1 failure, randomized with seed 12345		finished in 0.007s
+2 specs, 1 failure, randomized with seed 12345      finished in 0.005s
 
 Spec List | Failures
 
@@ -742,7 +743,7 @@ That doesn't work!  We get an _unexpected error_:
 [role="jasmine-output"]
 [subs="specialcharacters,quotes"]
 ----
-2 specs, 2 failures, randomized with seed 12345		finished in 0.008s
+2 specs, 2 failures, randomized with seed 12345      finished in 0.005s
 Error during loading: TypeError: textInput is null in file:///...goat-book/src/lists/static/lists.js line 2
 Spec List | Failures
 
@@ -905,7 +906,7 @@ And that will actually get our tests passing!
 [role="jasmine-output"]
 [subs="specialcharacters,quotes"]
 ----
-2 specs, 0 failures, randomized with seed 12345		finished in 0.007s
+2 specs, 0 failures, randomized with seed 12345      finished in 0.005s
 
 
 Superlists tests
@@ -954,7 +955,7 @@ Oh dear, sure enough the tests just pass:
 [role="jasmine-output"]
 [subs="specialcharacters,quotes"]
 ----
-2 specs, 0 failures, randomized with seed 12345		finished in 0.008s
+2 specs, 0 failures, randomized with seed 12345		finished in 0.005s
 
 
 Superlists tests
@@ -994,7 +995,7 @@ That gives us our expected failure:
 [role="jasmine-output"]
 [subs="specialcharacters,quotes"]
 ----
-3 specs, 1 failure, randomized with seed 12345		finished in 0.008s
+3 specs, 1 failure, randomized with seed 12345		finished in 0.005s
 
 Spec List | Failures
 
@@ -1128,7 +1129,7 @@ We've only refactored the tests so far, let's check they still pass:
 [role="jasmine-output"]
 [subs="specialcharacters,quotes"]
 ----
-3 specs, 0 failures, randomized with seed 12345		finished in 0.006s
+3 specs, 0 failures, randomized with seed 12345		finished in 0.005s
 
 
 Superlists tests
@@ -1174,7 +1175,7 @@ Now we look at the tests:
 [role="jasmine-output"]
 [subs="specialcharacters,quotes"]
 ----
-3 specs, 0 failures, randomized with seed 12345		finished in 0.01s
+3 specs, 0 failures, randomized with seed 12345		finished in 0.005s
 
 
 Superlists tests
@@ -1216,7 +1217,7 @@ And the tests still pass:
 [role="jasmine-output"]
 [subs="specialcharacters,quotes"]
 ----
-3 specs, 0 failures, randomized with seed 12345		finished in 0.011s
+3 specs, 0 failures, randomized with seed 12345		finished in 0.005s
 ----
 
 
@@ -1238,7 +1239,7 @@ Phew, that gives us a failure:
 [role="jasmine-output"]
 [subs="specialcharacters,quotes"]
 ----
-3 specs, 1 failure, randomized with seed 12345		finished in 0.01s
+3 specs, 1 failure, randomized with seed 12345		finished in 0.005s
 
 Spec List | Failures
 
@@ -1355,7 +1356,7 @@ Oh dear, it seems like that doesn't quite work:
 [role="jasmine-output"]
 [subs="specialcharacters,quotes"]
 ----
-3 specs, 1 failure, randomized with seed 12345		finished in 0.012s
+3 specs, 1 failure, randomized with seed 12345		finished in 0.005s
 
 Spec List | Failures
 
@@ -1397,7 +1398,7 @@ That gets us back to passing tests:
 [role="jasmine-output"]
 [subs="specialcharacters,quotes"]
 ----
-3 specs, 0 failures, randomized with seed 12345		finished in 0.007s
+3 specs, 0 failures, randomized with seed 12345		finished in 0.005s
 
 
 Superlists tests

tests/book_parser.py

@@ -91,14 +91,14 @@ def __init__(self, a_string):
         self.was_checked = False
         self.skip = False
         self.dofirst = None
-        self.qunit_output = False
+        self.jasmine_output = False
         self.against_server = False
         str.__init__(a_string)
 
     @property
     def type(self) -> str:
-        if self.qunit_output:
-            return "qunit output"
+        if self.jasmine_output:
+            return "jasmine output"
         if "├" in self:
             return "tree"
         else:
@@ -182,15 +182,15 @@ def parse_listing(listing):  # noqa: PLR0912
             listing.currentcontents = True
         return [listing]
 
-    elif "qunit-output" in classes:
+    elif "jasmine-output" in classes:
         contents = (
             listing.cssselect(".content")[0]
             .text_content()
             .replace("\r\n", "\n")
             .strip("\n")
         )
         output = Output(contents)
-        output.qunit_output = True
+        output.jasmine_output = True
         output.skip = skip
         output.dofirst = dofirst
         return [output]

tests/book_tester.py

@@ -20,7 +20,6 @@
 from write_to_file import write_to_file
 
 JASMINE_RUNNER = Path(__file__).parent / "run-js-spec.py"
-
 # DO_SERVER_COMMANDS = True
 # if os.environ.get("CI") or os.environ.get("NO_SERVER_COMMANDS"):
 DO_SERVER_COMMANDS = False
@@ -349,6 +348,8 @@ def prep_database(self):
         self.sourcetree.run_command(f"python {self._manage_py()} migrate --noinput")
 
     def assertLineIn(self, line, lines):
+        if "\t" in line or "\t" in "\n".join(lines):
+            print('tabz')
         if line not in lines:
             raise AssertionError(
                 "%s not found in:\n%s" % (repr(line), "\n".join(repr(l) for l in lines))
@@ -530,14 +531,16 @@ def run_test_and_check_result(self, bdd=False):
         self.pos += 2
 
     def run_js_tests(self, tests_path: Path):
-        output = subprocess.check_output(
-            [JASMINE_RUNNER, str(tests_path)],
+        p = subprocess.run(
+            ["python", str(JASMINE_RUNNER), str(tests_path)],
+            stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
             # env={**os.environ, "OPENSSL_CONF": "/dev/null"},
-        ).decode()
-        return output
+            check=False,
+        )
+        return p.stdout.decode()
 
-    def check_qunit_output(self, expected_output):
-        lists_tests = Path(self.tempdir) / "lists/static/tests/SpecRunner.html"
+    def check_jasmine_output(self, expected_output):
+        lists_tests = Path(self.tempdir) / "src/lists/static/tests/SpecRunner.html"
         assert lists_tests.exists()
         lists_run = self.run_js_tests(lists_tests)
         self.assert_console_output_correct(lists_run, expected_output)
@@ -850,8 +853,8 @@ def recognise_listing_and_process_it(self):
         elif listing.type == "server code listing":
             assert 0, "reimplement"
 
-        elif listing.type == "qunit output":
-            self.check_qunit_output(listing)
+        elif listing.type == "jasmine output":
+            self.check_jasmine_output(listing)
             self.pos += 1
 
         elif listing.type == "output":

tests/examples.py

@@ -121,12 +121,14 @@
 <span class="kn">from</span> <span class="nn">django.conf.urls</span> <span class="kn">import</span> <span class="n">patterns</span><span class="p">,</span> <span class="n">include</span><span class="p">,</span> <span class="n">url</span>
 </pre></div></div></div>"""
 
-OUTPUT_QUNIT = """
-<div class="listingblock qunit-output">
+JASMINE_OUTPUT = """
+<div class="listingblock jasmine-output">
 <div class="content">
-<pre>2 assertions of 2 passed, 0 failed.
-1. smoke test (2)</pre>
-</div>
+<pre>2 specs, 0 failures, randomized with seed 12345        finished in 0.01s
+
+Superlists tests
+  * check we know how to hide things
+  * sense check our html fixture</pre>
 </div>
 """
 

tests/run-js-spec.py

@@ -30,7 +30,8 @@ def run(path: Path):
     failed = False
 
     def _el_text(sel, node: webdriver.Remote | WebElement = browser):
-        return "\n".join(el.text for el in node.find_elements(By.CSS_SELECTOR, sel))
+        raw = "\n".join(el.text for el in node.find_elements(By.CSS_SELECTOR, sel))
+        return re.sub(r" 0\.\d+s", " 0.005s", raw)
 
     try:
         browser.get(f"file:///{path}?seed=12345")
@@ -40,7 +41,7 @@ def _el_text(sel, node: webdriver.Remote | WebElement = browser):
         #     print(entry)
 
         print(
-            f"{_el_text('.jasmine-overall-result')}\t\t{_el_text('.jasmine-duration')}"
+            f"{_el_text('.jasmine-overall-result')}      {_el_text('.jasmine-duration')}"
         )
 
         print(_el_text(".jasmine-bar.jasmine-errored"))