Coverage 100%

daquinoaldo · daquinoaldo · commit fc685f405a6c · 2018-09-11T15:24:35.000+02:00
diff --git a/index.js b/index.js
@@ -26,15 +26,23 @@ app.use(compression())
 app.set("json spaces", 0)
 
 // redirect http to https
-if (port === 443 || process.env.HTTP_PORT)
+/* istanbul ignore else */ // useless to test
+if (port === 443)
   app.http = http.createServer((req, res) => {
     res.writeHead(301, { Location: "https://" + req.headers["host"] + req.url })
     res.end()
-  }).listen(process.env.HTTP_PORT || 80)
+  }).listen(80)
 
 // serve static files, if launched as: "node index.js <static-path>"
-if (require.main === module)
-  app.use(express.static(process.argv[2] || process.cwd()))
+/* istanbul ignore else */ // useless to test
+if (require.main === module || process.env.USE_STATIC) {
+  let staticPath = process.cwd()
+  /* istanbul ignore if */ // impossible to test
+  if (process.argv.join().includes("serve"))
+    staticPath = process.argv.join().replace("sudo", "")
+      .replace("serve", "").replace(" ", "")
+  app.use(express.static(staticPath))
+}
 
 // ready
 console.info("Server running on port " + port + ".")
diff --git a/package.json b/package.json
@@ -5,8 +5,7 @@
   "main": "index.js",
   "scripts": {
     "pretest": "eslint --ignore-path .gitignore .",
-    "test": "mocha --exit",
-    "posttest": "./node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha -- -R spec ./test/*.js --exit",
+    "test": "./node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha -- -R spec ./test/*.js --exit",
     "start": "node index.js"
   },
   "bin": {
diff --git a/test/static.html b/test/static.html
diff --git a/test/test.js b/test/test.js
@@ -1,32 +1,11 @@
-process.env.TEST = true
-process.env.PORT = 4443
-process.env.HTTP_PORT = 8080
+process.env.USE_STATIC = true
 
 const assert = require("assert")
-const childProcess = require("child_process")
 const fs = require("fs")
 const http = require("http")
 const https = require("https")
 const app = require("../index.js")
 
-// run an external script located in the scriptPath
-function runScript(scriptPath, args = [], background = false) {
-  return new Promise((resolve, reject) => {
-    const process = childProcess.fork(scriptPath, args)
-    process.on("error", err => reject(err))
-    process.on("exit", code => {
-      if (code === 0) resolve()
-      else reject(code)
-    })
-    if (background) resolve(process)
-  })
-}
-
-// sleep function, must be used with await
-async function sleep(ms = 0) {
-  return new Promise(resolve => setTimeout(resolve, ms))
-}
-
 // make an http request on the specified path
 function makeRequest(path = "/", secure = false) {
   const agentOptions = {
@@ -37,7 +16,7 @@ function makeRequest(path = "/", secure = false) {
   }
   const options = {
     host: "localhost",
-    port: process.env.HTTP_PORT || 80,
+    port: 80,
     path: path,
     method: "GET",
     headers: { }
@@ -67,20 +46,14 @@ describe("Testing https-localhost", () => {
       .then(res => assert(res.statusCode === 301))
   })
   it("works as a module", async function() {
-    app.get("/test", (req, res) => res.send("TEST"))
-    await makeRequest("/test", true)
+    app.get("/test/module", (req, res) => res.send("TEST"))
+    await makeRequest("/test/module", true)
       .then(res => assert(res.data === "TEST"))
   })
   it("serve static file used as standalone tool", async function() {
-    process.env.PORT = 4444
-    process.env.HTTP_PORT = 8081
-    runScript("index.js", ["test"], true)
-      .then(process => proc = process) // eslint-disable-line no-return-assign
-      .catch(err => console.error(err))
-    await sleep(500)
-    await makeRequest("/test.html", true)
+    await makeRequest("/test/static.html", true)
       .then(res => assert(
-        res.data.toString() === fs.readFileSync("test/test.html").toString()))
+        res.data.toString() === fs.readFileSync("test/static.html").toString()))
     if (proc) proc.kill("SIGINT")
   })
 })
