st 1.1.0 → 2.0.0

package/test/passthrough.js

@@ -1,79 +1,73 @@
-var st = require('../st.js')
-var test = require('tap').test
-var util = require('util')
-var path = require('path')
+const { test } = require('tap')
+const path = require('path')
+const st = require('../st.js')
 
-var opts = util._extend({
+const opts = Object.assign({
   index: false,
   path: path.resolve(__dirname, './fixtures'),
   url: '/',
   passthrough: true
 }, global.options || {})
 
-var mount = st(opts)
+const mount = st(opts)
 
-test('call next() if passthrough is set', function (t) {
-  var req = { method: 'GET', url: '/doesnotexist.txt', headers: {} }
-  var res = {
-    error: function () {
-      t.end()
-    },
-    setHeader: function () {},
-    end: function () {}
+test('call next() if passthrough is set', (t) => {
+  const req = { method: 'GET', url: '/doesnotexist.txt', headers: {} }
+  const res = {
+    error: () => t.end(),
+    setHeader: () => {},
+    end: () => {}
   }
   t.plan(2)
-  mount(req, res, function () {
-    t.ok(true, "next called with nonexistant file");
-    req.url='/';
-    mount(req, res, function () {
-      t.ok(true, "next called without indexing")
+  mount(req, res, () => {
+    t.ok(true, 'next called with nonexistant file')
+    req.url = '/'
+    mount(req, res, () => {
+      t.ok(true, 'next called without indexing')
       t.end()
-    });
+    })
   })
 })
 
-var opts2 = util._extend({
+const opts2 = Object.assign({
   autoindex: true,
   path: path.resolve(__dirname, './fixtures'),
   url: '/'
 }, global.options || {})
-mount2 = st(opts2)
+const mount2 = st(opts2)
 
-test('return error if passthrough is not set', function (t) {
-  var req = { method: 'GET', url: '/doesnotexist.txt', headers: {} }
-  var res = {
-    setHeader: function () {},
-    error: function () {
-      t.ok(true, "error used")
+test('return error if passthrough is not set', (t) => {
+  const req = { method: 'GET', url: '/doesnotexist.txt', headers: {} }
+  const res = {
+    setHeader: () => {},
+    error: () => {
+      t.ok(true, 'error used')
       t.end()
     },
-    end: function () {}
+    end: () => {}
   }
   t.plan(1)
-  mount2(req, res, function () {
+  mount2(req, res, () => {
     t.end()
   })
 })
 
-test('does not set headers if passthrough is set', function (t){
-  var req = { method: 'GET', url: '/doesnotexist.txt', headers: {} }
-  var res = {
-    error: function () {
-      t.end()
-    },
+test('does not set headers if passthrough is set', (t) => {
+  const req = { method: 'GET', url: '/doesnotexist.txt', headers: {} }
+  const res = {
+    error: () => t.end(),
     _headers: [],
-    setHeader: function (header) {
+    setHeader: (header) => {
       res._headers.push(header)
     },
-    end: function () {}
+    end: () => {}
   }
   t.plan(2)
-  mount(req, res, function () {
-
+  mount(req, res, () => {
     t.notOk(res._headers.length, 'headers are not set on a non-existant file')
-    req.url='/';
+    req.url = '/'
 
-    mount(req, res, function () {
+    mount(req, res, () => {
       t.notOk(res._headers.length, 'headers are not set with no index')
       t.end()
     })

package/test/preset-cache-control.js

@@ -1,60 +1,64 @@
-var st = require('../st.js')
-var tap = require('tap')
-var test = require('tap').test
-var util = require('util')
-var path = require('path')
-var http = require('http')
-var request = require('request')
-var port = process.env.PORT || 1337
+const st = require('../st.js')
+const { test, tearDown } = require('tap')
+const path = require('path')
+const http = require('http')
+const request = require('request')
+const port = process.env.PORT || 1337
 
-var opts = util._extend({
+const opts = Object.assign({
   index: false,
   path: path.dirname(__dirname),
   url: '/test'
 }, global.options || {})
 
-var mount = st(opts)
-var server
-var cacheControl = null
+const mount = st(opts)
+let server
+let cacheControl = null
 
 function req (url, headers, cb) {
-  if (typeof headers === 'function') cb = headers, headers = {}
-  request({ encoding: null,
-            url: 'http://localhost:' + port + url,
-            headers: headers }, cb)
+  if (typeof headers === 'function') {
+    cb = headers
+    headers = {}
+  }
+  request({
+    encoding: null,
+    url: 'http://localhost:' + port + url,
+    headers: headers
+  }, cb)
 }
 
-tap.test('setup', function (t) {
-  server = http.createServer(function (req, res) {
-    if (cacheControl)
+test('setup', (t) => {
+  server = http.createServer((req, res) => {
+    if (cacheControl) {
       res.setHeader('cache-control', cacheControl)
+    }
     if (!mount(req, res)) {
       res.statusCode = 404
       return res.end('Not a match: ' + req.url)
     }
-  }).listen(port, function () {
+  }).listen(port, () => {
     t.pass('listening')
     t.end()
   })
 })
 
-tap.tearDown(function() {
+tearDown(() => {
   server.close()
 })
 
-tap.test('simple request', function (t) {
+test('simple request', (t) => {
   cacheControl = null
-  req('/test/st.js', function (er, res, body) {
-    t.ifError(er)
+  req('/test/st.js', (er, res, body) => {
+    t.error(er)
     t.equal(res.headers['cache-control'], 'public, max-age=600')
     t.end()
   })
 })
 
-tap.test('pre-set cache-control', function (t) {
+test('pre-set cache-control', (t) => {
   cacheControl = 'I\'m so excited, and I just can\'t hide it'
-  req('/test/st.js', function (er, res, body) {
-    t.ifError(er)
+  req('/test/st.js', (er, res, body) => {
+    t.error(er)
     t.equal(res.headers['cache-control'], cacheControl)
     t.end()
   })

package/.npmignore

@@ -1 +0,0 @@
-node_modules