Fix test for travis ci (cannot use sudo to launch node)

daquinoaldo · daquinoaldo · commit c71a3b29b328 · 2018-09-11T15:38:34.000+02:00
diff --git a/index.js b/index.js
@@ -15,7 +15,8 @@ const certOptions = {
   cert: fs.readFileSync(path.resolve(__dirname, "cert/server.crt"))
 }
 
-const port = process.env.PORT || 443
+const port = process.env.PORT ||
+/* istanbul ignore next: impossible to test */ 443
 
 // run express
 const app = express()
@@ -26,18 +27,19 @@ app.use(compression())
 app.set("json spaces", 0)
 
 // redirect http to https
-/* istanbul ignore else */ // useless to test
-if (port === 443)
+/* istanbul ignore else: useless to test */
+if (port === 443 || process.env.HTTP_PORT)
   app.http = http.createServer((req, res) => {
     res.writeHead(301, { Location: "https://" + req.headers["host"] + req.url })
     res.end()
-  }).listen(80)
+  }).listen(process.env.HTTP_PORT ||
+  /* istanbul ignore next: impossible to test */ 80)
 
 // serve static files, if launched as: "node index.js <static-path>"
-/* istanbul ignore else */ // useless to test
+/* istanbul ignore else: useless to test */
 if (require.main === module || process.env.USE_STATIC) {
   let staticPath = process.cwd()
-  /* istanbul ignore if */ // impossible to test
+  /* istanbul ignore if: impossible to test */
   if (process.argv.join().includes("serve"))
     staticPath = process.argv.join().replace("sudo", "")
       .replace("serve", "").replace(" ", "")
diff --git a/test/test.js b/test/test.js
@@ -1,4 +1,6 @@
 process.env.USE_STATIC = true
+process.env.PORT = 4443
+process.env.HTTP_PORT = 8080
 
 const assert = require("assert")
 const fs = require("fs")
@@ -16,7 +18,7 @@ function makeRequest(path = "/", secure = false) {
   }
   const options = {
     host: "localhost",
-    port: 80,
+    port: process.env.HTTP_PORT || 80,
     path: path,
     method: "GET",
     headers: { }
