Make the tests run again

marijnh · marijnh · commit beeed47a8096 · 2018-02-13T22:49:56.000+01:00
diff --git a/04_data.md b/04_data.md
@@ -1255,7 +1255,7 @@ computation. Comments are not allowed in JSON.
 
 A journal entry might look like this when represented as JSON data:
 
-```{type: "application/json"}
+```{lang: "application/json"}
 {
   "squirrel": false,
   "events": ["work", "touched tree", "pizza", "running"]
diff --git a/10_modules.md b/10_modules.md
@@ -671,7 +671,7 @@ useful (and useless) packages from it.
 These are the bindings that the project from [Chapter ?](robot)
 creates:
 
-```{type: "text/plain"}
+```{lang: "text/plain"}
 roads
 buildGraph
 roadGraph
diff --git a/13_browser.md b/13_browser.md
@@ -64,7 +64,7 @@ such as web pages or pictures). It specifies the way the side making
 the request should start with a line like this, naming the resource
 and the version of the protocol that it is trying to use.
 
-```{type: "text/plain"}
+```{lang: "text/plain"}
 GET /index.html HTTP/1.1
 ```
 
@@ -349,7 +349,7 @@ rest of the page will be interpreted as part of the script.
 
 {{index "relative path", dependency}}
 
-You can load ((ES modules)) (see [Chapter ?](module#es)) in the
+You can load ((ES modules)) (see [Chapter ?](modules#es)) in the
 browser by giving your script tag a `type="module"` attribute. Such
 modules can depend on other modules by using ((URL))s relative to
 themselves as module names in `import` declarations.
diff --git a/20_node.md b/20_node.md
@@ -285,7 +285,7 @@ The robot simulation from [Chapter ?](#robot), as modularized in
 [Exercise 10.1](modules#modular_robot), might use a `package.json`
 file like this:
 
-```
+```{lang: "application/json"}
 {
   "author": "Marijn Haverbeke",
   "name": "eloquent-javascript-robot",
@@ -669,7 +669,7 @@ The following piece of code, when run with the uppercasing server
 active, will send a request to that server and write out the response
 it gets:
 
-```{test: no}
+```
 const {request} = require("http");
 request({
   hostname: "localhost",
diff --git a/21_skillsharing.md b/21_skillsharing.md
@@ -553,7 +553,7 @@ talks to the client, so we first define a helper method that builds up
 such an array and includes an `ETag` header in the response.
 
 ```{includeCode: ">code/skillsharing/skillsharing_server.js"}
-SkillShareServer.prototype.talkResponse = function(talks) {
+SkillShareServer.prototype.talkResponse = function() {
   let talks = [];
   for (let title of Object.keys(this.talks)) {
     talks.push(this.talks[title]);
@@ -612,7 +612,7 @@ SkillShareServer.prototype.waitForChanges = function(time) {
       resolve({status: 304});
     }, time * 1000);
   });
-}
+};
 ```
 
 {{index "updated method"}}
diff --git a/src/run_tests.js b/src/run_tests.js
@@ -9,6 +9,7 @@ let varify = require("./varify")
 
 let file = process.argv[2]
 let chapNum = Number(file.match(/^\d*/)[0])
+let doRun = ![10, 11, 20, 21].includes(chapNum)
 let input = fs.readFileSync(file, "utf8")
 
 let baseCode = "let alert = function() {}, prompt = function() { return 'x' }, confirm = function() { return true }; window = this; requestAnimationFrame = setTimeout = clearTimeout = setInterval = clearInterval = Math.min; let localStorage = {setItem: function(a, b) { this[a] = b;}, getItem: function(a) { return this[a] || null }, removeItem: function(a) { delete this[a] }};\n"
@@ -89,11 +90,11 @@ while (m = re.exec(input)) {
 function stripHTML(code) {
   let included = "", script = ""
   code = code.replace(/<script\b[^>]*?(?:\bsrc\s*=\s*('[^']+'|"[^"]+"|[^\s>]+)[^>]*)?>([\s\S]*?)<\/script>/, function(m, src, content) {
-    if (src) {
+    if (!src) {
+      script += content
+    } else if (doRun) {
       if (/["']/.test(src.charAt(0))) src = src.slice(1, src.length - 1)
       included += fs.readFileSync("html/" + src, "utf8")
-    } else {
-      script += content
     }
     return ""
   })
@@ -242,7 +243,7 @@ function nextSandbox() {
   if (i == boxes.length) return
   let sandbox = boxes[i]
   i++
-  if (chapNum < 12 || chapNum >= 20) { // Language-only
+  if (chapNum < 13 || chapNum >= 20) { // Language-only
     try {
       ;(new Function("console, require, module", baseCode + sandbox.code))(_console, chapNum >= 20 && fakeRequire, {})
       nextSandbox()
@@ -269,4 +270,4 @@ function nextSandbox() {
     })
   }
 }
-if (chapNum != 11) nextSandbox()
+if (doRun) nextSandbox()

Original file line number	Diff line number	Diff line change
`@@ -1255,7 +1255,7 @@ computation. Comments are not allowed in JSON.`
`1255`	`1255`
`1256`	`1256`	`A journal entry might look like this when represented as JSON data:`
`1257`	`1257`
`1258`		-```{type: "application/json"}
	`1258`	+```{lang: "application/json"}
`1259`	`1259`	`{`
`1260`	`1260`	`"squirrel": false,`
`1261`	`1261`	`"events": ["work", "touched tree", "pizza", "running"]`