some html
'); - * - * @param {string|number|boolean|object|Buffer} body - * @public - */ - -res.send = function send(body) { - var chunk = body; - var encoding; - var req = this.req; - var type; - - // settings - var app = this.app; - - // allow status / body - if (arguments.length === 2) { - // res.send(body, status) backwards compat - if (typeof arguments[0] !== 'number' && typeof arguments[1] === 'number') { - deprecate('res.send(body, status): Use res.status(status).send(body) instead'); - this.statusCode = arguments[1]; - } else { - deprecate('res.send(status, body): Use res.status(status).send(body) instead'); - this.statusCode = arguments[0]; - chunk = arguments[1]; - } - } - - // disambiguate res.send(status) and res.send(status, num) - if (typeof chunk === 'number' && arguments.length === 1) { - // res.send(status) will set status message as text string - if (!this.get('Content-Type')) { - this.type('txt'); - } - - deprecate('res.send(status): Use res.sendStatus(status) instead'); - this.statusCode = chunk; - chunk = statuses.message[chunk] - } - - switch (typeof chunk) { - // string defaulting to html - case 'string': - if (!this.get('Content-Type')) { - this.type('html'); - } - break; - case 'boolean': - case 'number': - case 'object': - if (chunk === null) { - chunk = ''; - } else if (Buffer.isBuffer(chunk)) { - if (!this.get('Content-Type')) { - this.type('bin'); - } - } else { - return this.json(chunk); - } - break; - } - - // write strings in utf-8 - if (typeof chunk === 'string') { - encoding = 'utf8'; - type = this.get('Content-Type'); - - // reflect this in content-type - if (typeof type === 'string') { - this.set('Content-Type', setCharset(type, 'utf-8')); - } - } - - // determine if ETag should be generated - var etagFn = app.get('etag fn') - var generateETag = !this.get('ETag') && typeof etagFn === 'function' - - // populate Content-Length - var len - if (chunk !== undefined) { - if (Buffer.isBuffer(chunk)) { - // get length of Buffer - len = chunk.length - } else if (!generateETag && chunk.length < 1000) { - // just calculate length when no ETag + small chunk - len = Buffer.byteLength(chunk, encoding) - } else { - // convert chunk to Buffer and calculate - chunk = Buffer.from(chunk, encoding) - encoding = undefined; - len = chunk.length - } - - this.set('Content-Length', len); - } - - // populate ETag - var etag; - if (generateETag && len !== undefined) { - if ((etag = etagFn(chunk, encoding))) { - this.set('ETag', etag); - } - } - - // freshness - if (req.fresh) this.statusCode = 304; - - // strip irrelevant headers - if (204 === this.statusCode || 304 === this.statusCode) { - this.removeHeader('Content-Type'); - this.removeHeader('Content-Length'); - this.removeHeader('Transfer-Encoding'); - chunk = ''; - } - - // alter headers for 205 - if (this.statusCode === 205) { - this.set('Content-Length', '0') - this.removeHeader('Transfer-Encoding') - chunk = '' - } - - if (req.method === 'HEAD') { - // skip body for HEAD - this.end(); - } else { - // respond - this.end(chunk, encoding); - } - - return this; -}; - -/** - * Send JSON response. - * - * Examples: - * - * res.json(null); - * res.json({ user: 'tj' }); - * - * @param {string|number|boolean|object} obj - * @public - */ - -res.json = function json(obj) { - var val = obj; - - // allow status / body - if (arguments.length === 2) { - // res.json(body, status) backwards compat - if (typeof arguments[1] === 'number') { - deprecate('res.json(obj, status): Use res.status(status).json(obj) instead'); - this.statusCode = arguments[1]; - } else { - deprecate('res.json(status, obj): Use res.status(status).json(obj) instead'); - this.statusCode = arguments[0]; - val = arguments[1]; - } - } - - // settings - var app = this.app; - var escape = app.get('json escape') - var replacer = app.get('json replacer'); - var spaces = app.get('json spaces'); - var body = stringify(val, replacer, spaces, escape) - - // content-type - if (!this.get('Content-Type')) { - this.set('Content-Type', 'application/json'); - } - - return this.send(body); -}; - -/** - * Send JSON response with JSONP callback support. - * - * Examples: - * - * res.jsonp(null); - * res.jsonp({ user: 'tj' }); - * - * @param {string|number|boolean|object} obj - * @public - */ - -res.jsonp = function jsonp(obj) { - var val = obj; - - // allow status / body - if (arguments.length === 2) { - // res.jsonp(body, status) backwards compat - if (typeof arguments[1] === 'number') { - deprecate('res.jsonp(obj, status): Use res.status(status).jsonp(obj) instead'); - this.statusCode = arguments[1]; - } else { - deprecate('res.jsonp(status, obj): Use res.status(status).jsonp(obj) instead'); - this.statusCode = arguments[0]; - val = arguments[1]; - } - } - - // settings - var app = this.app; - var escape = app.get('json escape') - var replacer = app.get('json replacer'); - var spaces = app.get('json spaces'); - var body = stringify(val, replacer, spaces, escape) - var callback = this.req.query[app.get('jsonp callback name')]; - - // content-type - if (!this.get('Content-Type')) { - this.set('X-Content-Type-Options', 'nosniff'); - this.set('Content-Type', 'application/json'); - } - - // fixup callback - if (Array.isArray(callback)) { - callback = callback[0]; - } - - // jsonp - if (typeof callback === 'string' && callback.length !== 0) { - this.set('X-Content-Type-Options', 'nosniff'); - this.set('Content-Type', 'text/javascript'); - - // restrict callback charset - callback = callback.replace(/[^\[\]\w$.]/g, ''); - - if (body === undefined) { - // empty argument - body = '' - } else if (typeof body === 'string') { - // replace chars not allowed in JavaScript that are in JSON - body = body - .replace(/\u2028/g, '\\u2028') - .replace(/\u2029/g, '\\u2029') - } - - // the /**/ is a specific security mitigation for "Rosetta Flash JSONP abuse" - // the typeof check is just to reduce client error noise - body = '/**/ typeof ' + callback + ' === \'function\' && ' + callback + '(' + body + ');'; - } - - return this.send(body); -}; - -/** - * Send given HTTP status code. - * - * Sets the response status to `statusCode` and the body of the - * response to the standard description from node's http.STATUS_CODES - * or the statusCode number if no description. - * - * Examples: - * - * res.sendStatus(200); - * - * @param {number} statusCode - * @public - */ - -res.sendStatus = function sendStatus(statusCode) { - var body = statuses.message[statusCode] || String(statusCode) - - this.statusCode = statusCode; - this.type('txt'); - - return this.send(body); -}; - -/** - * Transfer the file at the given `path`. - * - * Automatically sets the _Content-Type_ response header field. - * The callback `callback(err)` is invoked when the transfer is complete - * or when an error occurs. Be sure to check `res.headersSent` - * if you wish to attempt responding, as the header and some data - * may have already been transferred. - * - * Options: - * - * - `maxAge` defaulting to 0 (can be string converted by `ms`) - * - `root` root directory for relative filenames - * - `headers` object of headers to serve with file - * - `dotfiles` serve dotfiles, defaulting to false; can be `"allow"` to send them - * - * Other options are passed along to `send`. - * - * Examples: - * - * The following example illustrates how `res.sendFile()` may - * be used as an alternative for the `static()` middleware for - * dynamic situations. The code backing `res.sendFile()` is actually - * the same code, so HTTP cache support etc is identical. - * - * app.get('/user/:uid/photos/:file', function(req, res){ - * var uid = req.params.uid - * , file = req.params.file; - * - * req.user.mayViewFilesFrom(uid, function(yes){ - * if (yes) { - * res.sendFile('/uploads/' + uid + '/' + file); - * } else { - * res.send(403, 'Sorry! you cant see that.'); - * } - * }); - * }); - * - * @public - */ - -res.sendFile = function sendFile(path, options, callback) { - var done = callback; - var req = this.req; - var res = this; - var next = req.next; - var opts = options || {}; - - if (!path) { - throw new TypeError('path argument is required to res.sendFile'); - } - - if (typeof path !== 'string') { - throw new TypeError('path must be a string to res.sendFile') - } - - // support function as second arg - if (typeof options === 'function') { - done = options; - opts = {}; - } - - if (!opts.root && !isAbsolute(path)) { - throw new TypeError('path must be absolute or specify root to res.sendFile'); - } - - // create file stream - var pathname = encodeURI(path); - var file = send(req, pathname, opts); - - // transfer - sendfile(res, file, opts, function (err) { - if (done) return done(err); - if (err && err.code === 'EISDIR') return next(); - - // next() all but write errors - if (err && err.code !== 'ECONNABORTED' && err.syscall !== 'write') { - next(err); - } - }); -}; - -/** - * Transfer the file at the given `path`. - * - * Automatically sets the _Content-Type_ response header field. - * The callback `callback(err)` is invoked when the transfer is complete - * or when an error occurs. Be sure to check `res.headersSent` - * if you wish to attempt responding, as the header and some data - * may have already been transferred. - * - * Options: - * - * - `maxAge` defaulting to 0 (can be string converted by `ms`) - * - `root` root directory for relative filenames - * - `headers` object of headers to serve with file - * - `dotfiles` serve dotfiles, defaulting to false; can be `"allow"` to send them - * - * Other options are passed along to `send`. - * - * Examples: - * - * The following example illustrates how `res.sendfile()` may - * be used as an alternative for the `static()` middleware for - * dynamic situations. The code backing `res.sendfile()` is actually - * the same code, so HTTP cache support etc is identical. - * - * app.get('/user/:uid/photos/:file', function(req, res){ - * var uid = req.params.uid - * , file = req.params.file; - * - * req.user.mayViewFilesFrom(uid, function(yes){ - * if (yes) { - * res.sendfile('/uploads/' + uid + '/' + file); - * } else { - * res.send(403, 'Sorry! you cant see that.'); - * } - * }); - * }); - * - * @public - */ - -res.sendfile = function (path, options, callback) { - var done = callback; - var req = this.req; - var res = this; - var next = req.next; - var opts = options || {}; - - // support function as second arg - if (typeof options === 'function') { - done = options; - opts = {}; - } - - // create file stream - var file = send(req, path, opts); - - // transfer - sendfile(res, file, opts, function (err) { - if (done) return done(err); - if (err && err.code === 'EISDIR') return next(); - - // next() all but write errors - if (err && err.code !== 'ECONNABORTED' && err.syscall !== 'write') { - next(err); - } - }); -}; - -res.sendfile = deprecate.function(res.sendfile, - 'res.sendfile: Use res.sendFile instead'); - -/** - * Transfer the file at the given `path` as an attachment. - * - * Optionally providing an alternate attachment `filename`, - * and optional callback `callback(err)`. The callback is invoked - * when the data transfer is complete, or when an error has - * occurred. Be sure to check `res.headersSent` if you plan to respond. - * - * Optionally providing an `options` object to use with `res.sendFile()`. - * This function will set the `Content-Disposition` header, overriding - * any `Content-Disposition` header passed as header options in order - * to set the attachment and filename. - * - * This method uses `res.sendFile()`. - * - * @public - */ - -res.download = function download (path, filename, options, callback) { - var done = callback; - var name = filename; - var opts = options || null - - // support function as second or third arg - if (typeof filename === 'function') { - done = filename; - name = null; - opts = null - } else if (typeof options === 'function') { - done = options - opts = null - } - - // support optional filename, where options may be in it's place - if (typeof filename === 'object' && - (typeof options === 'function' || options === undefined)) { - name = null - opts = filename - } - - // set Content-Disposition when file is sent - var headers = { - 'Content-Disposition': contentDisposition(name || path) - }; - - // merge user-provided headers - if (opts && opts.headers) { - var keys = Object.keys(opts.headers) - for (var i = 0; i < keys.length; i++) { - var key = keys[i] - if (key.toLowerCase() !== 'content-disposition') { - headers[key] = opts.headers[key] - } - } - } - - // merge user-provided options - opts = Object.create(opts) - opts.headers = headers - - // Resolve the full path for sendFile - var fullPath = !opts.root - ? resolve(path) - : path - - // send file - return this.sendFile(fullPath, opts, done) -}; - -/** - * Set _Content-Type_ response header with `type` through `mime.lookup()` - * when it does not contain "/", or set the Content-Type to `type` otherwise. - * - * Examples: - * - * res.type('.html'); - * res.type('html'); - * res.type('json'); - * res.type('application/json'); - * res.type('png'); - * - * @param {String} type - * @return {ServerResponse} for chaining - * @public - */ - -res.contentType = -res.type = function contentType(type) { - var ct = type.indexOf('/') === -1 - ? mime.lookup(type) - : type; - - return this.set('Content-Type', ct); -}; - -/** - * Respond to the Acceptable formats using an `obj` - * of mime-type callbacks. - * - * This method uses `req.accepted`, an array of - * acceptable types ordered by their quality values. - * When "Accept" is not present the _first_ callback - * is invoked, otherwise the first match is used. When - * no match is performed the server responds with - * 406 "Not Acceptable". - * - * Content-Type is set for you, however if you choose - * you may alter this within the callback using `res.type()` - * or `res.set('Content-Type', ...)`. - * - * res.format({ - * 'text/plain': function(){ - * res.send('hey'); - * }, - * - * 'text/html': function(){ - * res.send('hey
'); - * }, - * - * 'application/json': function () { - * res.send({ message: 'hey' }); - * } - * }); - * - * In addition to canonicalized MIME types you may - * also use extnames mapped to these types: - * - * res.format({ - * text: function(){ - * res.send('hey'); - * }, - * - * html: function(){ - * res.send('hey
'); - * }, - * - * json: function(){ - * res.send({ message: 'hey' }); - * } - * }); - * - * By default Express passes an `Error` - * with a `.status` of 406 to `next(err)` - * if a match is not made. If you provide - * a `.default` callback it will be invoked - * instead. - * - * @param {Object} obj - * @return {ServerResponse} for chaining - * @public - */ - -res.format = function(obj){ - var req = this.req; - var next = req.next; - - var keys = Object.keys(obj) - .filter(function (v) { return v !== 'default' }) - - var key = keys.length > 0 - ? req.accepts(keys) - : false; - - this.vary("Accept"); - - if (key) { - this.set('Content-Type', normalizeType(key).value); - obj[key](req, this, next); - } else if (obj.default) { - obj.default(req, this, next) - } else { - next(createError(406, { - types: normalizeTypes(keys).map(function (o) { return o.value }) - })) - } - - return this; -}; - -/** - * Set _Content-Disposition_ header to _attachment_ with optional `filename`. - * - * @param {String} filename - * @return {ServerResponse} - * @public - */ - -res.attachment = function attachment(filename) { - if (filename) { - this.type(extname(filename)); - } - - this.set('Content-Disposition', contentDisposition(filename)); - - return this; -}; - -/** - * Append additional header `field` with value `val`. - * - * Example: - * - * res.append('Link', ['' + statuses.message[status] + '. Redirecting to ' + u + '
' - }, - - default: function(){ - body = ''; - } - }); - - // Respond - this.statusCode = status; - this.set('Content-Length', Buffer.byteLength(body)); - - if (this.req.method === 'HEAD') { - this.end(); - } else { - this.end(body); - } -}; - -/** - * Add `field` to Vary. If already present in the Vary set, then - * this call is simply ignored. - * - * @param {Array|String} field - * @return {ServerResponse} for chaining - * @public - */ - -res.vary = function(field){ - // checks for back-compat - if (!field || (Array.isArray(field) && !field.length)) { - deprecate('res.vary(): Provide a field name'); - return this; - } - - vary(this, field); - - return this; -}; - -/** - * Render `view` with the given `options` and optional callback `fn`. - * When a callback function is given a response will _not_ be made - * automatically, otherwise a response of _200_ and _text/html_ is given. - * - * Options: - * - * - `cache` boolean hinting to the engine it should cache - * - `filename` filename of the view being rendered - * - * @public - */ - -res.render = function render(view, options, callback) { - var app = this.req.app; - var done = callback; - var opts = options || {}; - var req = this.req; - var self = this; - - // support callback function as second arg - if (typeof options === 'function') { - done = options; - opts = {}; - } - - // merge res.locals - opts._locals = self.locals; - - // default callback to respond - done = done || function (err, str) { - if (err) return req.next(err); - self.send(str); - }; - - // render - app.render(view, opts, done); -}; - -// pipe the send file stream -function sendfile(res, file, options, callback) { - var done = false; - var streaming; - - // request aborted - function onaborted() { - if (done) return; - done = true; - - var err = new Error('Request aborted'); - err.code = 'ECONNABORTED'; - callback(err); - } - - // directory - function ondirectory() { - if (done) return; - done = true; - - var err = new Error('EISDIR, read'); - err.code = 'EISDIR'; - callback(err); - } - - // errors - function onerror(err) { - if (done) return; - done = true; - callback(err); - } - - // ended - function onend() { - if (done) return; - done = true; - callback(); - } - - // file - function onfile() { - streaming = false; - } - - // finished - function onfinish(err) { - if (err && err.code === 'ECONNRESET') return onaborted(); - if (err) return onerror(err); - if (done) return; - - setImmediate(function () { - if (streaming !== false && !done) { - onaborted(); - return; - } - - if (done) return; - done = true; - callback(); - }); - } - - // streaming - function onstream() { - streaming = true; - } - - file.on('directory', ondirectory); - file.on('end', onend); - file.on('error', onerror); - file.on('file', onfile); - file.on('stream', onstream); - onFinished(res, onfinish); - - if (options.headers) { - // set headers on successful transfer - file.on('headers', function headers(res) { - var obj = options.headers; - var keys = Object.keys(obj); - - for (var i = 0; i < keys.length; i++) { - var k = keys[i]; - res.setHeader(k, obj[k]); - } - }); - } - - // pipe - file.pipe(res); -} - -/** - * Stringify JSON, like JSON.stringify, but v8 optimized, with the - * ability to escape characters that can trigger HTML sniffing. - * - * @param {*} value - * @param {function} replacer - * @param {number} spaces - * @param {boolean} escape - * @returns {string} - * @private - */ - -function stringify (value, replacer, spaces, escape) { - // v8 checks arguments.length for optimizing simple call - // https://bugs.chromium.org/p/v8/issues/detail?id=4730 - var json = replacer || spaces - ? JSON.stringify(value, replacer, spaces) - : JSON.stringify(value); - - if (escape && typeof json === 'string') { - json = json.replace(/[<>&]/g, function (c) { - switch (c.charCodeAt(0)) { - case 0x3c: - return '\\u003c' - case 0x3e: - return '\\u003e' - case 0x26: - return '\\u0026' - /* istanbul ignore next: unreachable default */ - default: - return c - } - }) - } - - return json -} diff --git a/lib/router/index.js b/lib/router/index.js deleted file mode 100644 index abb3a6f5..00000000 --- a/lib/router/index.js +++ /dev/null @@ -1,673 +0,0 @@ -/*! - * express - * Copyright(c) 2009-2013 TJ Holowaychuk - * Copyright(c) 2013 Roman Shtylman - * Copyright(c) 2014-2015 Douglas Christopher Wilson - * MIT Licensed - */ - -'use strict'; - -/** - * Module dependencies. - * @private - */ - -var Route = require('./route'); -var Layer = require('./layer'); -var methods = require('methods'); -var mixin = require('utils-merge'); -var debug = require('debug')('express:router'); -var deprecate = require('depd')('express'); -var flatten = require('array-flatten'); -var parseUrl = require('parseurl'); -var setPrototypeOf = require('setprototypeof') - -/** - * Module variables. - * @private - */ - -var objectRegExp = /^\[object (\S+)\]$/; -var slice = Array.prototype.slice; -var toString = Object.prototype.toString; - -/** - * Initialize a new `Router` with the given `options`. - * - * @param {Object} [options] - * @return {Router} which is a callable function - * @public - */ - -var proto = module.exports = function(options) { - var opts = options || {}; - - function router(req, res, next) { - router.handle(req, res, next); - } - - // mixin Router class functions - setPrototypeOf(router, proto) - - router.params = {}; - router._params = []; - router.caseSensitive = opts.caseSensitive; - router.mergeParams = opts.mergeParams; - router.strict = opts.strict; - router.stack = []; - - return router; -}; - -/** - * Map the given param placeholder `name`(s) to the given callback. - * - * Parameter mapping is used to provide pre-conditions to routes - * which use normalized placeholders. For example a _:user_id_ parameter - * could automatically load a user's information from the database without - * any additional code, - * - * The callback uses the same signature as middleware, the only difference - * being that the value of the placeholder is passed, in this case the _id_ - * of the user. Once the `next()` function is invoked, just like middleware - * it will continue on to execute the route, or subsequent parameter functions. - * - * Just like in middleware, you must either respond to the request or call next - * to avoid stalling the request. - * - * app.param('user_id', function(req, res, next, id){ - * User.find(id, function(err, user){ - * if (err) { - * return next(err); - * } else if (!user) { - * return next(new Error('failed to load user')); - * } - * req.user = user; - * next(); - * }); - * }); - * - * @param {String} name - * @param {Function} fn - * @return {app} for chaining - * @public - */ - -proto.param = function param(name, fn) { - // param logic - if (typeof name === 'function') { - deprecate('router.param(fn): Refactor to use path params'); - this._params.push(name); - return; - } - - // apply param functions - var params = this._params; - var len = params.length; - var ret; - - if (name[0] === ':') { - deprecate('router.param(' + JSON.stringify(name) + ', fn): Use router.param(' + JSON.stringify(name.slice(1)) + ', fn) instead') - name = name.slice(1) - } - - for (var i = 0; i < len; ++i) { - if (ret = params[i](name, fn)) { - fn = ret; - } - } - - // ensure we end up with a - // middleware function - if ('function' !== typeof fn) { - throw new Error('invalid param() call for ' + name + ', got ' + fn); - } - - (this.params[name] = this.params[name] || []).push(fn); - return this; -}; - -/** - * Dispatch a req, res into the router. - * @private - */ - -proto.handle = function handle(req, res, out) { - var self = this; - - debug('dispatching %s %s', req.method, req.url); - - var idx = 0; - var protohost = getProtohost(req.url) || '' - var removed = ''; - var slashAdded = false; - var sync = 0 - var paramcalled = {}; - - // store options for OPTIONS request - // only used if OPTIONS request - var options = []; - - // middleware and routes - var stack = self.stack; - - // manage inter-router variables - var parentParams = req.params; - var parentUrl = req.baseUrl || ''; - var done = restore(out, req, 'baseUrl', 'next', 'params'); - - // setup next layer - req.next = next; - - // for options requests, respond with a default if nothing else responds - if (req.method === 'OPTIONS') { - done = wrap(done, function(old, err) { - if (err || options.length === 0) return old(err); - sendOptionsResponse(res, options, old); - }); - } - - // setup basic req values - req.baseUrl = parentUrl; - req.originalUrl = req.originalUrl || req.url; - - next(); - - function next(err) { - var layerError = err === 'route' - ? null - : err; - - // remove added slash - if (slashAdded) { - req.url = req.url.slice(1) - slashAdded = false; - } - - // restore altered req.url - if (removed.length !== 0) { - req.baseUrl = parentUrl; - req.url = protohost + removed + req.url.slice(protohost.length) - removed = ''; - } - - // signal to exit router - if (layerError === 'router') { - setImmediate(done, null) - return - } - - // no more matching layers - if (idx >= stack.length) { - setImmediate(done, layerError); - return; - } - - // max sync stack - if (++sync > 100) { - return setImmediate(next, err) - } - - // get pathname of request - var path = getPathname(req); - - if (path == null) { - return done(layerError); - } - - // find next matching layer - var layer; - var match; - var route; - - while (match !== true && idx < stack.length) { - layer = stack[idx++]; - match = matchLayer(layer, path); - route = layer.route; - - if (typeof match !== 'boolean') { - // hold on to layerError - layerError = layerError || match; - } - - if (match !== true) { - continue; - } - - if (!route) { - // process non-route handlers normally - continue; - } - - if (layerError) { - // routes do not match with a pending error - match = false; - continue; - } - - var method = req.method; - var has_method = route._handles_method(method); - - // build up automatic options response - if (!has_method && method === 'OPTIONS') { - appendMethods(options, route._options()); - } - - // don't even bother matching route - if (!has_method && method !== 'HEAD') { - match = false; - } - } - - // no match - if (match !== true) { - return done(layerError); - } - - // store route for dispatch on change - if (route) { - req.route = route; - } - - // Capture one-time layer values - req.params = self.mergeParams - ? mergeParams(layer.params, parentParams) - : layer.params; - var layerPath = layer.path; - - // this should be done for the layer - self.process_params(layer, paramcalled, req, res, function (err) { - if (err) { - next(layerError || err) - } else if (route) { - layer.handle_request(req, res, next) - } else { - trim_prefix(layer, layerError, layerPath, path) - } - - sync = 0 - }); - } - - function trim_prefix(layer, layerError, layerPath, path) { - if (layerPath.length !== 0) { - // Validate path is a prefix match - if (layerPath !== path.slice(0, layerPath.length)) { - next(layerError) - return - } - - // Validate path breaks on a path separator - var c = path[layerPath.length] - if (c && c !== '/' && c !== '.') return next(layerError) - - // Trim off the part of the url that matches the route - // middleware (.use stuff) needs to have the path stripped - debug('trim prefix (%s) from url %s', layerPath, req.url); - removed = layerPath; - req.url = protohost + req.url.slice(protohost.length + removed.length) - - // Ensure leading slash - if (!protohost && req.url[0] !== '/') { - req.url = '/' + req.url; - slashAdded = true; - } - - // Setup base URL (no trailing slash) - req.baseUrl = parentUrl + (removed[removed.length - 1] === '/' - ? removed.substring(0, removed.length - 1) - : removed); - } - - debug('%s %s : %s', layer.name, layerPath, req.originalUrl); - - if (layerError) { - layer.handle_error(layerError, req, res, next); - } else { - layer.handle_request(req, res, next); - } - } -}; - -/** - * Process any parameters for the layer. - * @private - */ - -proto.process_params = function process_params(layer, called, req, res, done) { - var params = this.params; - - // captured parameters from the layer, keys and values - var keys = layer.keys; - - // fast track - if (!keys || keys.length === 0) { - return done(); - } - - var i = 0; - var name; - var paramIndex = 0; - var key; - var paramVal; - var paramCallbacks; - var paramCalled; - - // process params in order - // param callbacks can be async - function param(err) { - if (err) { - return done(err); - } - - if (i >= keys.length ) { - return done(); - } - - paramIndex = 0; - key = keys[i++]; - name = key.name; - paramVal = req.params[name]; - paramCallbacks = params[name]; - paramCalled = called[name]; - - if (paramVal === undefined || !paramCallbacks) { - return param(); - } - - // param previously called with same value or error occurred - if (paramCalled && (paramCalled.match === paramVal - || (paramCalled.error && paramCalled.error !== 'route'))) { - // restore value - req.params[name] = paramCalled.value; - - // next param - return param(paramCalled.error); - } - - called[name] = paramCalled = { - error: null, - match: paramVal, - value: paramVal - }; - - paramCallback(); - } - - // single param callbacks - function paramCallback(err) { - var fn = paramCallbacks[paramIndex++]; - - // store updated value - paramCalled.value = req.params[key.name]; - - if (err) { - // store error - paramCalled.error = err; - param(err); - return; - } - - if (!fn) return param(); - - try { - fn(req, res, paramCallback, paramVal, key.name); - } catch (e) { - paramCallback(e); - } - } - - param(); -}; - -/** - * Use the given middleware function, with optional path, defaulting to "/". - * - * Use (like `.all`) will run for any http METHOD, but it will not add - * handlers for those methods so OPTIONS requests will not consider `.use` - * functions even if they could respond. - * - * The other difference is that _route_ path is stripped and not visible - * to the handler function. The main effect of this feature is that mounted - * handlers can operate without any code changes regardless of the "prefix" - * pathname. - * - * @public - */ - -proto.use = function use(fn) { - var offset = 0; - var path = '/'; - - // default path to '/' - // disambiguate router.use([fn]) - if (typeof fn !== 'function') { - var arg = fn; - - while (Array.isArray(arg) && arg.length !== 0) { - arg = arg[0]; - } - - // first arg is the path - if (typeof arg !== 'function') { - offset = 1; - path = fn; - } - } - - var callbacks = flatten(slice.call(arguments, offset)); - - if (callbacks.length === 0) { - throw new TypeError('Router.use() requires a middleware function') - } - - for (var i = 0; i < callbacks.length; i++) { - var fn = callbacks[i]; - - if (typeof fn !== 'function') { - throw new TypeError('Router.use() requires a middleware function but got a ' + gettype(fn)) - } - - // add the middleware - debug('use %o %s', path, fn.name || 'tobi
') - done(); - }) - }) - - it('should throw when the callback is missing', function(){ - var app = express(); - assert.throws(function () { - app.engine('.html', null); - }, /callback function required/) - }) - - it('should work without leading "."', function(done){ - var app = express(); - - app.set('views', path.join(__dirname, 'fixtures')) - app.engine('html', render); - app.locals.user = { name: 'tobi' }; - - app.render('user.html', function(err, str){ - if (err) return done(err); - assert.strictEqual(str, 'tobi
') - done(); - }) - }) - - it('should work "view engine" setting', function(done){ - var app = express(); - - app.set('views', path.join(__dirname, 'fixtures')) - app.engine('html', render); - app.set('view engine', 'html'); - app.locals.user = { name: 'tobi' }; - - app.render('user', function(err, str){ - if (err) return done(err); - assert.strictEqual(str, 'tobi
') - done(); - }) - }) - - it('should work "view engine" with leading "."', function(done){ - var app = express(); - - app.set('views', path.join(__dirname, 'fixtures')) - app.engine('.html', render); - app.set('view engine', '.html'); - app.locals.user = { name: 'tobi' }; - - app.render('user', function(err, str){ - if (err) return done(err); - assert.strictEqual(str, 'tobi
') - done(); - }) - }) - }) -}) diff --git a/test/app.head.js b/test/app.head.js deleted file mode 100644 index fabb9879..00000000 --- a/test/app.head.js +++ /dev/null @@ -1,66 +0,0 @@ -'use strict' - -var express = require('../'); -var request = require('supertest'); -var assert = require('assert'); - -describe('HEAD', function(){ - it('should default to GET', function(done){ - var app = express(); - - app.get('/tobi', function(req, res){ - // send() detects HEAD - res.send('tobi'); - }); - - request(app) - .head('/tobi') - .expect(200, done); - }) - - it('should output the same headers as GET requests', function(done){ - var app = express(); - - app.get('/tobi', function(req, res){ - // send() detects HEAD - res.send('tobi'); - }); - - request(app) - .head('/tobi') - .expect(200, function(err, res){ - if (err) return done(err); - var headers = res.headers; - request(app) - .get('/tobi') - .expect(200, function(err, res){ - if (err) return done(err); - delete headers.date; - delete res.headers.date; - assert.deepEqual(res.headers, headers); - done(); - }); - }); - }) -}) - -describe('app.head()', function(){ - it('should override', function(done){ - var app = express() - - app.head('/tobi', function(req, res){ - res.header('x-method', 'head') - res.end() - }); - - app.get('/tobi', function(req, res){ - res.header('x-method', 'get') - res.send('tobi'); - }); - - request(app) - .head('/tobi') - .expect('x-method', 'head') - .expect(200, done) - }) -}) diff --git a/test/app.js b/test/app.js deleted file mode 100644 index 6134717c..00000000 --- a/test/app.js +++ /dev/null @@ -1,132 +0,0 @@ -'use strict' - -var assert = require('assert') -var express = require('..') -var request = require('supertest') - -describe('app', function(){ - it('should inherit from event emitter', function(done){ - var app = express(); - app.on('foo', done); - app.emit('foo'); - }) - - it('should be callable', function(){ - var app = express(); - assert.equal(typeof app, 'function'); - }) - - it('should 404 without routes', function(done){ - request(express()) - .get('/') - .expect(404, done); - }) -}) - -describe('app.parent', function(){ - it('should return the parent when mounted', function(){ - var app = express() - , blog = express() - , blogAdmin = express(); - - app.use('/blog', blog); - blog.use('/admin', blogAdmin); - - assert(!app.parent, 'app.parent'); - assert.strictEqual(blog.parent, app) - assert.strictEqual(blogAdmin.parent, blog) - }) -}) - -describe('app.mountpath', function(){ - it('should return the mounted path', function(){ - var admin = express(); - var app = express(); - var blog = express(); - var fallback = express(); - - app.use('/blog', blog); - app.use(fallback); - blog.use('/admin', admin); - - assert.strictEqual(admin.mountpath, '/admin') - assert.strictEqual(app.mountpath, '/') - assert.strictEqual(blog.mountpath, '/blog') - assert.strictEqual(fallback.mountpath, '/') - }) -}) - -describe('app.router', function(){ - it('should throw with notice', function(done){ - var app = express() - - try { - app.router; - } catch(err) { - done(); - } - }) -}) - -describe('app.path()', function(){ - it('should return the canonical', function(){ - var app = express() - , blog = express() - , blogAdmin = express(); - - app.use('/blog', blog); - blog.use('/admin', blogAdmin); - - assert.strictEqual(app.path(), '') - assert.strictEqual(blog.path(), '/blog') - assert.strictEqual(blogAdmin.path(), '/blog/admin') - }) -}) - -describe('in development', function(){ - before(function () { - this.env = process.env.NODE_ENV - process.env.NODE_ENV = 'development' - }) - - after(function () { - process.env.NODE_ENV = this.env - }) - - it('should disable "view cache"', function(){ - var app = express(); - assert.ok(!app.enabled('view cache')) - }) -}) - -describe('in production', function(){ - before(function () { - this.env = process.env.NODE_ENV - process.env.NODE_ENV = 'production' - }) - - after(function () { - process.env.NODE_ENV = this.env - }) - - it('should enable "view cache"', function(){ - var app = express(); - assert.ok(app.enabled('view cache')) - }) -}) - -describe('without NODE_ENV', function(){ - before(function () { - this.env = process.env.NODE_ENV - process.env.NODE_ENV = '' - }) - - after(function () { - process.env.NODE_ENV = this.env - }) - - it('should default to development', function(){ - var app = express(); - assert.strictEqual(app.get('env'), 'development') - }) -}) diff --git a/test/app.listen.js b/test/app.listen.js deleted file mode 100644 index 5b150063..00000000 --- a/test/app.listen.js +++ /dev/null @@ -1,13 +0,0 @@ -'use strict' - -var express = require('../') - -describe('app.listen()', function(){ - it('should wrap with an HTTP server', function(done){ - var app = express(); - - var server = app.listen(0, function () { - server.close(done) - }); - }) -}) diff --git a/test/app.locals.js b/test/app.locals.js deleted file mode 100644 index 657b4b75..00000000 --- a/test/app.locals.js +++ /dev/null @@ -1,25 +0,0 @@ -'use strict' - -var assert = require('assert') -var express = require('../') - -describe('app', function(){ - describe('.locals', function () { - it('should default object', function () { - var app = express() - assert.ok(app.locals) - assert.strictEqual(typeof app.locals, 'object') - }) - - describe('.settings', function () { - it('should contain app settings ', function () { - var app = express() - app.set('title', 'Express') - assert.ok(app.locals.settings) - assert.strictEqual(typeof app.locals.settings, 'object') - assert.strictEqual(app.locals.settings, app.settings) - assert.strictEqual(app.locals.settings.title, 'Express') - }) - }) - }) -}) diff --git a/test/app.options.js b/test/app.options.js deleted file mode 100644 index fdfd38c8..00000000 --- a/test/app.options.js +++ /dev/null @@ -1,116 +0,0 @@ -'use strict' - -var express = require('../') - , request = require('supertest'); - -describe('OPTIONS', function(){ - it('should default to the routes defined', function(done){ - var app = express(); - - app.del('/', function(){}); - app.get('/users', function(req, res){}); - app.put('/users', function(req, res){}); - - request(app) - .options('/users') - .expect('Allow', 'GET,HEAD,PUT') - .expect(200, 'GET,HEAD,PUT', done); - }) - - it('should only include each method once', function(done){ - var app = express(); - - app.del('/', function(){}); - app.get('/users', function(req, res){}); - app.put('/users', function(req, res){}); - app.get('/users', function(req, res){}); - - request(app) - .options('/users') - .expect('Allow', 'GET,HEAD,PUT') - .expect(200, 'GET,HEAD,PUT', done); - }) - - it('should not be affected by app.all', function(done){ - var app = express(); - - app.get('/', function(){}); - app.get('/users', function(req, res){}); - app.put('/users', function(req, res){}); - app.all('/users', function(req, res, next){ - res.setHeader('x-hit', '1'); - next(); - }); - - request(app) - .options('/users') - .expect('x-hit', '1') - .expect('Allow', 'GET,HEAD,PUT') - .expect(200, 'GET,HEAD,PUT', done); - }) - - it('should not respond if the path is not defined', function(done){ - var app = express(); - - app.get('/users', function(req, res){}); - - request(app) - .options('/other') - .expect(404, done); - }) - - it('should forward requests down the middleware chain', function(done){ - var app = express(); - var router = new express.Router(); - - router.get('/users', function(req, res){}); - app.use(router); - app.get('/other', function(req, res){}); - - request(app) - .options('/other') - .expect('Allow', 'GET,HEAD') - .expect(200, 'GET,HEAD', done); - }) - - describe('when error occurs in response handler', function () { - it('should pass error to callback', function (done) { - var app = express(); - var router = express.Router(); - - router.get('/users', function(req, res){}); - - app.use(function (req, res, next) { - res.writeHead(200); - next(); - }); - app.use(router); - app.use(function (err, req, res, next) { - res.end('true'); - }); - - request(app) - .options('/users') - .expect(200, 'true', done) - }) - }) -}) - -describe('app.options()', function(){ - it('should override the default behavior', function(done){ - var app = express(); - - app.options('/users', function(req, res){ - res.set('Allow', 'GET'); - res.send('GET'); - }); - - app.get('/users', function(req, res){}); - app.put('/users', function(req, res){}); - - request(app) - .options('/users') - .expect('GET') - .expect('Allow', 'GET', done); - }) -}) diff --git a/test/app.param.js b/test/app.param.js deleted file mode 100644 index b4ccc8a2..00000000 --- a/test/app.param.js +++ /dev/null @@ -1,365 +0,0 @@ -'use strict' - -var assert = require('assert') -var express = require('../') - , request = require('supertest'); - -describe('app', function(){ - describe('.param(fn)', function(){ - it('should map app.param(name, ...) logic', function(done){ - var app = express(); - - app.param(function(name, regexp){ - if (Object.prototype.toString.call(regexp) === '[object RegExp]') { // See #1557 - return function(req, res, next, val){ - var captures; - if (captures = regexp.exec(String(val))) { - req.params[name] = captures[1]; - next(); - } else { - next('route'); - } - } - } - }) - - app.param(':name', /^([a-zA-Z]+)$/); - - app.get('/user/:name', function(req, res){ - res.send(req.params.name); - }); - - request(app) - .get('/user/tj') - .expect(200, 'tj', function (err) { - if (err) return done(err) - request(app) - .get('/user/123') - .expect(404, done); - }); - - }) - - it('should fail if not given fn', function(){ - var app = express(); - assert.throws(app.param.bind(app, ':name', 'bob')) - }) - }) - - describe('.param(names, fn)', function(){ - it('should map the array', function(done){ - var app = express(); - - app.param(['id', 'uid'], function(req, res, next, id){ - id = Number(id); - if (isNaN(id)) return next('route'); - req.params.id = id; - next(); - }); - - app.get('/post/:id', function(req, res){ - var id = req.params.id; - res.send((typeof id) + ':' + id) - }); - - app.get('/user/:uid', function(req, res){ - var id = req.params.id; - res.send((typeof id) + ':' + id) - }); - - request(app) - .get('/user/123') - .expect(200, 'number:123', function (err) { - if (err) return done(err) - request(app) - .get('/post/123') - .expect('number:123', done) - }) - }) - }) - - describe('.param(name, fn)', function(){ - it('should map logic for a single param', function(done){ - var app = express(); - - app.param('id', function(req, res, next, id){ - id = Number(id); - if (isNaN(id)) return next('route'); - req.params.id = id; - next(); - }); - - app.get('/user/:id', function(req, res){ - var id = req.params.id; - res.send((typeof id) + ':' + id) - }); - - request(app) - .get('/user/123') - .expect(200, 'number:123', done) - }) - - it('should only call once per request', function(done) { - var app = express(); - var called = 0; - var count = 0; - - app.param('user', function(req, res, next, user) { - called++; - req.user = user; - next(); - }); - - app.get('/foo/:user', function(req, res, next) { - count++; - next(); - }); - app.get('/foo/:user', function(req, res, next) { - count++; - next(); - }); - app.use(function(req, res) { - res.end([count, called, req.user].join(' ')); - }); - - request(app) - .get('/foo/bob') - .expect('2 1 bob', done); - }) - - it('should call when values differ', function(done) { - var app = express(); - var called = 0; - var count = 0; - - app.param('user', function(req, res, next, user) { - called++; - req.users = (req.users || []).concat(user); - next(); - }); - - app.get('/:user/bob', function(req, res, next) { - count++; - next(); - }); - app.get('/foo/:user', function(req, res, next) { - count++; - next(); - }); - app.use(function(req, res) { - res.end([count, called, req.users.join(',')].join(' ')); - }); - - request(app) - .get('/foo/bob') - .expect('2 2 foo,bob', done); - }) - - it('should support altering req.params across routes', function(done) { - var app = express(); - - app.param('user', function(req, res, next, user) { - req.params.user = 'loki'; - next(); - }); - - app.get('/:user', function(req, res, next) { - next('route'); - }); - app.get('/:user', function (req, res) { - res.send(req.params.user); - }); - - request(app) - .get('/bob') - .expect('loki', done); - }) - - it('should not invoke without route handler', function(done) { - var app = express(); - - app.param('thing', function(req, res, next, thing) { - req.thing = thing; - next(); - }); - - app.param('user', function(req, res, next, user) { - next(new Error('invalid invocation')) - }); - - app.post('/:user', function (req, res) { - res.send(req.params.user); - }); - - app.get('/:thing', function (req, res) { - res.send(req.thing); - }); - - request(app) - .get('/bob') - .expect(200, 'bob', done); - }) - - it('should work with encoded values', function(done){ - var app = express(); - - app.param('name', function(req, res, next, name){ - req.params.name = name; - next(); - }); - - app.get('/user/:name', function(req, res){ - var name = req.params.name; - res.send('' + name); - }); - - request(app) - .get('/user/foo%25bar') - .expect('foo%bar', done); - }) - - it('should catch thrown error', function(done){ - var app = express(); - - app.param('id', function(req, res, next, id){ - throw new Error('err!'); - }); - - app.get('/user/:id', function(req, res){ - var id = req.params.id; - res.send('' + id); - }); - - request(app) - .get('/user/123') - .expect(500, done); - }) - - it('should catch thrown secondary error', function(done){ - var app = express(); - - app.param('id', function(req, res, next, val){ - process.nextTick(next); - }); - - app.param('id', function(req, res, next, id){ - throw new Error('err!'); - }); - - app.get('/user/:id', function(req, res){ - var id = req.params.id; - res.send('' + id); - }); - - request(app) - .get('/user/123') - .expect(500, done); - }) - - it('should defer to next route', function(done){ - var app = express(); - - app.param('id', function(req, res, next, id){ - next('route'); - }); - - app.get('/user/:id', function(req, res){ - var id = req.params.id; - res.send('' + id); - }); - - app.get('/:name/123', function(req, res){ - res.send('name'); - }); - - request(app) - .get('/user/123') - .expect('name', done); - }) - - it('should defer all the param routes', function(done){ - var app = express(); - - app.param('id', function(req, res, next, val){ - if (val === 'new') return next('route'); - return next(); - }); - - app.all('/user/:id', function(req, res){ - res.send('all.id'); - }); - - app.get('/user/:id', function(req, res){ - res.send('get.id'); - }); - - app.get('/user/new', function(req, res){ - res.send('get.new'); - }); - - request(app) - .get('/user/new') - .expect('get.new', done); - }) - - it('should not call when values differ on error', function(done) { - var app = express(); - var called = 0; - var count = 0; - - app.param('user', function(req, res, next, user) { - called++; - if (user === 'foo') throw new Error('err!'); - req.user = user; - next(); - }); - - app.get('/:user/bob', function(req, res, next) { - count++; - next(); - }); - app.get('/foo/:user', function(req, res, next) { - count++; - next(); - }); - - app.use(function(err, req, res, next) { - res.status(500); - res.send([count, called, err.message].join(' ')); - }); - - request(app) - .get('/foo/bob') - .expect(500, '0 1 err!', done) - }); - - it('should call when values differ when using "next"', function(done) { - var app = express(); - var called = 0; - var count = 0; - - app.param('user', function(req, res, next, user) { - called++; - if (user === 'foo') return next('route'); - req.user = user; - next(); - }); - - app.get('/:user/bob', function(req, res, next) { - count++; - next(); - }); - app.get('/foo/:user', function(req, res, next) { - count++; - next(); - }); - app.use(function(req, res) { - res.end([count, called, req.user].join(' ')); - }); - - request(app) - .get('/foo/bob') - .expect('1 2 bob', done); - }) - }) -}) diff --git a/test/app.render.js b/test/app.render.js deleted file mode 100644 index 9d202acf..00000000 --- a/test/app.render.js +++ /dev/null @@ -1,374 +0,0 @@ -'use strict' - -var assert = require('assert') -var express = require('..'); -var path = require('path') -var tmpl = require('./support/tmpl'); - -describe('app', function(){ - describe('.render(name, fn)', function(){ - it('should support absolute paths', function(done){ - var app = createApp(); - - app.locals.user = { name: 'tobi' }; - - app.render(path.join(__dirname, 'fixtures', 'user.tmpl'), function (err, str) { - if (err) return done(err); - assert.strictEqual(str, 'tobi
') - done(); - }) - }) - - it('should support absolute paths with "view engine"', function(done){ - var app = createApp(); - - app.set('view engine', 'tmpl'); - app.locals.user = { name: 'tobi' }; - - app.render(path.join(__dirname, 'fixtures', 'user'), function (err, str) { - if (err) return done(err); - assert.strictEqual(str, 'tobi
') - done(); - }) - }) - - it('should expose app.locals', function(done){ - var app = createApp(); - - app.set('views', path.join(__dirname, 'fixtures')) - app.locals.user = { name: 'tobi' }; - - app.render('user.tmpl', function (err, str) { - if (err) return done(err); - assert.strictEqual(str, 'tobi
') - done(); - }) - }) - - it('should support index.This is an email
') - done(); - }) - }) - }) - - describe('when "view engine" is given', function(){ - it('should render the template', function(done){ - var app = createApp(); - - app.set('view engine', 'tmpl'); - app.set('views', path.join(__dirname, 'fixtures')) - - app.render('email', function(err, str){ - if (err) return done(err); - assert.strictEqual(str, 'This is an email
') - done(); - }) - }) - }) - - describe('when "views" is given', function(){ - it('should lookup the file in the path', function(done){ - var app = createApp(); - - app.set('views', path.join(__dirname, 'fixtures', 'default_layout')) - app.locals.user = { name: 'tobi' }; - - app.render('user.tmpl', function (err, str) { - if (err) return done(err); - assert.strictEqual(str, 'tobi
') - done(); - }) - }) - - describe('when array of paths', function(){ - it('should lookup the file in the path', function(done){ - var app = createApp(); - var views = [ - path.join(__dirname, 'fixtures', 'local_layout'), - path.join(__dirname, 'fixtures', 'default_layout') - ] - - app.set('views', views); - app.locals.user = { name: 'tobi' }; - - app.render('user.tmpl', function (err, str) { - if (err) return done(err); - assert.strictEqual(str, 'tobi') - done(); - }) - }) - - it('should lookup in later paths until found', function(done){ - var app = createApp(); - var views = [ - path.join(__dirname, 'fixtures', 'local_layout'), - path.join(__dirname, 'fixtures', 'default_layout') - ] - - app.set('views', views); - app.locals.name = 'tobi'; - - app.render('name.tmpl', function (err, str) { - if (err) return done(err); - assert.strictEqual(str, 'tobi
') - done(); - }) - }) - - it('should error if file does not exist', function(done){ - var app = createApp(); - var views = [ - path.join(__dirname, 'fixtures', 'local_layout'), - path.join(__dirname, 'fixtures', 'default_layout') - ] - - app.set('views', views); - app.locals.name = 'tobi'; - - app.render('pet.tmpl', function (err, str) { - assert.ok(err) - assert.equal(err.message, 'Failed to lookup view "pet.tmpl" in views directories "' + views[0] + '" or "' + views[1] + '"') - done(); - }) - }) - }) - }) - - describe('when a "view" constructor is given', function(){ - it('should create an instance of it', function(done){ - var app = express(); - - function View(name, options){ - this.name = name; - this.path = 'path is required by application.js as a signal of success even though it is not used there.'; - } - - View.prototype.render = function(options, fn){ - fn(null, 'abstract engine'); - }; - - app.set('view', View); - - app.render('something', function(err, str){ - if (err) return done(err); - assert.strictEqual(str, 'abstract engine') - done(); - }) - }) - }) - - describe('caching', function(){ - it('should always lookup view without cache', function(done){ - var app = express(); - var count = 0; - - function View(name, options){ - this.name = name; - this.path = 'fake'; - count++; - } - - View.prototype.render = function(options, fn){ - fn(null, 'abstract engine'); - }; - - app.set('view cache', false); - app.set('view', View); - - app.render('something', function(err, str){ - if (err) return done(err); - assert.strictEqual(count, 1) - assert.strictEqual(str, 'abstract engine') - app.render('something', function(err, str){ - if (err) return done(err); - assert.strictEqual(count, 2) - assert.strictEqual(str, 'abstract engine') - done(); - }) - }) - }) - - it('should cache with "view cache" setting', function(done){ - var app = express(); - var count = 0; - - function View(name, options){ - this.name = name; - this.path = 'fake'; - count++; - } - - View.prototype.render = function(options, fn){ - fn(null, 'abstract engine'); - }; - - app.set('view cache', true); - app.set('view', View); - - app.render('something', function(err, str){ - if (err) return done(err); - assert.strictEqual(count, 1) - assert.strictEqual(str, 'abstract engine') - app.render('something', function(err, str){ - if (err) return done(err); - assert.strictEqual(count, 1) - assert.strictEqual(str, 'abstract engine') - done(); - }) - }) - }) - }) - }) - - describe('.render(name, options, fn)', function(){ - it('should render the template', function(done){ - var app = createApp(); - - app.set('views', path.join(__dirname, 'fixtures')) - - var user = { name: 'tobi' }; - - app.render('user.tmpl', { user: user }, function (err, str) { - if (err) return done(err); - assert.strictEqual(str, 'tobi
') - done(); - }) - }) - - it('should expose app.locals', function(done){ - var app = createApp(); - - app.set('views', path.join(__dirname, 'fixtures')) - app.locals.user = { name: 'tobi' }; - - app.render('user.tmpl', {}, function (err, str) { - if (err) return done(err); - assert.strictEqual(str, 'tobi
') - done(); - }) - }) - - it('should give precedence to app.render() locals', function(done){ - var app = createApp(); - - app.set('views', path.join(__dirname, 'fixtures')) - app.locals.user = { name: 'tobi' }; - var jane = { name: 'jane' }; - - app.render('user.tmpl', { user: jane }, function (err, str) { - if (err) return done(err); - assert.strictEqual(str, 'jane
') - done(); - }) - }) - - describe('caching', function(){ - it('should cache with cache option', function(done){ - var app = express(); - var count = 0; - - function View(name, options){ - this.name = name; - this.path = 'fake'; - count++; - } - - View.prototype.render = function(options, fn){ - fn(null, 'abstract engine'); - }; - - app.set('view cache', false); - app.set('view', View); - - app.render('something', {cache: true}, function(err, str){ - if (err) return done(err); - assert.strictEqual(count, 1) - assert.strictEqual(str, 'abstract engine') - app.render('something', {cache: true}, function(err, str){ - if (err) return done(err); - assert.strictEqual(count, 1) - assert.strictEqual(str, 'abstract engine') - done(); - }) - }) - }) - }) - }) -}) - -function createApp() { - var app = express(); - - app.engine('.tmpl', tmpl); - - return app; -} diff --git a/test/app.request.js b/test/app.request.js deleted file mode 100644 index 4930af84..00000000 --- a/test/app.request.js +++ /dev/null @@ -1,143 +0,0 @@ -'use strict' - -var after = require('after') -var express = require('../') - , request = require('supertest'); - -describe('app', function(){ - describe('.request', function(){ - it('should extend the request prototype', function(done){ - var app = express(); - - app.request.querystring = function(){ - return require('url').parse(this.url).query; - }; - - app.use(function(req, res){ - res.end(req.querystring()); - }); - - request(app) - .get('/foo?name=tobi') - .expect('name=tobi', done); - }) - - it('should only extend for the referenced app', function (done) { - var app1 = express() - var app2 = express() - var cb = after(2, done) - - app1.request.foobar = function () { - return 'tobi' - } - - app1.get('/', function (req, res) { - res.send(req.foobar()) - }) - - app2.get('/', function (req, res) { - res.send(req.foobar()) - }) - - request(app1) - .get('/') - .expect(200, 'tobi', cb) - - request(app2) - .get('/') - .expect(500, /(?:not a function|has no method)/, cb) - }) - - it('should inherit to sub apps', function (done) { - var app1 = express() - var app2 = express() - var cb = after(2, done) - - app1.request.foobar = function () { - return 'tobi' - } - - app1.use('/sub', app2) - - app1.get('/', function (req, res) { - res.send(req.foobar()) - }) - - app2.get('/', function (req, res) { - res.send(req.foobar()) - }) - - request(app1) - .get('/') - .expect(200, 'tobi', cb) - - request(app1) - .get('/sub') - .expect(200, 'tobi', cb) - }) - - it('should allow sub app to override', function (done) { - var app1 = express() - var app2 = express() - var cb = after(2, done) - - app1.request.foobar = function () { - return 'tobi' - } - - app2.request.foobar = function () { - return 'loki' - } - - app1.use('/sub', app2) - - app1.get('/', function (req, res) { - res.send(req.foobar()) - }) - - app2.get('/', function (req, res) { - res.send(req.foobar()) - }) - - request(app1) - .get('/') - .expect(200, 'tobi', cb) - - request(app1) - .get('/sub') - .expect(200, 'loki', cb) - }) - - it('should not pollute parent app', function (done) { - var app1 = express() - var app2 = express() - var cb = after(2, done) - - app1.request.foobar = function () { - return 'tobi' - } - - app2.request.foobar = function () { - return 'loki' - } - - app1.use('/sub', app2) - - app1.get('/sub/foo', function (req, res) { - res.send(req.foobar()) - }) - - app2.get('/', function (req, res) { - res.send(req.foobar()) - }) - - request(app1) - .get('/sub') - .expect(200, 'loki', cb) - - request(app1) - .get('/sub/foo') - .expect(200, 'tobi', cb) - }) - }) -}) diff --git a/test/app.response.js b/test/app.response.js deleted file mode 100644 index 5fb69f62..00000000 --- a/test/app.response.js +++ /dev/null @@ -1,143 +0,0 @@ -'use strict' - -var after = require('after') -var express = require('../') - , request = require('supertest'); - -describe('app', function(){ - describe('.response', function(){ - it('should extend the response prototype', function(done){ - var app = express(); - - app.response.shout = function(str){ - this.send(str.toUpperCase()); - }; - - app.use(function(req, res){ - res.shout('hey'); - }); - - request(app) - .get('/') - .expect('HEY', done); - }) - - it('should only extend for the referenced app', function (done) { - var app1 = express() - var app2 = express() - var cb = after(2, done) - - app1.response.shout = function (str) { - this.send(str.toUpperCase()) - } - - app1.get('/', function (req, res) { - res.shout('foo') - }) - - app2.get('/', function (req, res) { - res.shout('foo') - }) - - request(app1) - .get('/') - .expect(200, 'FOO', cb) - - request(app2) - .get('/') - .expect(500, /(?:not a function|has no method)/, cb) - }) - - it('should inherit to sub apps', function (done) { - var app1 = express() - var app2 = express() - var cb = after(2, done) - - app1.response.shout = function (str) { - this.send(str.toUpperCase()) - } - - app1.use('/sub', app2) - - app1.get('/', function (req, res) { - res.shout('foo') - }) - - app2.get('/', function (req, res) { - res.shout('foo') - }) - - request(app1) - .get('/') - .expect(200, 'FOO', cb) - - request(app1) - .get('/sub') - .expect(200, 'FOO', cb) - }) - - it('should allow sub app to override', function (done) { - var app1 = express() - var app2 = express() - var cb = after(2, done) - - app1.response.shout = function (str) { - this.send(str.toUpperCase()) - } - - app2.response.shout = function (str) { - this.send(str + '!') - } - - app1.use('/sub', app2) - - app1.get('/', function (req, res) { - res.shout('foo') - }) - - app2.get('/', function (req, res) { - res.shout('foo') - }) - - request(app1) - .get('/') - .expect(200, 'FOO', cb) - - request(app1) - .get('/sub') - .expect(200, 'foo!', cb) - }) - - it('should not pollute parent app', function (done) { - var app1 = express() - var app2 = express() - var cb = after(2, done) - - app1.response.shout = function (str) { - this.send(str.toUpperCase()) - } - - app2.response.shout = function (str) { - this.send(str + '!') - } - - app1.use('/sub', app2) - - app1.get('/sub/foo', function (req, res) { - res.shout('foo') - }) - - app2.get('/', function (req, res) { - res.shout('foo') - }) - - request(app1) - .get('/sub') - .expect(200, 'foo!', cb) - - request(app1) - .get('/sub/foo') - .expect(200, 'FOO', cb) - }) - }) -}) diff --git a/test/app.route.js b/test/app.route.js deleted file mode 100644 index eaf8a120..00000000 --- a/test/app.route.js +++ /dev/null @@ -1,64 +0,0 @@ -'use strict' - -var express = require('../'); -var request = require('supertest'); - -describe('app.route', function(){ - it('should return a new route', function(done){ - var app = express(); - - app.route('/foo') - .get(function(req, res) { - res.send('get'); - }) - .post(function(req, res) { - res.send('post'); - }); - - request(app) - .post('/foo') - .expect('post', done); - }); - - it('should all .VERB after .all', function(done){ - var app = express(); - - app.route('/foo') - .all(function(req, res, next) { - next(); - }) - .get(function(req, res) { - res.send('get'); - }) - .post(function(req, res) { - res.send('post'); - }); - - request(app) - .post('/foo') - .expect('post', done); - }); - - it('should support dynamic routes', function(done){ - var app = express(); - - app.route('/:foo') - .get(function(req, res) { - res.send(req.params.foo); - }); - - request(app) - .get('/test') - .expect('test', done); - }); - - it('should not error on empty routes', function(done){ - var app = express(); - - app.route('/:foo'); - - request(app) - .get('/test') - .expect(404, done); - }); -}); diff --git a/test/app.router.js b/test/app.router.js deleted file mode 100644 index 4fde0310..00000000 --- a/test/app.router.js +++ /dev/null @@ -1,1111 +0,0 @@ -'use strict' - -var after = require('after'); -var express = require('../') - , request = require('supertest') - , assert = require('assert') - , methods = require('methods'); - -describe('app.router', function(){ - it('should restore req.params after leaving router', function(done){ - var app = express(); - var router = new express.Router(); - - function handler1(req, res, next){ - res.setHeader('x-user-id', String(req.params.id)); - next() - } - - function handler2(req, res){ - res.send(req.params.id); - } - - router.use(function(req, res, next){ - res.setHeader('x-router', String(req.params.id)); - next(); - }); - - app.get('/user/:id', handler1, router, handler2); - - request(app) - .get('/user/1') - .expect('x-router', 'undefined') - .expect('x-user-id', '1') - .expect(200, '1', done); - }) - - describe('methods', function(){ - methods.concat('del').forEach(function(method){ - if (method === 'connect') return; - - it('should include ' + method.toUpperCase(), function(done){ - var app = express(); - - app[method]('/foo', function(req, res){ - res.send(method) - }); - - request(app) - [method]('/foo') - .expect(200, done) - }) - - it('should reject numbers for app.' + method, function(){ - var app = express(); - assert.throws(app[method].bind(app, '/', 3), /Number/) - }) - }); - - it('should re-route when method is altered', function (done) { - var app = express(); - var cb = after(3, done); - - app.use(function (req, res, next) { - if (req.method !== 'POST') return next(); - req.method = 'DELETE'; - res.setHeader('X-Method-Altered', '1'); - next(); - }); - - app.delete('/', function (req, res) { - res.end('deleted everything'); - }); - - request(app) - .get('/') - .expect(404, cb) - - request(app) - .delete('/') - .expect(200, 'deleted everything', cb); - - request(app) - .post('/') - .expect('X-Method-Altered', '1') - .expect(200, 'deleted everything', cb); - }); - }) - - describe('decode params', function () { - it('should decode correct params', function(done){ - var app = express(); - - app.get('/:name', function (req, res) { - res.send(req.params.name); - }); - - request(app) - .get('/foo%2Fbar') - .expect('foo/bar', done); - }) - - it('should not accept params in malformed paths', function(done) { - var app = express(); - - app.get('/:name', function (req, res) { - res.send(req.params.name); - }); - - request(app) - .get('/%foobar') - .expect(400, done); - }) - - it('should not decode spaces', function(done) { - var app = express(); - - app.get('/:name', function (req, res) { - res.send(req.params.name); - }); - - request(app) - .get('/foo+bar') - .expect('foo+bar', done); - }) - - it('should work with unicode', function(done) { - var app = express(); - - app.get('/:name', function (req, res) { - res.send(req.params.name); - }); - - request(app) - .get('/%ce%b1') - .expect('\u03b1', done); - }) - }) - - it('should be .use()able', function(done){ - var app = express(); - - var calls = []; - - app.use(function(req, res, next){ - calls.push('before'); - next(); - }); - - app.get('/', function(req, res, next){ - calls.push('GET /') - next(); - }); - - app.use(function(req, res, next){ - calls.push('after'); - res.json(calls) - }); - - request(app) - .get('/') - .expect(200, ['before', 'GET /', 'after'], done) - }) - - describe('when given a regexp', function(){ - it('should match the pathname only', function(done){ - var app = express(); - - app.get(/^\/user\/[0-9]+$/, function(req, res){ - res.end('user'); - }); - - request(app) - .get('/user/12?foo=bar') - .expect('user', done); - }) - - it('should populate req.params with the captures', function(done){ - var app = express(); - - app.get(/^\/user\/([0-9]+)\/(view|edit)?$/, function(req, res){ - var id = req.params[0] - , op = req.params[1]; - res.end(op + 'ing user ' + id); - }); - - request(app) - .get('/user/10/edit') - .expect('editing user 10', done); - }) - - it('should ensure regexp matches path prefix', function (done) { - var app = express() - var p = [] - - app.use(/\/api.*/, function (req, res, next) { - p.push('a') - next() - }) - app.use(/api/, function (req, res, next) { - p.push('b') - next() - }) - app.use(/\/test/, function (req, res, next) { - p.push('c') - next() - }) - app.use(function (req, res) { - res.end() - }) - - request(app) - .get('/test/api/1234') - .expect(200, function (err) { - if (err) return done(err) - assert.deepEqual(p, ['c']) - done() - }) - }) - }) - - describe('case sensitivity', function(){ - it('should be disabled by default', function(done){ - var app = express(); - - app.get('/user', function(req, res){ - res.end('tj'); - }); - - request(app) - .get('/USER') - .expect('tj', done); - }) - - describe('when "case sensitive routing" is enabled', function(){ - it('should match identical casing', function(done){ - var app = express(); - - app.enable('case sensitive routing'); - - app.get('/uSer', function(req, res){ - res.end('tj'); - }); - - request(app) - .get('/uSer') - .expect('tj', done); - }) - - it('should not match otherwise', function(done){ - var app = express(); - - app.enable('case sensitive routing'); - - app.get('/uSer', function(req, res){ - res.end('tj'); - }); - - request(app) - .get('/user') - .expect(404, done); - }) - }) - }) - - describe('params', function(){ - it('should overwrite existing req.params by default', function(done){ - var app = express(); - var router = new express.Router(); - - router.get('/:action', function(req, res){ - res.send(req.params); - }); - - app.use('/user/:user', router); - - request(app) - .get('/user/1/get') - .expect(200, '{"action":"get"}', done); - }) - - it('should allow merging existing req.params', function(done){ - var app = express(); - var router = new express.Router({ mergeParams: true }); - - router.get('/:action', function(req, res){ - var keys = Object.keys(req.params).sort(); - res.send(keys.map(function(k){ return [k, req.params[k]] })); - }); - - app.use('/user/:user', router); - - request(app) - .get('/user/tj/get') - .expect(200, '[["action","get"],["user","tj"]]', done); - }) - - it('should use params from router', function(done){ - var app = express(); - var router = new express.Router({ mergeParams: true }); - - router.get('/:thing', function(req, res){ - var keys = Object.keys(req.params).sort(); - res.send(keys.map(function(k){ return [k, req.params[k]] })); - }); - - app.use('/user/:thing', router); - - request(app) - .get('/user/tj/get') - .expect(200, '[["thing","get"]]', done); - }) - - it('should merge numeric indices req.params', function(done){ - var app = express(); - var router = new express.Router({ mergeParams: true }); - - router.get('/*.*', function(req, res){ - var keys = Object.keys(req.params).sort(); - res.send(keys.map(function(k){ return [k, req.params[k]] })); - }); - - app.use('/user/id:(\\d+)', router); - - request(app) - .get('/user/id:10/profile.json') - .expect(200, '[["0","10"],["1","profile"],["2","json"]]', done); - }) - - it('should merge numeric indices req.params when more in parent', function(done){ - var app = express(); - var router = new express.Router({ mergeParams: true }); - - router.get('/*', function(req, res){ - var keys = Object.keys(req.params).sort(); - res.send(keys.map(function(k){ return [k, req.params[k]] })); - }); - - app.use('/user/id:(\\d+)/name:(\\w+)', router); - - request(app) - .get('/user/id:10/name:tj/profile') - .expect(200, '[["0","10"],["1","tj"],["2","profile"]]', done); - }) - - it('should merge numeric indices req.params when parent has same number', function(done){ - var app = express(); - var router = new express.Router({ mergeParams: true }); - - router.get('/name:(\\w+)', function(req, res){ - var keys = Object.keys(req.params).sort(); - res.send(keys.map(function(k){ return [k, req.params[k]] })); - }); - - app.use('/user/id:(\\d+)', router); - - request(app) - .get('/user/id:10/name:tj') - .expect(200, '[["0","10"],["1","tj"]]', done); - }) - - it('should ignore invalid incoming req.params', function(done){ - var app = express(); - var router = new express.Router({ mergeParams: true }); - - router.get('/:name', function(req, res){ - var keys = Object.keys(req.params).sort(); - res.send(keys.map(function(k){ return [k, req.params[k]] })); - }); - - app.use('/user/', function (req, res, next) { - req.params = 3; // wat? - router(req, res, next); - }); - - request(app) - .get('/user/tj') - .expect(200, '[["name","tj"]]', done); - }) - - it('should restore req.params', function(done){ - var app = express(); - var router = new express.Router({ mergeParams: true }); - - router.get('/user:(\\w+)/*', function (req, res, next) { - next(); - }); - - app.use('/user/id:(\\d+)', function (req, res, next) { - router(req, res, function (err) { - var keys = Object.keys(req.params).sort(); - res.send(keys.map(function(k){ return [k, req.params[k]] })); - }); - }); - - request(app) - .get('/user/id:42/user:tj/profile') - .expect(200, '[["0","42"]]', done); - }) - }) - - describe('trailing slashes', function(){ - it('should be optional by default', function(done){ - var app = express(); - - app.get('/user', function(req, res){ - res.end('tj'); - }); - - request(app) - .get('/user/') - .expect('tj', done); - }) - - describe('when "strict routing" is enabled', function(){ - it('should match trailing slashes', function(done){ - var app = express(); - - app.enable('strict routing'); - - app.get('/user/', function(req, res){ - res.end('tj'); - }); - - request(app) - .get('/user/') - .expect('tj', done); - }) - - it('should pass-though middleware', function(done){ - var app = express(); - - app.enable('strict routing'); - - app.use(function (req, res, next) { - res.setHeader('x-middleware', 'true'); - next(); - }); - - app.get('/user/', function(req, res){ - res.end('tj'); - }); - - request(app) - .get('/user/') - .expect('x-middleware', 'true') - .expect(200, 'tj', done); - }) - - it('should pass-though mounted middleware', function(done){ - var app = express(); - - app.enable('strict routing'); - - app.use('/user/', function (req, res, next) { - res.setHeader('x-middleware', 'true'); - next(); - }); - - app.get('/user/test/', function(req, res){ - res.end('tj'); - }); - - request(app) - .get('/user/test/') - .expect('x-middleware', 'true') - .expect(200, 'tj', done); - }) - - it('should match no slashes', function(done){ - var app = express(); - - app.enable('strict routing'); - - app.get('/user', function(req, res){ - res.end('tj'); - }); - - request(app) - .get('/user') - .expect('tj', done); - }) - - it('should match middleware when omitting the trailing slash', function(done){ - var app = express(); - - app.enable('strict routing'); - - app.use('/user/', function(req, res){ - res.end('tj'); - }); - - request(app) - .get('/user') - .expect(200, 'tj', done); - }) - - it('should match middleware', function(done){ - var app = express(); - - app.enable('strict routing'); - - app.use('/user', function(req, res){ - res.end('tj'); - }); - - request(app) - .get('/user') - .expect(200, 'tj', done); - }) - - it('should match middleware when adding the trailing slash', function(done){ - var app = express(); - - app.enable('strict routing'); - - app.use('/user', function(req, res){ - res.end('tj'); - }); - - request(app) - .get('/user/') - .expect(200, 'tj', done); - }) - - it('should fail when omitting the trailing slash', function(done){ - var app = express(); - - app.enable('strict routing'); - - app.get('/user/', function(req, res){ - res.end('tj'); - }); - - request(app) - .get('/user') - .expect(404, done); - }) - - it('should fail when adding the trailing slash', function(done){ - var app = express(); - - app.enable('strict routing'); - - app.get('/user', function(req, res){ - res.end('tj'); - }); - - request(app) - .get('/user/') - .expect(404, done); - }) - }) - }) - - it('should allow escaped regexp', function(done){ - var app = express(); - - app.get('/user/\\d+', function(req, res){ - res.end('woot'); - }); - - request(app) - .get('/user/10') - .expect(200, function (err) { - if (err) return done(err) - request(app) - .get('/user/tj') - .expect(404, done); - }); - }) - - it('should allow literal "."', function(done){ - var app = express(); - - app.get('/api/users/:from..:to', function(req, res){ - var from = req.params.from - , to = req.params.to; - - res.end('users from ' + from + ' to ' + to); - }); - - request(app) - .get('/api/users/1..50') - .expect('users from 1 to 50', done); - }) - - describe('*', function(){ - it('should capture everything', function (done) { - var app = express() - - app.get('*', function (req, res) { - res.end(req.params[0]) - }) - - request(app) - .get('/user/tobi.json') - .expect('/user/tobi.json', done) - }) - - it('should decode the capture', function (done) { - var app = express() - - app.get('*', function (req, res) { - res.end(req.params[0]) - }) - - request(app) - .get('/user/tobi%20and%20loki.json') - .expect('/user/tobi and loki.json', done) - }) - - it('should denote a greedy capture group', function(done){ - var app = express(); - - app.get('/user/*.json', function(req, res){ - res.end(req.params[0]); - }); - - request(app) - .get('/user/tj.json') - .expect('tj', done); - }) - - it('should work with several', function(done){ - var app = express(); - - app.get('/api/*.*', function(req, res){ - var resource = req.params[0] - , format = req.params[1]; - res.end(resource + ' as ' + format); - }); - - request(app) - .get('/api/users/foo.bar.json') - .expect('users/foo.bar as json', done); - }) - - it('should work cross-segment', function(done){ - var app = express(); - var cb = after(2, done) - - app.get('/api*', function(req, res){ - res.send(req.params[0]); - }); - - request(app) - .get('/api') - .expect(200, '', cb) - - request(app) - .get('/api/hey') - .expect(200, '/hey', cb) - }) - - it('should allow naming', function(done){ - var app = express(); - - app.get('/api/:resource(*)', function(req, res){ - var resource = req.params.resource; - res.end(resource); - }); - - request(app) - .get('/api/users/0.json') - .expect('users/0.json', done); - }) - - it('should not be greedy immediately after param', function(done){ - var app = express(); - - app.get('/user/:user*', function(req, res){ - res.end(req.params.user); - }); - - request(app) - .get('/user/122') - .expect('122', done); - }) - - it('should eat everything after /', function(done){ - var app = express(); - - app.get('/user/:user*', function(req, res){ - res.end(req.params.user); - }); - - request(app) - .get('/user/122/aaa') - .expect('122', done); - }) - - it('should span multiple segments', function(done){ - var app = express(); - - app.get('/file/*', function(req, res){ - res.end(req.params[0]); - }); - - request(app) - .get('/file/javascripts/jquery.js') - .expect('javascripts/jquery.js', done); - }) - - it('should be optional', function(done){ - var app = express(); - - app.get('/file/*', function(req, res){ - res.end(req.params[0]); - }); - - request(app) - .get('/file/') - .expect('', done); - }) - - it('should require a preceding /', function(done){ - var app = express(); - - app.get('/file/*', function(req, res){ - res.end(req.params[0]); - }); - - request(app) - .get('/file') - .expect(404, done); - }) - - it('should keep correct parameter indexes', function(done){ - var app = express(); - - app.get('/*/user/:id', function (req, res) { - res.send(req.params); - }); - - request(app) - .get('/1/user/2') - .expect(200, '{"0":"1","id":"2"}', done); - }) - - it('should work within arrays', function(done){ - var app = express(); - - app.get(['/user/:id', '/foo/*', '/:bar'], function (req, res) { - res.send(req.params.bar); - }); - - request(app) - .get('/test') - .expect(200, 'test', done); - }) - }) - - describe(':name', function(){ - it('should denote a capture group', function(done){ - var app = express(); - - app.get('/user/:user', function(req, res){ - res.end(req.params.user); - }); - - request(app) - .get('/user/tj') - .expect('tj', done); - }) - - it('should match a single segment only', function(done){ - var app = express(); - - app.get('/user/:user', function(req, res){ - res.end(req.params.user); - }); - - request(app) - .get('/user/tj/edit') - .expect(404, done); - }) - - it('should allow several capture groups', function(done){ - var app = express(); - - app.get('/user/:user/:op', function(req, res){ - res.end(req.params.op + 'ing ' + req.params.user); - }); - - request(app) - .get('/user/tj/edit') - .expect('editing tj', done); - }) - - it('should work following a partial capture group', function(done){ - var app = express(); - var cb = after(2, done); - - app.get('/user(s)?/:user/:op', function(req, res){ - res.end(req.params.op + 'ing ' + req.params.user + (req.params[0] ? ' (old)' : '')); - }); - - request(app) - .get('/user/tj/edit') - .expect('editing tj', cb); - - request(app) - .get('/users/tj/edit') - .expect('editing tj (old)', cb); - }) - - it('should work inside literal parenthesis', function(done){ - var app = express(); - - app.get('/:user\\(:op\\)', function(req, res){ - res.end(req.params.op + 'ing ' + req.params.user); - }); - - request(app) - .get('/tj(edit)') - .expect('editing tj', done); - }) - - it('should work in array of paths', function(done){ - var app = express(); - var cb = after(2, done); - - app.get(['/user/:user/poke', '/user/:user/pokes'], function(req, res){ - res.end('poking ' + req.params.user); - }); - - request(app) - .get('/user/tj/poke') - .expect('poking tj', cb); - - request(app) - .get('/user/tj/pokes') - .expect('poking tj', cb); - }) - }) - - describe(':name?', function(){ - it('should denote an optional capture group', function(done){ - var app = express(); - - app.get('/user/:user/:op?', function(req, res){ - var op = req.params.op || 'view'; - res.end(op + 'ing ' + req.params.user); - }); - - request(app) - .get('/user/tj') - .expect('viewing tj', done); - }) - - it('should populate the capture group', function(done){ - var app = express(); - - app.get('/user/:user/:op?', function(req, res){ - var op = req.params.op || 'view'; - res.end(op + 'ing ' + req.params.user); - }); - - request(app) - .get('/user/tj/edit') - .expect('editing tj', done); - }) - }) - - describe('.:name', function(){ - it('should denote a format', function(done){ - var app = express(); - var cb = after(2, done) - - app.get('/:name.:format', function(req, res){ - res.end(req.params.name + ' as ' + req.params.format); - }); - - request(app) - .get('/foo.json') - .expect(200, 'foo as json', cb) - - request(app) - .get('/foo') - .expect(404, cb) - }) - }) - - describe('.:name?', function(){ - it('should denote an optional format', function(done){ - var app = express(); - var cb = after(2, done) - - app.get('/:name.:format?', function(req, res){ - res.end(req.params.name + ' as ' + (req.params.format || 'html')); - }); - - request(app) - .get('/foo') - .expect(200, 'foo as html', cb) - - request(app) - .get('/foo.json') - .expect(200, 'foo as json', done) - }) - }) - - describe('when next() is called', function(){ - it('should continue lookup', function(done){ - var app = express() - , calls = []; - - app.get('/foo/:bar?', function(req, res, next){ - calls.push('/foo/:bar?'); - next(); - }); - - app.get('/bar', function () { - assert(0); - }); - - app.get('/foo', function(req, res, next){ - calls.push('/foo'); - next(); - }); - - app.get('/foo', function (req, res) { - calls.push('/foo 2'); - res.json(calls) - }); - - request(app) - .get('/foo') - .expect(200, ['/foo/:bar?', '/foo', '/foo 2'], done) - }) - }) - - describe('when next("route") is called', function(){ - it('should jump to next route', function(done){ - var app = express() - - function fn(req, res, next){ - res.set('X-Hit', '1') - next('route') - } - - app.get('/foo', fn, function (req, res) { - res.end('failure') - }); - - app.get('/foo', function(req, res){ - res.end('success') - }) - - request(app) - .get('/foo') - .expect('X-Hit', '1') - .expect(200, 'success', done) - }) - }) - - describe('when next("router") is called', function () { - it('should jump out of router', function (done) { - var app = express() - var router = express.Router() - - function fn (req, res, next) { - res.set('X-Hit', '1') - next('router') - } - - router.get('/foo', fn, function (req, res) { - res.end('failure') - }) - - router.get('/foo', function (req, res) { - res.end('failure') - }) - - app.use(router) - - app.get('/foo', function (req, res) { - res.end('success') - }) - - request(app) - .get('/foo') - .expect('X-Hit', '1') - .expect(200, 'success', done) - }) - }) - - describe('when next(err) is called', function(){ - it('should break out of app.router', function(done){ - var app = express() - , calls = []; - - app.get('/foo/:bar?', function(req, res, next){ - calls.push('/foo/:bar?'); - next(); - }); - - app.get('/bar', function () { - assert(0); - }); - - app.get('/foo', function(req, res, next){ - calls.push('/foo'); - next(new Error('fail')); - }); - - app.get('/foo', function () { - assert(0); - }); - - app.use(function(err, req, res, next){ - res.json({ - calls: calls, - error: err.message - }) - }) - - request(app) - .get('/foo') - .expect(200, { calls: ['/foo/:bar?', '/foo'], error: 'fail' }, done) - }) - - it('should call handler in same route, if exists', function(done){ - var app = express(); - - function fn1(req, res, next) { - next(new Error('boom!')); - } - - function fn2(req, res, next) { - res.send('foo here'); - } - - function fn3(err, req, res, next) { - res.send('route go ' + err.message); - } - - app.get('/foo', fn1, fn2, fn3); - - app.use(function (err, req, res, next) { - res.end('error!'); - }) - - request(app) - .get('/foo') - .expect('route go boom!', done) - }) - }) - - it('should allow rewriting of the url', function(done){ - var app = express(); - - app.get('/account/edit', function(req, res, next){ - req.user = { id: 12 }; // faux authenticated user - req.url = '/user/' + req.user.id + '/edit'; - next(); - }); - - app.get('/user/:id/edit', function(req, res){ - res.send('editing user ' + req.params.id); - }); - - request(app) - .get('/account/edit') - .expect('editing user 12', done); - }) - - it('should run in order added', function(done){ - var app = express(); - var path = []; - - app.get('*', function(req, res, next){ - path.push(0); - next(); - }); - - app.get('/user/:id', function(req, res, next){ - path.push(1); - next(); - }); - - app.use(function(req, res, next){ - path.push(2); - next(); - }); - - app.all('/user/:id', function(req, res, next){ - path.push(3); - next(); - }); - - app.get('*', function(req, res, next){ - path.push(4); - next(); - }); - - app.use(function(req, res, next){ - path.push(5); - res.end(path.join(',')) - }); - - request(app) - .get('/user/1') - .expect(200, '0,1,2,3,4,5', done); - }) - - it('should be chainable', function(){ - var app = express(); - assert.strictEqual(app.get('/', function () {}), app) - }) -}) diff --git a/test/app.routes.error.js b/test/app.routes.error.js deleted file mode 100644 index 56081b31..00000000 --- a/test/app.routes.error.js +++ /dev/null @@ -1,62 +0,0 @@ -'use strict' - -var assert = require('assert') -var express = require('../') - , request = require('supertest'); - -describe('app', function(){ - describe('.VERB()', function(){ - it('should not get invoked without error handler on error', function(done) { - var app = express(); - - app.use(function(req, res, next){ - next(new Error('boom!')) - }); - - app.get('/bar', function(req, res){ - res.send('hello, world!'); - }); - - request(app) - .post('/bar') - .expect(500, /Error: boom!/, done); - }); - - it('should only call an error handling routing callback when an error is propagated', function(done){ - var app = express(); - - var a = false; - var b = false; - var c = false; - var d = false; - - app.get('/', function(req, res, next){ - next(new Error('fabricated error')); - }, function(req, res, next) { - a = true; - next(); - }, function(err, req, res, next){ - b = true; - assert.strictEqual(err.message, 'fabricated error') - next(err); - }, function(err, req, res, next){ - c = true; - assert.strictEqual(err.message, 'fabricated error') - next(); - }, function(err, req, res, next){ - d = true; - next(); - }, function(req, res){ - assert.ok(!a) - assert.ok(b) - assert.ok(c) - assert.ok(!d) - res.send(204); - }); - - request(app) - .get('/') - .expect(204, done); - }) - }) -}) diff --git a/test/app.use.js b/test/app.use.js deleted file mode 100644 index fd9b1751..00000000 --- a/test/app.use.js +++ /dev/null @@ -1,542 +0,0 @@ -'use strict' - -var after = require('after'); -var assert = require('assert') -var express = require('..'); -var request = require('supertest'); - -describe('app', function(){ - it('should emit "mount" when mounted', function(done){ - var blog = express() - , app = express(); - - blog.on('mount', function(arg){ - assert.strictEqual(arg, app) - done(); - }); - - app.use(blog); - }) - - describe('.use(app)', function(){ - it('should mount the app', function(done){ - var blog = express() - , app = express(); - - blog.get('/blog', function(req, res){ - res.end('blog'); - }); - - app.use(blog); - - request(app) - .get('/blog') - .expect('blog', done); - }) - - it('should support mount-points', function(done){ - var blog = express() - , forum = express() - , app = express(); - var cb = after(2, done) - - blog.get('/', function(req, res){ - res.end('blog'); - }); - - forum.get('/', function(req, res){ - res.end('forum'); - }); - - app.use('/blog', blog); - app.use('/forum', forum); - - request(app) - .get('/blog') - .expect(200, 'blog', cb) - - request(app) - .get('/forum') - .expect(200, 'forum', done) - }) - - it('should set the child\'s .parent', function(){ - var blog = express() - , app = express(); - - app.use('/blog', blog); - assert.strictEqual(blog.parent, app) - }) - - it('should support dynamic routes', function(done){ - var blog = express() - , app = express(); - - blog.get('/', function(req, res){ - res.end('success'); - }); - - app.use('/post/:article', blog); - - request(app) - .get('/post/once-upon-a-time') - .expect('success', done); - }) - - it('should support mounted app anywhere', function(done){ - var cb = after(3, done); - var blog = express() - , other = express() - , app = express(); - - function fn1(req, res, next) { - res.setHeader('x-fn-1', 'hit'); - next(); - } - - function fn2(req, res, next) { - res.setHeader('x-fn-2', 'hit'); - next(); - } - - blog.get('/', function(req, res){ - res.end('success'); - }); - - blog.once('mount', function (parent) { - assert.strictEqual(parent, app) - cb(); - }); - other.once('mount', function (parent) { - assert.strictEqual(parent, app) - cb(); - }); - - app.use('/post/:article', fn1, other, fn2, blog); - - request(app) - .get('/post/once-upon-a-time') - .expect('x-fn-1', 'hit') - .expect('x-fn-2', 'hit') - .expect('success', cb); - }) - }) - - describe('.use(middleware)', function(){ - it('should accept multiple arguments', function (done) { - var app = express(); - - function fn1(req, res, next) { - res.setHeader('x-fn-1', 'hit'); - next(); - } - - function fn2(req, res, next) { - res.setHeader('x-fn-2', 'hit'); - next(); - } - - app.use(fn1, fn2, function fn3(req, res) { - res.setHeader('x-fn-3', 'hit'); - res.end(); - }); - - request(app) - .get('/') - .expect('x-fn-1', 'hit') - .expect('x-fn-2', 'hit') - .expect('x-fn-3', 'hit') - .expect(200, done); - }) - - it('should invoke middleware for all requests', function (done) { - var app = express(); - var cb = after(3, done); - - app.use(function (req, res) { - res.send('saw ' + req.method + ' ' + req.url); - }); - - request(app) - .get('/') - .expect(200, 'saw GET /', cb); - - request(app) - .options('/') - .expect(200, 'saw OPTIONS /', cb); - - request(app) - .post('/foo') - .expect(200, 'saw POST /foo', cb); - }) - - it('should accept array of middleware', function (done) { - var app = express(); - - function fn1(req, res, next) { - res.setHeader('x-fn-1', 'hit'); - next(); - } - - function fn2(req, res, next) { - res.setHeader('x-fn-2', 'hit'); - next(); - } - - function fn3(req, res, next) { - res.setHeader('x-fn-3', 'hit'); - res.end(); - } - - app.use([fn1, fn2, fn3]); - - request(app) - .get('/') - .expect('x-fn-1', 'hit') - .expect('x-fn-2', 'hit') - .expect('x-fn-3', 'hit') - .expect(200, done); - }) - - it('should accept multiple arrays of middleware', function (done) { - var app = express(); - - function fn1(req, res, next) { - res.setHeader('x-fn-1', 'hit'); - next(); - } - - function fn2(req, res, next) { - res.setHeader('x-fn-2', 'hit'); - next(); - } - - function fn3(req, res, next) { - res.setHeader('x-fn-3', 'hit'); - res.end(); - } - - app.use([fn1, fn2], [fn3]); - - request(app) - .get('/') - .expect('x-fn-1', 'hit') - .expect('x-fn-2', 'hit') - .expect('x-fn-3', 'hit') - .expect(200, done); - }) - - it('should accept nested arrays of middleware', function (done) { - var app = express(); - - function fn1(req, res, next) { - res.setHeader('x-fn-1', 'hit'); - next(); - } - - function fn2(req, res, next) { - res.setHeader('x-fn-2', 'hit'); - next(); - } - - function fn3(req, res, next) { - res.setHeader('x-fn-3', 'hit'); - res.end(); - } - - app.use([[fn1], fn2], [fn3]); - - request(app) - .get('/') - .expect('x-fn-1', 'hit') - .expect('x-fn-2', 'hit') - .expect('x-fn-3', 'hit') - .expect(200, done); - }) - }) - - describe('.use(path, middleware)', function(){ - it('should require middleware', function () { - var app = express() - assert.throws(function () { app.use('/') }, /requires a middleware function/) - }) - - it('should reject string as middleware', function () { - var app = express() - assert.throws(function () { app.use('/', 'foo') }, /requires a middleware function but got a string/) - }) - - it('should reject number as middleware', function () { - var app = express() - assert.throws(function () { app.use('/', 42) }, /requires a middleware function but got a number/) - }) - - it('should reject null as middleware', function () { - var app = express() - assert.throws(function () { app.use('/', null) }, /requires a middleware function but got a Null/) - }) - - it('should reject Date as middleware', function () { - var app = express() - assert.throws(function () { app.use('/', new Date()) }, /requires a middleware function but got a Date/) - }) - - it('should strip path from req.url', function (done) { - var app = express(); - - app.use('/foo', function (req, res) { - res.send('saw ' + req.method + ' ' + req.url); - }); - - request(app) - .get('/foo/bar') - .expect(200, 'saw GET /bar', done); - }) - - it('should accept multiple arguments', function (done) { - var app = express(); - - function fn1(req, res, next) { - res.setHeader('x-fn-1', 'hit'); - next(); - } - - function fn2(req, res, next) { - res.setHeader('x-fn-2', 'hit'); - next(); - } - - app.use('/foo', fn1, fn2, function fn3(req, res) { - res.setHeader('x-fn-3', 'hit'); - res.end(); - }); - - request(app) - .get('/foo') - .expect('x-fn-1', 'hit') - .expect('x-fn-2', 'hit') - .expect('x-fn-3', 'hit') - .expect(200, done); - }) - - it('should invoke middleware for all requests starting with path', function (done) { - var app = express(); - var cb = after(3, done); - - app.use('/foo', function (req, res) { - res.send('saw ' + req.method + ' ' + req.url); - }); - - request(app) - .get('/') - .expect(404, cb); - - request(app) - .post('/foo') - .expect(200, 'saw POST /', cb); - - request(app) - .post('/foo/bar') - .expect(200, 'saw POST /bar', cb); - }) - - it('should work if path has trailing slash', function (done) { - var app = express(); - var cb = after(3, done); - - app.use('/foo/', function (req, res) { - res.send('saw ' + req.method + ' ' + req.url); - }); - - request(app) - .get('/') - .expect(404, cb); - - request(app) - .post('/foo') - .expect(200, 'saw POST /', cb); - - request(app) - .post('/foo/bar') - .expect(200, 'saw POST /bar', cb); - }) - - it('should accept array of middleware', function (done) { - var app = express(); - - function fn1(req, res, next) { - res.setHeader('x-fn-1', 'hit'); - next(); - } - - function fn2(req, res, next) { - res.setHeader('x-fn-2', 'hit'); - next(); - } - - function fn3(req, res, next) { - res.setHeader('x-fn-3', 'hit'); - res.end(); - } - - app.use('/foo', [fn1, fn2, fn3]); - - request(app) - .get('/foo') - .expect('x-fn-1', 'hit') - .expect('x-fn-2', 'hit') - .expect('x-fn-3', 'hit') - .expect(200, done); - }) - - it('should accept multiple arrays of middleware', function (done) { - var app = express(); - - function fn1(req, res, next) { - res.setHeader('x-fn-1', 'hit'); - next(); - } - - function fn2(req, res, next) { - res.setHeader('x-fn-2', 'hit'); - next(); - } - - function fn3(req, res, next) { - res.setHeader('x-fn-3', 'hit'); - res.end(); - } - - app.use('/foo', [fn1, fn2], [fn3]); - - request(app) - .get('/foo') - .expect('x-fn-1', 'hit') - .expect('x-fn-2', 'hit') - .expect('x-fn-3', 'hit') - .expect(200, done); - }) - - it('should accept nested arrays of middleware', function (done) { - var app = express(); - - function fn1(req, res, next) { - res.setHeader('x-fn-1', 'hit'); - next(); - } - - function fn2(req, res, next) { - res.setHeader('x-fn-2', 'hit'); - next(); - } - - function fn3(req, res, next) { - res.setHeader('x-fn-3', 'hit'); - res.end(); - } - - app.use('/foo', [fn1, [fn2]], [fn3]); - - request(app) - .get('/foo') - .expect('x-fn-1', 'hit') - .expect('x-fn-2', 'hit') - .expect('x-fn-3', 'hit') - .expect(200, done); - }) - - it('should support array of paths', function (done) { - var app = express(); - var cb = after(3, done); - - app.use(['/foo/', '/bar'], function (req, res) { - res.send('saw ' + req.method + ' ' + req.url + ' through ' + req.originalUrl); - }); - - request(app) - .get('/') - .expect(404, cb); - - request(app) - .get('/foo') - .expect(200, 'saw GET / through /foo', cb); - - request(app) - .get('/bar') - .expect(200, 'saw GET / through /bar', cb); - }) - - it('should support array of paths with middleware array', function (done) { - var app = express(); - var cb = after(2, done); - - function fn1(req, res, next) { - res.setHeader('x-fn-1', 'hit'); - next(); - } - - function fn2(req, res, next) { - res.setHeader('x-fn-2', 'hit'); - next(); - } - - function fn3(req, res, next) { - res.setHeader('x-fn-3', 'hit'); - res.send('saw ' + req.method + ' ' + req.url + ' through ' + req.originalUrl); - } - - app.use(['/foo/', '/bar'], [[fn1], fn2], [fn3]); - - request(app) - .get('/foo') - .expect('x-fn-1', 'hit') - .expect('x-fn-2', 'hit') - .expect('x-fn-3', 'hit') - .expect(200, 'saw GET / through /foo', cb); - - request(app) - .get('/bar') - .expect('x-fn-1', 'hit') - .expect('x-fn-2', 'hit') - .expect('x-fn-3', 'hit') - .expect(200, 'saw GET / through /bar', cb); - }) - - it('should support regexp path', function (done) { - var app = express(); - var cb = after(4, done); - - app.use(/^\/[a-z]oo/, function (req, res) { - res.send('saw ' + req.method + ' ' + req.url + ' through ' + req.originalUrl); - }); - - request(app) - .get('/') - .expect(404, cb); - - request(app) - .get('/foo') - .expect(200, 'saw GET / through /foo', cb); - - request(app) - .get('/zoo/bear') - .expect(200, 'saw GET /bear through /zoo/bear', cb); - - request(app) - .get('/get/zoo') - .expect(404, cb); - }) - - it('should support empty string path', function (done) { - var app = express(); - - app.use('', function (req, res) { - res.send('saw ' + req.method + ' ' + req.url + ' through ' + req.originalUrl); - }); - - request(app) - .get('/') - .expect(200, 'saw GET / through /', done); - }) - }) -}) diff --git a/test/config.js b/test/config.js deleted file mode 100644 index b04367fd..00000000 --- a/test/config.js +++ /dev/null @@ -1,207 +0,0 @@ -'use strict' - -var assert = require('assert'); -var express = require('..'); - -describe('config', function () { - describe('.set()', function () { - it('should set a value', function () { - var app = express(); - app.set('foo', 'bar'); - assert.equal(app.get('foo'), 'bar'); - }) - - it('should set prototype values', function () { - var app = express() - app.set('hasOwnProperty', 42) - assert.strictEqual(app.get('hasOwnProperty'), 42) - }) - - it('should return the app', function () { - var app = express(); - assert.equal(app.set('foo', 'bar'), app); - }) - - it('should return the app when undefined', function () { - var app = express(); - assert.equal(app.set('foo', undefined), app); - }) - - it('should return set value', function () { - var app = express() - app.set('foo', 'bar') - assert.strictEqual(app.set('foo'), 'bar') - }) - - it('should return undefined for prototype values', function () { - var app = express() - assert.strictEqual(app.set('hasOwnProperty'), undefined) - }) - - describe('"etag"', function(){ - it('should throw on bad value', function(){ - var app = express(); - assert.throws(app.set.bind(app, 'etag', 42), /unknown value/); - }) - - it('should set "etag fn"', function(){ - var app = express() - var fn = function(){} - app.set('etag', fn) - assert.equal(app.get('etag fn'), fn) - }) - }) - - describe('"trust proxy"', function(){ - it('should set "trust proxy fn"', function(){ - var app = express() - var fn = function(){} - app.set('trust proxy', fn) - assert.equal(app.get('trust proxy fn'), fn) - }) - }) - }) - - describe('.get()', function(){ - it('should return undefined when unset', function(){ - var app = express(); - assert.strictEqual(app.get('foo'), undefined); - }) - - it('should return undefined for prototype values', function () { - var app = express() - assert.strictEqual(app.get('hasOwnProperty'), undefined) - }) - - it('should otherwise return the value', function(){ - var app = express(); - app.set('foo', 'bar'); - assert.equal(app.get('foo'), 'bar'); - }) - - describe('when mounted', function(){ - it('should default to the parent app', function(){ - var app = express(); - var blog = express(); - - app.set('title', 'Express'); - app.use(blog); - assert.equal(blog.get('title'), 'Express'); - }) - - it('should given precedence to the child', function(){ - var app = express(); - var blog = express(); - - app.use(blog); - app.set('title', 'Express'); - blog.set('title', 'Some Blog'); - - assert.equal(blog.get('title'), 'Some Blog'); - }) - - it('should inherit "trust proxy" setting', function () { - var app = express(); - var blog = express(); - - function fn() { return false } - - app.set('trust proxy', fn); - assert.equal(app.get('trust proxy'), fn); - assert.equal(app.get('trust proxy fn'), fn); - - app.use(blog); - - assert.equal(blog.get('trust proxy'), fn); - assert.equal(blog.get('trust proxy fn'), fn); - }) - - it('should prefer child "trust proxy" setting', function () { - var app = express(); - var blog = express(); - - function fn1() { return false } - function fn2() { return true } - - app.set('trust proxy', fn1); - assert.equal(app.get('trust proxy'), fn1); - assert.equal(app.get('trust proxy fn'), fn1); - - blog.set('trust proxy', fn2); - assert.equal(blog.get('trust proxy'), fn2); - assert.equal(blog.get('trust proxy fn'), fn2); - - app.use(blog); - - assert.equal(app.get('trust proxy'), fn1); - assert.equal(app.get('trust proxy fn'), fn1); - assert.equal(blog.get('trust proxy'), fn2); - assert.equal(blog.get('trust proxy fn'), fn2); - }) - }) - }) - - describe('.enable()', function(){ - it('should set the value to true', function(){ - var app = express(); - assert.equal(app.enable('tobi'), app); - assert.strictEqual(app.get('tobi'), true); - }) - - it('should set prototype values', function () { - var app = express() - app.enable('hasOwnProperty') - assert.strictEqual(app.get('hasOwnProperty'), true) - }) - }) - - describe('.disable()', function(){ - it('should set the value to false', function(){ - var app = express(); - assert.equal(app.disable('tobi'), app); - assert.strictEqual(app.get('tobi'), false); - }) - - it('should set prototype values', function () { - var app = express() - app.disable('hasOwnProperty') - assert.strictEqual(app.get('hasOwnProperty'), false) - }) - }) - - describe('.enabled()', function(){ - it('should default to false', function(){ - var app = express(); - assert.strictEqual(app.enabled('foo'), false); - }) - - it('should return true when set', function(){ - var app = express(); - app.set('foo', 'bar'); - assert.strictEqual(app.enabled('foo'), true); - }) - - it('should default to false for prototype values', function () { - var app = express() - assert.strictEqual(app.enabled('hasOwnProperty'), false) - }) - }) - - describe('.disabled()', function(){ - it('should default to true', function(){ - var app = express(); - assert.strictEqual(app.disabled('foo'), true); - }) - - it('should return false when set', function(){ - var app = express(); - app.set('foo', 'bar'); - assert.strictEqual(app.disabled('foo'), false); - }) - - it('should default to true for prototype values', function () { - var app = express() - assert.strictEqual(app.disabled('hasOwnProperty'), true) - }) - }) -}) diff --git a/test/exports.js b/test/exports.js deleted file mode 100644 index 5ab0f885..00000000 --- a/test/exports.js +++ /dev/null @@ -1,87 +0,0 @@ -'use strict' - -var assert = require('assert') -var express = require('../'); -var request = require('supertest'); - -describe('exports', function(){ - it('should expose Router', function(){ - assert.strictEqual(typeof express.Router, 'function') - }) - - it('should expose json middleware', function () { - assert.equal(typeof express.json, 'function') - assert.equal(express.json.length, 1) - }) - - it('should expose raw middleware', function () { - assert.equal(typeof express.raw, 'function') - assert.equal(express.raw.length, 1) - }) - - it('should expose static middleware', function () { - assert.equal(typeof express.static, 'function') - assert.equal(express.static.length, 2) - }) - - it('should expose text middleware', function () { - assert.equal(typeof express.text, 'function') - assert.equal(express.text.length, 1) - }) - - it('should expose urlencoded middleware', function () { - assert.equal(typeof express.urlencoded, 'function') - assert.equal(express.urlencoded.length, 1) - }) - - it('should expose the application prototype', function(){ - assert.strictEqual(typeof express.application, 'object') - assert.strictEqual(typeof express.application.set, 'function') - }) - - it('should expose the request prototype', function(){ - assert.strictEqual(typeof express.request, 'object') - assert.strictEqual(typeof express.request.accepts, 'function') - }) - - it('should expose the response prototype', function(){ - assert.strictEqual(typeof express.response, 'object') - assert.strictEqual(typeof express.response.send, 'function') - }) - - it('should permit modifying the .application prototype', function(){ - express.application.foo = function(){ return 'bar'; }; - assert.strictEqual(express().foo(), 'bar') - }) - - it('should permit modifying the .request prototype', function(done){ - express.request.foo = function(){ return 'bar'; }; - var app = express(); - - app.use(function(req, res, next){ - res.end(req.foo()); - }); - - request(app) - .get('/') - .expect('bar', done); - }) - - it('should permit modifying the .response prototype', function(done){ - express.response.foo = function(){ this.send('bar'); }; - var app = express(); - - app.use(function(req, res, next){ - res.foo(); - }); - - request(app) - .get('/') - .expect('bar', done); - }) - - it('should throw on old middlewares', function(){ - assert.throws(function () { express.bodyParser() }, /Error:.*middleware.*bodyParser/) - assert.throws(function () { express.limit() }, /Error:.*middleware.*limit/) - }) -}) diff --git a/test/express.json.js b/test/express.json.js deleted file mode 100644 index f6f536b1..00000000 --- a/test/express.json.js +++ /dev/null @@ -1,790 +0,0 @@ -'use strict' - -var assert = require('assert') -var asyncHooks = tryRequire('async_hooks') -var Buffer = require('safe-buffer').Buffer -var express = require('..') -var request = require('supertest') - -var describeAsyncHooks = typeof asyncHooks.AsyncLocalStorage === 'function' - ? describe - : describe.skip - -describe('express.json()', function () { - it('should parse JSON', function (done) { - request(createApp()) - .post('/') - .set('Content-Type', 'application/json') - .send('{"user":"tobi"}') - .expect(200, '{"user":"tobi"}', done) - }) - - it('should handle Content-Length: 0', function (done) { - request(createApp()) - .post('/') - .set('Content-Type', 'application/json') - .set('Content-Length', '0') - .expect(200, '{}', done) - }) - - it('should handle empty message-body', function (done) { - request(createApp()) - .post('/') - .set('Content-Type', 'application/json') - .set('Transfer-Encoding', 'chunked') - .expect(200, '{}', done) - }) - - it('should handle no message-body', function (done) { - request(createApp()) - .post('/') - .set('Content-Type', 'application/json') - .unset('Transfer-Encoding') - .expect(200, '{}', done) - }) - - it('should 400 when only whitespace', function (done) { - request(createApp()) - .post('/') - .set('Content-Type', 'application/json') - .send(' \n') - .expect(400, '[entity.parse.failed] ' + parseError(' '), done) - }) - - it('should 400 when invalid content-length', function (done) { - var app = express() - - app.use(function (req, res, next) { - req.headers['content-length'] = '20' // bad length - next() - }) - - app.use(express.json()) - - app.post('/', function (req, res) { - res.json(req.body) - }) - - request(app) - .post('/') - .set('Content-Type', 'application/json') - .send('{"str":') - .expect(400, /content length/, done) - }) - - it('should 500 if stream not readable', function (done) { - var app = express() - - app.use(function (req, res, next) { - req.on('end', next) - req.resume() - }) - - app.use(express.json()) - - app.use(function (err, req, res, next) { - res.status(err.status || 500) - res.send('[' + err.type + '] ' + err.message) - }) - - app.post('/', function (req, res) { - res.json(req.body) - }) - - request(app) - .post('/') - .set('Content-Type', 'application/json') - .send('{"user":"tobi"}') - .expect(500, '[stream.not.readable] stream is not readable', done) - }) - - it('should handle duplicated middleware', function (done) { - var app = express() - - app.use(express.json()) - app.use(express.json()) - - app.post('/', function (req, res) { - res.json(req.body) - }) - - request(app) - .post('/') - .set('Content-Type', 'application/json') - .send('{"user":"tobi"}') - .expect(200, '{"user":"tobi"}', done) - }) - - describe('when JSON is invalid', function () { - before(function () { - this.app = createApp() - }) - - it('should 400 for bad token', function (done) { - request(this.app) - .post('/') - .set('Content-Type', 'application/json') - .send('{:') - .expect(400, '[entity.parse.failed] ' + parseError('{:'), done) - }) - - it('should 400 for incomplete', function (done) { - request(this.app) - .post('/') - .set('Content-Type', 'application/json') - .send('{"user"') - .expect(400, '[entity.parse.failed] ' + parseError('{"user"'), done) - }) - - it('should include original body on error object', function (done) { - request(this.app) - .post('/') - .set('Content-Type', 'application/json') - .set('X-Error-Property', 'body') - .send(' {"user"') - .expect(400, ' {"user"', done) - }) - }) - - describe('with limit option', function () { - it('should 413 when over limit with Content-Length', function (done) { - var buf = Buffer.alloc(1024, '.') - request(createApp({ limit: '1kb' })) - .post('/') - .set('Content-Type', 'application/json') - .set('Content-Length', '1034') - .send(JSON.stringify({ str: buf.toString() })) - .expect(413, '[entity.too.large] request entity too large', done) - }) - - it('should 413 when over limit with chunked encoding', function (done) { - var app = createApp({ limit: '1kb' }) - var buf = Buffer.alloc(1024, '.') - var test = request(app).post('/') - test.set('Content-Type', 'application/json') - test.set('Transfer-Encoding', 'chunked') - test.write('{"str":') - test.write('"' + buf.toString() + '"}') - test.expect(413, done) - }) - - it('should 413 when inflated body over limit', function (done) { - var app = createApp({ limit: '1kb' }) - var test = request(app).post('/') - test.set('Content-Encoding', 'gzip') - test.set('Content-Type', 'application/json') - test.write(Buffer.from('1f8b080000000000000aab562a2e2952b252d21b05a360148c58a0540b0066f7ce1e0a040000', 'hex')) - test.expect(413, done) - }) - - it('should accept number of bytes', function (done) { - var buf = Buffer.alloc(1024, '.') - request(createApp({ limit: 1024 })) - .post('/') - .set('Content-Type', 'application/json') - .send(JSON.stringify({ str: buf.toString() })) - .expect(413, done) - }) - - it('should not change when options altered', function (done) { - var buf = Buffer.alloc(1024, '.') - var options = { limit: '1kb' } - var app = createApp(options) - - options.limit = '100kb' - - request(app) - .post('/') - .set('Content-Type', 'application/json') - .send(JSON.stringify({ str: buf.toString() })) - .expect(413, done) - }) - - it('should not hang response', function (done) { - var buf = Buffer.alloc(10240, '.') - var app = createApp({ limit: '8kb' }) - var test = request(app).post('/') - test.set('Content-Type', 'application/json') - test.write(buf) - test.write(buf) - test.write(buf) - test.expect(413, done) - }) - - it('should not error when inflating', function (done) { - var app = createApp({ limit: '1kb' }) - var test = request(app).post('/') - test.set('Content-Encoding', 'gzip') - test.set('Content-Type', 'application/json') - test.write(Buffer.from('1f8b080000000000000aab562a2e2952b252d21b05a360148c58a0540b0066f7ce1e0a0400', 'hex')) - test.expect(413, done) - }) - }) - - describe('with inflate option', function () { - describe('when false', function () { - before(function () { - this.app = createApp({ inflate: false }) - }) - - it('should not accept content-encoding', function (done) { - var test = request(this.app).post('/') - test.set('Content-Encoding', 'gzip') - test.set('Content-Type', 'application/json') - test.write(Buffer.from('1f8b080000000000000bab56ca4bcc4d55b2527ab16e97522d00515be1cc0e000000', 'hex')) - test.expect(415, '[encoding.unsupported] content encoding unsupported', done) - }) - }) - - describe('when true', function () { - before(function () { - this.app = createApp({ inflate: true }) - }) - - it('should accept content-encoding', function (done) { - var test = request(this.app).post('/') - test.set('Content-Encoding', 'gzip') - test.set('Content-Type', 'application/json') - test.write(Buffer.from('1f8b080000000000000bab56ca4bcc4d55b2527ab16e97522d00515be1cc0e000000', 'hex')) - test.expect(200, '{"name":"论"}', done) - }) - }) - }) - - describe('with strict option', function () { - describe('when undefined', function () { - before(function () { - this.app = createApp() - }) - - it('should 400 on primitives', function (done) { - request(this.app) - .post('/') - .set('Content-Type', 'application/json') - .send('true') - .expect(400, '[entity.parse.failed] ' + parseError('#rue').replace(/#/g, 't'), done) - }) - }) - - describe('when false', function () { - before(function () { - this.app = createApp({ strict: false }) - }) - - it('should parse primitives', function (done) { - request(this.app) - .post('/') - .set('Content-Type', 'application/json') - .send('true') - .expect(200, 'true', done) - }) - }) - - describe('when true', function () { - before(function () { - this.app = createApp({ strict: true }) - }) - - it('should not parse primitives', function (done) { - request(this.app) - .post('/') - .set('Content-Type', 'application/json') - .send('true') - .expect(400, '[entity.parse.failed] ' + parseError('#rue').replace(/#/g, 't'), done) - }) - - it('should not parse primitives with leading whitespaces', function (done) { - request(this.app) - .post('/') - .set('Content-Type', 'application/json') - .send(' true') - .expect(400, '[entity.parse.failed] ' + parseError(' #rue').replace(/#/g, 't'), done) - }) - - it('should allow leading whitespaces in JSON', function (done) { - request(this.app) - .post('/') - .set('Content-Type', 'application/json') - .send(' { "user": "tobi" }') - .expect(200, '{"user":"tobi"}', done) - }) - - it('should include correct message in stack trace', function (done) { - request(this.app) - .post('/') - .set('Content-Type', 'application/json') - .set('X-Error-Property', 'stack') - .send('true') - .expect(400) - .expect(shouldContainInBody(parseError('#rue').replace(/#/g, 't'))) - .end(done) - }) - }) - }) - - describe('with type option', function () { - describe('when "application/vnd.api+json"', function () { - before(function () { - this.app = createApp({ type: 'application/vnd.api+json' }) - }) - - it('should parse JSON for custom type', function (done) { - request(this.app) - .post('/') - .set('Content-Type', 'application/vnd.api+json') - .send('{"user":"tobi"}') - .expect(200, '{"user":"tobi"}', done) - }) - - it('should ignore standard type', function (done) { - request(this.app) - .post('/') - .set('Content-Type', 'application/json') - .send('{"user":"tobi"}') - .expect(200, '{}', done) - }) - }) - - describe('when ["application/json", "application/vnd.api+json"]', function () { - before(function () { - this.app = createApp({ - type: ['application/json', 'application/vnd.api+json'] - }) - }) - - it('should parse JSON for "application/json"', function (done) { - request(this.app) - .post('/') - .set('Content-Type', 'application/json') - .send('{"user":"tobi"}') - .expect(200, '{"user":"tobi"}', done) - }) - - it('should parse JSON for "application/vnd.api+json"', function (done) { - request(this.app) - .post('/') - .set('Content-Type', 'application/vnd.api+json') - .send('{"user":"tobi"}') - .expect(200, '{"user":"tobi"}', done) - }) - - it('should ignore "application/x-json"', function (done) { - request(this.app) - .post('/') - .set('Content-Type', 'application/x-json') - .send('{"user":"tobi"}') - .expect(200, '{}', done) - }) - }) - - describe('when a function', function () { - it('should parse when truthy value returned', function (done) { - var app = createApp({ type: accept }) - - function accept (req) { - return req.headers['content-type'] === 'application/vnd.api+json' - } - - request(app) - .post('/') - .set('Content-Type', 'application/vnd.api+json') - .send('{"user":"tobi"}') - .expect(200, '{"user":"tobi"}', done) - }) - - it('should work without content-type', function (done) { - var app = createApp({ type: accept }) - - function accept (req) { - return true - } - - var test = request(app).post('/') - test.write('{"user":"tobi"}') - test.expect(200, '{"user":"tobi"}', done) - }) - - it('should not invoke without a body', function (done) { - var app = createApp({ type: accept }) - - function accept (req) { - throw new Error('oops!') - } - - request(app) - .get('/') - .expect(404, done) - }) - }) - }) - - describe('with verify option', function () { - it('should assert value if function', function () { - assert.throws(createApp.bind(null, { verify: 'lol' }), - /TypeError: option verify must be function/) - }) - - it('should error from verify', function (done) { - var app = createApp({ - verify: function (req, res, buf) { - if (buf[0] === 0x5b) throw new Error('no arrays') - } - }) - - request(app) - .post('/') - .set('Content-Type', 'application/json') - .send('["tobi"]') - .expect(403, '[entity.verify.failed] no arrays', done) - }) - - it('should allow custom codes', function (done) { - var app = createApp({ - verify: function (req, res, buf) { - if (buf[0] !== 0x5b) return - var err = new Error('no arrays') - err.status = 400 - throw err - } - }) - - request(app) - .post('/') - .set('Content-Type', 'application/json') - .send('["tobi"]') - .expect(400, '[entity.verify.failed] no arrays', done) - }) - - it('should allow custom type', function (done) { - var app = createApp({ - verify: function (req, res, buf) { - if (buf[0] !== 0x5b) return - var err = new Error('no arrays') - err.type = 'foo.bar' - throw err - } - }) - - request(app) - .post('/') - .set('Content-Type', 'application/json') - .send('["tobi"]') - .expect(403, '[foo.bar] no arrays', done) - }) - - it('should include original body on error object', function (done) { - var app = createApp({ - verify: function (req, res, buf) { - if (buf[0] === 0x5b) throw new Error('no arrays') - } - }) - - request(app) - .post('/') - .set('Content-Type', 'application/json') - .set('X-Error-Property', 'body') - .send('["tobi"]') - .expect(403, '["tobi"]', done) - }) - - it('should allow pass-through', function (done) { - var app = createApp({ - verify: function (req, res, buf) { - if (buf[0] === 0x5b) throw new Error('no arrays') - } - }) - - request(app) - .post('/') - .set('Content-Type', 'application/json') - .send('{"user":"tobi"}') - .expect(200, '{"user":"tobi"}', done) - }) - - it('should work with different charsets', function (done) { - var app = createApp({ - verify: function (req, res, buf) { - if (buf[0] === 0x5b) throw new Error('no arrays') - } - }) - - var test = request(app).post('/') - test.set('Content-Type', 'application/json; charset=utf-16') - test.write(Buffer.from('feff007b0022006e0061006d00650022003a00228bba0022007d', 'hex')) - test.expect(200, '{"name":"论"}', done) - }) - - it('should 415 on unknown charset prior to verify', function (done) { - var app = createApp({ - verify: function (req, res, buf) { - throw new Error('unexpected verify call') - } - }) - - var test = request(app).post('/') - test.set('Content-Type', 'application/json; charset=x-bogus') - test.write(Buffer.from('00000000', 'hex')) - test.expect(415, '[charset.unsupported] unsupported charset "X-BOGUS"', done) - }) - }) - - describeAsyncHooks('async local storage', function () { - before(function () { - var app = express() - var store = { foo: 'bar' } - - app.use(function (req, res, next) { - req.asyncLocalStorage = new asyncHooks.AsyncLocalStorage() - req.asyncLocalStorage.run(store, next) - }) - - app.use(express.json()) - - app.use(function (req, res, next) { - var local = req.asyncLocalStorage.getStore() - - if (local) { - res.setHeader('x-store-foo', String(local.foo)) - } - - next() - }) - - app.use(function (err, req, res, next) { - var local = req.asyncLocalStorage.getStore() - - if (local) { - res.setHeader('x-store-foo', String(local.foo)) - } - - res.status(err.status || 500) - res.send('[' + err.type + '] ' + err.message) - }) - - app.post('/', function (req, res) { - res.json(req.body) - }) - - this.app = app - }) - - it('should presist store', function (done) { - request(this.app) - .post('/') - .set('Content-Type', 'application/json') - .send('{"user":"tobi"}') - .expect(200) - .expect('x-store-foo', 'bar') - .expect('{"user":"tobi"}') - .end(done) - }) - - it('should presist store when unmatched content-type', function (done) { - request(this.app) - .post('/') - .set('Content-Type', 'application/fizzbuzz') - .send('buzz') - .expect(200) - .expect('x-store-foo', 'bar') - .expect('{}') - .end(done) - }) - - it('should presist store when inflated', function (done) { - var test = request(this.app).post('/') - test.set('Content-Encoding', 'gzip') - test.set('Content-Type', 'application/json') - test.write(Buffer.from('1f8b080000000000000bab56ca4bcc4d55b2527ab16e97522d00515be1cc0e000000', 'hex')) - test.expect(200) - test.expect('x-store-foo', 'bar') - test.expect('{"name":"论"}') - test.end(done) - }) - - it('should presist store when inflate error', function (done) { - var test = request(this.app).post('/') - test.set('Content-Encoding', 'gzip') - test.set('Content-Type', 'application/json') - test.write(Buffer.from('1f8b080000000000000bab56cc4d55b2527ab16e97522d00515be1cc0e000000', 'hex')) - test.expect(400) - test.expect('x-store-foo', 'bar') - test.end(done) - }) - - it('should presist store when parse error', function (done) { - request(this.app) - .post('/') - .set('Content-Type', 'application/json') - .send('{"user":') - .expect(400) - .expect('x-store-foo', 'bar') - .end(done) - }) - - it('should presist store when limit exceeded', function (done) { - request(this.app) - .post('/') - .set('Content-Type', 'application/json') - .send('{"user":"' + Buffer.alloc(1024 * 100, '.').toString() + '"}') - .expect(413) - .expect('x-store-foo', 'bar') - .end(done) - }) - }) - - describe('charset', function () { - before(function () { - this.app = createApp() - }) - - it('should parse utf-8', function (done) { - var test = request(this.app).post('/') - test.set('Content-Type', 'application/json; charset=utf-8') - test.write(Buffer.from('7b226e616d65223a22e8aeba227d', 'hex')) - test.expect(200, '{"name":"论"}', done) - }) - - it('should parse utf-16', function (done) { - var test = request(this.app).post('/') - test.set('Content-Type', 'application/json; charset=utf-16') - test.write(Buffer.from('feff007b0022006e0061006d00650022003a00228bba0022007d', 'hex')) - test.expect(200, '{"name":"论"}', done) - }) - - it('should parse when content-length != char length', function (done) { - var test = request(this.app).post('/') - test.set('Content-Type', 'application/json; charset=utf-8') - test.set('Content-Length', '13') - test.write(Buffer.from('7b2274657374223a22c3a5227d', 'hex')) - test.expect(200, '{"test":"å"}', done) - }) - - it('should default to utf-8', function (done) { - var test = request(this.app).post('/') - test.set('Content-Type', 'application/json') - test.write(Buffer.from('7b226e616d65223a22e8aeba227d', 'hex')) - test.expect(200, '{"name":"论"}', done) - }) - - it('should fail on unknown charset', function (done) { - var test = request(this.app).post('/') - test.set('Content-Type', 'application/json; charset=koi8-r') - test.write(Buffer.from('7b226e616d65223a22cec5d4227d', 'hex')) - test.expect(415, '[charset.unsupported] unsupported charset "KOI8-R"', done) - }) - }) - - describe('encoding', function () { - before(function () { - this.app = createApp({ limit: '1kb' }) - }) - - it('should parse without encoding', function (done) { - var test = request(this.app).post('/') - test.set('Content-Type', 'application/json') - test.write(Buffer.from('7b226e616d65223a22e8aeba227d', 'hex')) - test.expect(200, '{"name":"论"}', done) - }) - - it('should support identity encoding', function (done) { - var test = request(this.app).post('/') - test.set('Content-Encoding', 'identity') - test.set('Content-Type', 'application/json') - test.write(Buffer.from('7b226e616d65223a22e8aeba227d', 'hex')) - test.expect(200, '{"name":"论"}', done) - }) - - it('should support gzip encoding', function (done) { - var test = request(this.app).post('/') - test.set('Content-Encoding', 'gzip') - test.set('Content-Type', 'application/json') - test.write(Buffer.from('1f8b080000000000000bab56ca4bcc4d55b2527ab16e97522d00515be1cc0e000000', 'hex')) - test.expect(200, '{"name":"论"}', done) - }) - - it('should support deflate encoding', function (done) { - var test = request(this.app).post('/') - test.set('Content-Encoding', 'deflate') - test.set('Content-Type', 'application/json') - test.write(Buffer.from('789cab56ca4bcc4d55b2527ab16e97522d00274505ac', 'hex')) - test.expect(200, '{"name":"论"}', done) - }) - - it('should be case-insensitive', function (done) { - var test = request(this.app).post('/') - test.set('Content-Encoding', 'GZIP') - test.set('Content-Type', 'application/json') - test.write(Buffer.from('1f8b080000000000000bab56ca4bcc4d55b2527ab16e97522d00515be1cc0e000000', 'hex')) - test.expect(200, '{"name":"论"}', done) - }) - - it('should 415 on unknown encoding', function (done) { - var test = request(this.app).post('/') - test.set('Content-Encoding', 'nulls') - test.set('Content-Type', 'application/json') - test.write(Buffer.from('000000000000', 'hex')) - test.expect(415, '[encoding.unsupported] unsupported content encoding "nulls"', done) - }) - - it('should 400 on malformed encoding', function (done) { - var test = request(this.app).post('/') - test.set('Content-Encoding', 'gzip') - test.set('Content-Type', 'application/json') - test.write(Buffer.from('1f8b080000000000000bab56cc4d55b2527ab16e97522d00515be1cc0e000000', 'hex')) - test.expect(400, done) - }) - - it('should 413 when inflated value exceeds limit', function (done) { - // gzip'd data exceeds 1kb, but deflated below 1kb - var test = request(this.app).post('/') - test.set('Content-Encoding', 'gzip') - test.set('Content-Type', 'application/json') - test.write(Buffer.from('1f8b080000000000000bedc1010d000000c2a0f74f6d0f071400000000000000', 'hex')) - test.write(Buffer.from('0000000000000000000000000000000000000000000000000000000000000000', 'hex')) - test.write(Buffer.from('0000000000000000004f0625b3b71650c30000', 'hex')) - test.expect(413, done) - }) - }) -}) - -function createApp (options) { - var app = express() - - app.use(express.json(options)) - - app.use(function (err, req, res, next) { - res.status(err.status || 500) - res.send(String(req.headers['x-error-property'] - ? err[req.headers['x-error-property']] - : ('[' + err.type + '] ' + err.message))) - }) - - app.post('/', function (req, res) { - res.json(req.body) - }) - - return app -} - -function parseError (str) { - try { - JSON.parse(str); throw new SyntaxError('strict violation') - } catch (e) { - return e.message - } -} - -function shouldContainInBody (str) { - return function (res) { - assert.ok(res.text.indexOf(str) !== -1, - 'expected \'' + res.text + '\' to contain \'' + str + '\'') - } -} - -function tryRequire (name) { - try { - return require(name) - } catch (e) { - return {} - } -} diff --git a/test/express.raw.js b/test/express.raw.js deleted file mode 100644 index 4aa62bb8..00000000 --- a/test/express.raw.js +++ /dev/null @@ -1,555 +0,0 @@ -'use strict' - -var assert = require('assert') -var asyncHooks = tryRequire('async_hooks') -var Buffer = require('safe-buffer').Buffer -var express = require('..') -var request = require('supertest') - -var describeAsyncHooks = typeof asyncHooks.AsyncLocalStorage === 'function' - ? describe - : describe.skip - -describe('express.raw()', function () { - before(function () { - this.app = createApp() - }) - - it('should parse application/octet-stream', function (done) { - request(this.app) - .post('/') - .set('Content-Type', 'application/octet-stream') - .send('the user is tobi') - .expect(200, { buf: '746865207573657220697320746f6269' }, done) - }) - - it('should 400 when invalid content-length', function (done) { - var app = express() - - app.use(function (req, res, next) { - req.headers['content-length'] = '20' // bad length - next() - }) - - app.use(express.raw()) - - app.post('/', function (req, res) { - if (Buffer.isBuffer(req.body)) { - res.json({ buf: req.body.toString('hex') }) - } else { - res.json(req.body) - } - }) - - request(app) - .post('/') - .set('Content-Type', 'application/octet-stream') - .send('stuff') - .expect(400, /content length/, done) - }) - - it('should handle Content-Length: 0', function (done) { - request(this.app) - .post('/') - .set('Content-Type', 'application/octet-stream') - .set('Content-Length', '0') - .expect(200, { buf: '' }, done) - }) - - it('should handle empty message-body', function (done) { - request(this.app) - .post('/') - .set('Content-Type', 'application/octet-stream') - .set('Transfer-Encoding', 'chunked') - .send('') - .expect(200, { buf: '' }, done) - }) - - it('should 500 if stream not readable', function (done) { - var app = express() - - app.use(function (req, res, next) { - req.on('end', next) - req.resume() - }) - - app.use(express.raw()) - - app.use(function (err, req, res, next) { - res.status(err.status || 500) - res.send('[' + err.type + '] ' + err.message) - }) - - app.post('/', function (req, res) { - if (Buffer.isBuffer(req.body)) { - res.json({ buf: req.body.toString('hex') }) - } else { - res.json(req.body) - } - }) - - request(app) - .post('/') - .set('Content-Type', 'application/octet-stream') - .send('the user is tobi') - .expect(500, '[stream.not.readable] stream is not readable', done) - }) - - it('should handle duplicated middleware', function (done) { - var app = express() - - app.use(express.raw()) - app.use(express.raw()) - - app.post('/', function (req, res) { - if (Buffer.isBuffer(req.body)) { - res.json({ buf: req.body.toString('hex') }) - } else { - res.json(req.body) - } - }) - - request(app) - .post('/') - .set('Content-Type', 'application/octet-stream') - .send('the user is tobi') - .expect(200, { buf: '746865207573657220697320746f6269' }, done) - }) - - describe('with limit option', function () { - it('should 413 when over limit with Content-Length', function (done) { - var buf = Buffer.alloc(1028, '.') - var app = createApp({ limit: '1kb' }) - var test = request(app).post('/') - test.set('Content-Type', 'application/octet-stream') - test.set('Content-Length', '1028') - test.write(buf) - test.expect(413, done) - }) - - it('should 413 when over limit with chunked encoding', function (done) { - var buf = Buffer.alloc(1028, '.') - var app = createApp({ limit: '1kb' }) - var test = request(app).post('/') - test.set('Content-Type', 'application/octet-stream') - test.set('Transfer-Encoding', 'chunked') - test.write(buf) - test.expect(413, done) - }) - - it('should 413 when inflated body over limit', function (done) { - var app = createApp({ limit: '1kb' }) - var test = request(app).post('/') - test.set('Content-Encoding', 'gzip') - test.set('Content-Type', 'application/octet-stream') - test.write(Buffer.from('1f8b080000000000000ad3d31b05a360148c64000087e5a14704040000', 'hex')) - test.expect(413, done) - }) - - it('should accept number of bytes', function (done) { - var buf = Buffer.alloc(1028, '.') - var app = createApp({ limit: 1024 }) - var test = request(app).post('/') - test.set('Content-Type', 'application/octet-stream') - test.write(buf) - test.expect(413, done) - }) - - it('should not change when options altered', function (done) { - var buf = Buffer.alloc(1028, '.') - var options = { limit: '1kb' } - var app = createApp(options) - - options.limit = '100kb' - - var test = request(app).post('/') - test.set('Content-Type', 'application/octet-stream') - test.write(buf) - test.expect(413, done) - }) - - it('should not hang response', function (done) { - var buf = Buffer.alloc(10240, '.') - var app = createApp({ limit: '8kb' }) - var test = request(app).post('/') - test.set('Content-Type', 'application/octet-stream') - test.write(buf) - test.write(buf) - test.write(buf) - test.expect(413, done) - }) - - it('should not error when inflating', function (done) { - var app = createApp({ limit: '1kb' }) - var test = request(app).post('/') - test.set('Content-Encoding', 'gzip') - test.set('Content-Type', 'application/octet-stream') - test.write(Buffer.from('1f8b080000000000000ad3d31b05a360148c64000087e5a147040400', 'hex')) - test.expect(413, done) - }) - }) - - describe('with inflate option', function () { - describe('when false', function () { - before(function () { - this.app = createApp({ inflate: false }) - }) - - it('should not accept content-encoding', function (done) { - var test = request(this.app).post('/') - test.set('Content-Encoding', 'gzip') - test.set('Content-Type', 'application/octet-stream') - test.write(Buffer.from('1f8b080000000000000bcb4bcc4db57db16e170099a4bad608000000', 'hex')) - test.expect(415, '[encoding.unsupported] content encoding unsupported', done) - }) - }) - - describe('when true', function () { - before(function () { - this.app = createApp({ inflate: true }) - }) - - it('should accept content-encoding', function (done) { - var test = request(this.app).post('/') - test.set('Content-Encoding', 'gzip') - test.set('Content-Type', 'application/octet-stream') - test.write(Buffer.from('1f8b080000000000000bcb4bcc4db57db16e170099a4bad608000000', 'hex')) - test.expect(200, { buf: '6e616d653de8aeba' }, done) - }) - }) - }) - - describe('with type option', function () { - describe('when "application/vnd+octets"', function () { - before(function () { - this.app = createApp({ type: 'application/vnd+octets' }) - }) - - it('should parse for custom type', function (done) { - var test = request(this.app).post('/') - test.set('Content-Type', 'application/vnd+octets') - test.write(Buffer.from('000102', 'hex')) - test.expect(200, { buf: '000102' }, done) - }) - - it('should ignore standard type', function (done) { - var test = request(this.app).post('/') - test.set('Content-Type', 'application/octet-stream') - test.write(Buffer.from('000102', 'hex')) - test.expect(200, '{}', done) - }) - }) - - describe('when ["application/octet-stream", "application/vnd+octets"]', function () { - before(function () { - this.app = createApp({ - type: ['application/octet-stream', 'application/vnd+octets'] - }) - }) - - it('should parse "application/octet-stream"', function (done) { - var test = request(this.app).post('/') - test.set('Content-Type', 'application/octet-stream') - test.write(Buffer.from('000102', 'hex')) - test.expect(200, { buf: '000102' }, done) - }) - - it('should parse "application/vnd+octets"', function (done) { - var test = request(this.app).post('/') - test.set('Content-Type', 'application/vnd+octets') - test.write(Buffer.from('000102', 'hex')) - test.expect(200, { buf: '000102' }, done) - }) - - it('should ignore "application/x-foo"', function (done) { - var test = request(this.app).post('/') - test.set('Content-Type', 'application/x-foo') - test.write(Buffer.from('000102', 'hex')) - test.expect(200, '{}', done) - }) - }) - - describe('when a function', function () { - it('should parse when truthy value returned', function (done) { - var app = createApp({ type: accept }) - - function accept (req) { - return req.headers['content-type'] === 'application/vnd.octet' - } - - var test = request(app).post('/') - test.set('Content-Type', 'application/vnd.octet') - test.write(Buffer.from('000102', 'hex')) - test.expect(200, { buf: '000102' }, done) - }) - - it('should work without content-type', function (done) { - var app = createApp({ type: accept }) - - function accept (req) { - return true - } - - var test = request(app).post('/') - test.write(Buffer.from('000102', 'hex')) - test.expect(200, { buf: '000102' }, done) - }) - - it('should not invoke without a body', function (done) { - var app = createApp({ type: accept }) - - function accept (req) { - throw new Error('oops!') - } - - request(app) - .get('/') - .expect(404, done) - }) - }) - }) - - describe('with verify option', function () { - it('should assert value is function', function () { - assert.throws(createApp.bind(null, { verify: 'lol' }), - /TypeError: option verify must be function/) - }) - - it('should error from verify', function (done) { - var app = createApp({ - verify: function (req, res, buf) { - if (buf[0] === 0x00) throw new Error('no leading null') - } - }) - - var test = request(app).post('/') - test.set('Content-Type', 'application/octet-stream') - test.write(Buffer.from('000102', 'hex')) - test.expect(403, '[entity.verify.failed] no leading null', done) - }) - - it('should allow custom codes', function (done) { - var app = createApp({ - verify: function (req, res, buf) { - if (buf[0] !== 0x00) return - var err = new Error('no leading null') - err.status = 400 - throw err - } - }) - - var test = request(app).post('/') - test.set('Content-Type', 'application/octet-stream') - test.write(Buffer.from('000102', 'hex')) - test.expect(400, '[entity.verify.failed] no leading null', done) - }) - - it('should allow pass-through', function (done) { - var app = createApp({ - verify: function (req, res, buf) { - if (buf[0] === 0x00) throw new Error('no leading null') - } - }) - - var test = request(app).post('/') - test.set('Content-Type', 'application/octet-stream') - test.write(Buffer.from('0102', 'hex')) - test.expect(200, { buf: '0102' }, done) - }) - }) - - describeAsyncHooks('async local storage', function () { - before(function () { - var app = express() - var store = { foo: 'bar' } - - app.use(function (req, res, next) { - req.asyncLocalStorage = new asyncHooks.AsyncLocalStorage() - req.asyncLocalStorage.run(store, next) - }) - - app.use(express.raw()) - - app.use(function (req, res, next) { - var local = req.asyncLocalStorage.getStore() - - if (local) { - res.setHeader('x-store-foo', String(local.foo)) - } - - next() - }) - - app.use(function (err, req, res, next) { - var local = req.asyncLocalStorage.getStore() - - if (local) { - res.setHeader('x-store-foo', String(local.foo)) - } - - res.status(err.status || 500) - res.send('[' + err.type + '] ' + err.message) - }) - - app.post('/', function (req, res) { - if (Buffer.isBuffer(req.body)) { - res.json({ buf: req.body.toString('hex') }) - } else { - res.json(req.body) - } - }) - - this.app = app - }) - - it('should presist store', function (done) { - request(this.app) - .post('/') - .set('Content-Type', 'application/octet-stream') - .send('the user is tobi') - .expect(200) - .expect('x-store-foo', 'bar') - .expect({ buf: '746865207573657220697320746f6269' }) - .end(done) - }) - - it('should presist store when unmatched content-type', function (done) { - request(this.app) - .post('/') - .set('Content-Type', 'application/fizzbuzz') - .send('buzz') - .expect(200) - .expect('x-store-foo', 'bar') - .expect('{}') - .end(done) - }) - - it('should presist store when inflated', function (done) { - var test = request(this.app).post('/') - test.set('Content-Encoding', 'gzip') - test.set('Content-Type', 'application/octet-stream') - test.write(Buffer.from('1f8b080000000000000bcb4bcc4db57db16e170099a4bad608000000', 'hex')) - test.expect(200) - test.expect('x-store-foo', 'bar') - test.expect({ buf: '6e616d653de8aeba' }) - test.end(done) - }) - - it('should presist store when inflate error', function (done) { - var test = request(this.app).post('/') - test.set('Content-Encoding', 'gzip') - test.set('Content-Type', 'application/octet-stream') - test.write(Buffer.from('1f8b080000000000000bcb4bcc4db57db16e170099a4bad6080000', 'hex')) - test.expect(400) - test.expect('x-store-foo', 'bar') - test.end(done) - }) - - it('should presist store when limit exceeded', function (done) { - request(this.app) - .post('/') - .set('Content-Type', 'application/octet-stream') - .send('the user is ' + Buffer.alloc(1024 * 100, '.').toString()) - .expect(413) - .expect('x-store-foo', 'bar') - .end(done) - }) - }) - - describe('charset', function () { - before(function () { - this.app = createApp() - }) - - it('should ignore charset', function (done) { - var test = request(this.app).post('/') - test.set('Content-Type', 'application/octet-stream; charset=utf-8') - test.write(Buffer.from('6e616d6520697320e8aeba', 'hex')) - test.expect(200, { buf: '6e616d6520697320e8aeba' }, done) - }) - }) - - describe('encoding', function () { - before(function () { - this.app = createApp({ limit: '10kb' }) - }) - - it('should parse without encoding', function (done) { - var test = request(this.app).post('/') - test.set('Content-Type', 'application/octet-stream') - test.write(Buffer.from('6e616d653de8aeba', 'hex')) - test.expect(200, { buf: '6e616d653de8aeba' }, done) - }) - - it('should support identity encoding', function (done) { - var test = request(this.app).post('/') - test.set('Content-Encoding', 'identity') - test.set('Content-Type', 'application/octet-stream') - test.write(Buffer.from('6e616d653de8aeba', 'hex')) - test.expect(200, { buf: '6e616d653de8aeba' }, done) - }) - - it('should support gzip encoding', function (done) { - var test = request(this.app).post('/') - test.set('Content-Encoding', 'gzip') - test.set('Content-Type', 'application/octet-stream') - test.write(Buffer.from('1f8b080000000000000bcb4bcc4db57db16e170099a4bad608000000', 'hex')) - test.expect(200, { buf: '6e616d653de8aeba' }, done) - }) - - it('should support deflate encoding', function (done) { - var test = request(this.app).post('/') - test.set('Content-Encoding', 'deflate') - test.set('Content-Type', 'application/octet-stream') - test.write(Buffer.from('789ccb4bcc4db57db16e17001068042f', 'hex')) - test.expect(200, { buf: '6e616d653de8aeba' }, done) - }) - - it('should be case-insensitive', function (done) { - var test = request(this.app).post('/') - test.set('Content-Encoding', 'GZIP') - test.set('Content-Type', 'application/octet-stream') - test.write(Buffer.from('1f8b080000000000000bcb4bcc4db57db16e170099a4bad608000000', 'hex')) - test.expect(200, { buf: '6e616d653de8aeba' }, done) - }) - - it('should 415 on unknown encoding', function (done) { - var test = request(this.app).post('/') - test.set('Content-Encoding', 'nulls') - test.set('Content-Type', 'application/octet-stream') - test.write(Buffer.from('000000000000', 'hex')) - test.expect(415, '[encoding.unsupported] unsupported content encoding "nulls"', done) - }) - }) -}) - -function createApp (options) { - var app = express() - - app.use(express.raw(options)) - - app.use(function (err, req, res, next) { - res.status(err.status || 500) - res.send(String(req.headers['x-error-property'] - ? err[req.headers['x-error-property']] - : ('[' + err.type + '] ' + err.message))) - }) - - app.post('/', function (req, res) { - if (Buffer.isBuffer(req.body)) { - res.json({ buf: req.body.toString('hex') }) - } else { - res.json(req.body) - } - }) - - return app -} - -function tryRequire (name) { - try { - return require(name) - } catch (e) { - return {} - } -} diff --git a/test/express.static.js b/test/express.static.js deleted file mode 100644 index 245fd592..00000000 --- a/test/express.static.js +++ /dev/null @@ -1,814 +0,0 @@ -'use strict' - -var assert = require('assert') -var Buffer = require('safe-buffer').Buffer -var express = require('..') -var path = require('path') -var request = require('supertest') -var utils = require('./support/utils') - -var fixtures = path.join(__dirname, '/fixtures') -var relative = path.relative(process.cwd(), fixtures) - -var skipRelative = ~relative.indexOf('..') || path.resolve(relative) === relative - -describe('express.static()', function () { - describe('basic operations', function () { - before(function () { - this.app = createApp() - }) - - it('should require root path', function () { - assert.throws(express.static.bind(), /root path required/) - }) - - it('should require root path to be string', function () { - assert.throws(express.static.bind(null, 42), /root path.*string/) - }) - - it('should serve static files', function (done) { - request(this.app) - .get('/todo.txt') - .expect(200, '- groceries', done) - }) - - it('should support nesting', function (done) { - request(this.app) - .get('/users/tobi.txt') - .expect(200, 'ferret', done) - }) - - it('should set Content-Type', function (done) { - request(this.app) - .get('/todo.txt') - .expect('Content-Type', 'text/plain; charset=UTF-8') - .expect(200, done) - }) - - it('should set Last-Modified', function (done) { - request(this.app) - .get('/todo.txt') - .expect('Last-Modified', /\d{2} \w{3} \d{4}/) - .expect(200, done) - }) - - it('should default max-age=0', function (done) { - request(this.app) - .get('/todo.txt') - .expect('Cache-Control', 'public, max-age=0') - .expect(200, done) - }) - - it('should support urlencoded pathnames', function (done) { - request(this.app) - .get('/%25%20of%20dogs.txt') - .expect(200, '20%', done) - }) - - it('should not choke on auth-looking URL', function (done) { - request(this.app) - .get('//todo@txt') - .expect(404, 'Not Found', done) - }) - - it('should support index.html', function (done) { - request(this.app) - .get('/users/') - .expect(200) - .expect('Content-Type', /html/) - .expect('tobi, loki, jane
', done) - }) - - it('should support ../', function (done) { - request(this.app) - .get('/users/../todo.txt') - .expect(200, '- groceries', done) - }) - - it('should support HEAD', function (done) { - request(this.app) - .head('/todo.txt') - .expect(200) - .expect(utils.shouldNotHaveBody()) - .end(done) - }) - - it('should skip POST requests', function (done) { - request(this.app) - .post('/todo.txt') - .expect(404, 'Not Found', done) - }) - - it('should support conditional requests', function (done) { - var app = this.app - - request(app) - .get('/todo.txt') - .end(function (err, res) { - if (err) throw err - request(app) - .get('/todo.txt') - .set('If-None-Match', res.headers.etag) - .expect(304, done) - }) - }) - - it('should support precondition checks', function (done) { - request(this.app) - .get('/todo.txt') - .set('If-Match', '"foo"') - .expect(412, done) - }) - - it('should serve zero-length files', function (done) { - request(this.app) - .get('/empty.txt') - .expect(200, '', done) - }) - - it('should ignore hidden files', function (done) { - request(this.app) - .get('/.name') - .expect(404, 'Not Found', done) - }) - }); - - (skipRelative ? describe.skip : describe)('current dir', function () { - before(function () { - this.app = createApp('.') - }) - - it('should be served with "."', function (done) { - var dest = relative.split(path.sep).join('/') - request(this.app) - .get('/' + dest + '/todo.txt') - .expect(200, '- groceries', done) - }) - }) - - describe('acceptRanges', function () { - describe('when false', function () { - it('should not include Accept-Ranges', function (done) { - request(createApp(fixtures, { 'acceptRanges': false })) - .get('/nums.txt') - .expect(utils.shouldNotHaveHeader('Accept-Ranges')) - .expect(200, '123456789', done) - }) - - it('should ignore Rage request header', function (done) { - request(createApp(fixtures, { 'acceptRanges': false })) - .get('/nums.txt') - .set('Range', 'bytes=0-3') - .expect(utils.shouldNotHaveHeader('Accept-Ranges')) - .expect(utils.shouldNotHaveHeader('Content-Range')) - .expect(200, '123456789', done) - }) - }) - - describe('when true', function () { - it('should include Accept-Ranges', function (done) { - request(createApp(fixtures, { 'acceptRanges': true })) - .get('/nums.txt') - .expect('Accept-Ranges', 'bytes') - .expect(200, '123456789', done) - }) - - it('should obey Rage request header', function (done) { - request(createApp(fixtures, { 'acceptRanges': true })) - .get('/nums.txt') - .set('Range', 'bytes=0-3') - .expect('Accept-Ranges', 'bytes') - .expect('Content-Range', 'bytes 0-3/9') - .expect(206, '1234', done) - }) - }) - }) - - describe('cacheControl', function () { - describe('when false', function () { - it('should not include Cache-Control', function (done) { - request(createApp(fixtures, { 'cacheControl': false })) - .get('/nums.txt') - .expect(utils.shouldNotHaveHeader('Cache-Control')) - .expect(200, '123456789', done) - }) - - it('should ignore maxAge', function (done) { - request(createApp(fixtures, { 'cacheControl': false, 'maxAge': 12000 })) - .get('/nums.txt') - .expect(utils.shouldNotHaveHeader('Cache-Control')) - .expect(200, '123456789', done) - }) - }) - - describe('when true', function () { - it('should include Cache-Control', function (done) { - request(createApp(fixtures, { 'cacheControl': true })) - .get('/nums.txt') - .expect('Cache-Control', 'public, max-age=0') - .expect(200, '123456789', done) - }) - }) - }) - - describe('extensions', function () { - it('should be not be enabled by default', function (done) { - request(createApp(fixtures)) - .get('/todo') - .expect(404, done) - }) - - it('should be configurable', function (done) { - request(createApp(fixtures, { 'extensions': 'txt' })) - .get('/todo') - .expect(200, '- groceries', done) - }) - - it('should support disabling extensions', function (done) { - request(createApp(fixtures, { 'extensions': false })) - .get('/todo') - .expect(404, done) - }) - - it('should support fallbacks', function (done) { - request(createApp(fixtures, { 'extensions': ['htm', 'html', 'txt'] })) - .get('/todo') - .expect(200, '{{user.name}}
', done) - }) - - it('should accept range requests', function (done) { - var app = express() - - app.get('/', function (req, res) { - res.download('test/fixtures/user.html') - }) - - request(app) - .get('/') - .expect('Accept-Ranges', 'bytes') - .expect(200, '{{user.name}}
', done) - }) - - it('should respond with requested byte range', function (done) { - var app = express() - - app.get('/', function (req, res) { - res.download('test/fixtures/user.html') - }) - - request(app) - .get('/') - .set('Range', 'bytes=0-2') - .expect('Content-Range', 'bytes 0-2/20') - .expect(206, '', done) - }) - }) - - describe('.download(path, filename)', function(){ - it('should provide an alternate filename', function(done){ - var app = express(); - - app.use(function(req, res){ - res.download('test/fixtures/user.html', 'document'); - }); - - request(app) - .get('/') - .expect('Content-Type', 'text/html; charset=UTF-8') - .expect('Content-Disposition', 'attachment; filename="document"') - .expect(200, done) - }) - }) - - describe('.download(path, fn)', function(){ - it('should invoke the callback', function(done){ - var app = express(); - var cb = after(2, done); - - app.use(function(req, res){ - res.download('test/fixtures/user.html', cb); - }); - - request(app) - .get('/') - .expect('Content-Type', 'text/html; charset=UTF-8') - .expect('Content-Disposition', 'attachment; filename="user.html"') - .expect(200, cb); - }) - - describeAsyncHooks('async local storage', function () { - it('should presist store', function (done) { - var app = express() - var cb = after(2, done) - var store = { foo: 'bar' } - - app.use(function (req, res, next) { - req.asyncLocalStorage = new asyncHooks.AsyncLocalStorage() - req.asyncLocalStorage.run(store, next) - }) - - app.use(function (req, res) { - res.download('test/fixtures/name.txt', function (err) { - if (err) return cb(err) - - var local = req.asyncLocalStorage.getStore() - - assert.strictEqual(local.foo, 'bar') - cb() - }) - }) - - request(app) - .get('/') - .expect('Content-Type', 'text/plain; charset=UTF-8') - .expect('Content-Disposition', 'attachment; filename="name.txt"') - .expect(200, 'tobi', cb) - }) - - it('should presist store on error', function (done) { - var app = express() - var store = { foo: 'bar' } - - app.use(function (req, res, next) { - req.asyncLocalStorage = new asyncHooks.AsyncLocalStorage() - req.asyncLocalStorage.run(store, next) - }) - - app.use(function (req, res) { - res.download('test/fixtures/does-not-exist', function (err) { - var local = req.asyncLocalStorage.getStore() - - if (local) { - res.setHeader('x-store-foo', String(local.foo)) - } - - res.send(err ? 'got ' + err.status + ' error' : 'no error') - }) - }) - - request(app) - .get('/') - .expect(200) - .expect('x-store-foo', 'bar') - .expect('got 404 error') - .end(done) - }) - }) - }) - - describe('.download(path, options)', function () { - it('should allow options to res.sendFile()', function (done) { - var app = express() - - app.use(function (req, res) { - res.download('test/fixtures/.name', { - dotfiles: 'allow', - maxAge: '4h' - }) - }) - - request(app) - .get('/') - .expect(200) - .expect('Content-Disposition', 'attachment; filename=".name"') - .expect('Cache-Control', 'public, max-age=14400') - .expect(utils.shouldHaveBody(Buffer.from('tobi'))) - .end(done) - }) - - describe('with "headers" option', function () { - it('should set headers on response', function (done) { - var app = express() - - app.use(function (req, res) { - res.download('test/fixtures/user.html', { - headers: { - 'X-Foo': 'Bar', - 'X-Bar': 'Foo' - } - }) - }) - - request(app) - .get('/') - .expect(200) - .expect('X-Foo', 'Bar') - .expect('X-Bar', 'Foo') - .end(done) - }) - - it('should use last header when duplicated', function (done) { - var app = express() - - app.use(function (req, res) { - res.download('test/fixtures/user.html', { - headers: { - 'X-Foo': 'Bar', - 'x-foo': 'bar' - } - }) - }) - - request(app) - .get('/') - .expect(200) - .expect('X-Foo', 'bar') - .end(done) - }) - - it('should override Content-Type', function (done) { - var app = express() - - app.use(function (req, res) { - res.download('test/fixtures/user.html', { - headers: { - 'Content-Type': 'text/x-custom' - } - }) - }) - - request(app) - .get('/') - .expect(200) - .expect('Content-Type', 'text/x-custom') - .end(done) - }) - - it('should not set headers on 404', function (done) { - var app = express() - - app.use(function (req, res) { - res.download('test/fixtures/does-not-exist', { - headers: { - 'X-Foo': 'Bar' - } - }) - }) - - request(app) - .get('/') - .expect(404) - .expect(utils.shouldNotHaveHeader('X-Foo')) - .end(done) - }) - - describe('when headers contains Content-Disposition', function () { - it('should be ignored', function (done) { - var app = express() - - app.use(function (req, res) { - res.download('test/fixtures/user.html', { - headers: { - 'Content-Disposition': 'inline' - } - }) - }) - - request(app) - .get('/') - .expect(200) - .expect('Content-Disposition', 'attachment; filename="user.html"') - .end(done) - }) - - it('should be ignored case-insensitively', function (done) { - var app = express() - - app.use(function (req, res) { - res.download('test/fixtures/user.html', { - headers: { - 'content-disposition': 'inline' - } - }) - }) - - request(app) - .get('/') - .expect(200) - .expect('Content-Disposition', 'attachment; filename="user.html"') - .end(done) - }) - }) - }) - - describe('with "root" option', function () { - it('should allow relative path', function (done) { - var app = express() - - app.use(function (req, res) { - res.download('name.txt', { - root: FIXTURES_PATH - }) - }) - - request(app) - .get('/') - .expect(200) - .expect('Content-Disposition', 'attachment; filename="name.txt"') - .expect(utils.shouldHaveBody(Buffer.from('tobi'))) - .end(done) - }) - - it('should allow up within root', function (done) { - var app = express() - - app.use(function (req, res) { - res.download('fake/../name.txt', { - root: FIXTURES_PATH - }) - }) - - request(app) - .get('/') - .expect(200) - .expect('Content-Disposition', 'attachment; filename="name.txt"') - .expect(utils.shouldHaveBody(Buffer.from('tobi'))) - .end(done) - }) - - it('should reject up outside root', function (done) { - var app = express() - - app.use(function (req, res) { - var p = '..' + path.sep + - path.relative(path.dirname(FIXTURES_PATH), path.join(FIXTURES_PATH, 'name.txt')) - - res.download(p, { - root: FIXTURES_PATH - }) - }) - - request(app) - .get('/') - .expect(403) - .expect(utils.shouldNotHaveHeader('Content-Disposition')) - .end(done) - }) - - it('should reject reading outside root', function (done) { - var app = express() - - app.use(function (req, res) { - res.download('../name.txt', { - root: FIXTURES_PATH - }) - }) - - request(app) - .get('/') - .expect(403) - .expect(utils.shouldNotHaveHeader('Content-Disposition')) - .end(done) - }) - }) - }) - - describe('.download(path, filename, fn)', function(){ - it('should invoke the callback', function(done){ - var app = express(); - var cb = after(2, done); - - app.use(function(req, res){ - res.download('test/fixtures/user.html', 'document', cb) - }); - - request(app) - .get('/') - .expect('Content-Type', 'text/html; charset=UTF-8') - .expect('Content-Disposition', 'attachment; filename="document"') - .expect(200, cb); - }) - }) - - describe('.download(path, filename, options, fn)', function () { - it('should invoke the callback', function (done) { - var app = express() - var cb = after(2, done) - var options = {} - - app.use(function (req, res) { - res.download('test/fixtures/user.html', 'document', options, cb) - }) - - request(app) - .get('/') - .expect(200) - .expect('Content-Type', 'text/html; charset=UTF-8') - .expect('Content-Disposition', 'attachment; filename="document"') - .end(cb) - }) - - it('should allow options to res.sendFile()', function (done) { - var app = express() - - app.use(function (req, res) { - res.download('test/fixtures/.name', 'document', { - dotfiles: 'allow', - maxAge: '4h' - }) - }) - - request(app) - .get('/') - .expect(200) - .expect('Content-Disposition', 'attachment; filename="document"') - .expect('Cache-Control', 'public, max-age=14400') - .expect(utils.shouldHaveBody(Buffer.from('tobi'))) - .end(done) - }) - - describe('when options.headers contains Content-Disposition', function () { - it('should be ignored', function (done) { - var app = express() - - app.use(function (req, res) { - res.download('test/fixtures/user.html', 'document', { - headers: { - 'Content-Type': 'text/x-custom', - 'Content-Disposition': 'inline' - } - }) - }) - - request(app) - .get('/') - .expect(200) - .expect('Content-Type', 'text/x-custom') - .expect('Content-Disposition', 'attachment; filename="document"') - .end(done) - }) - - it('should be ignored case-insensitively', function (done) { - var app = express() - - app.use(function (req, res) { - res.download('test/fixtures/user.html', 'document', { - headers: { - 'content-type': 'text/x-custom', - 'content-disposition': 'inline' - } - }) - }) - - request(app) - .get('/') - .expect(200) - .expect('Content-Type', 'text/x-custom') - .expect('Content-Disposition', 'attachment; filename="document"') - .end(done) - }) - }) - }) - - describe('on failure', function(){ - it('should invoke the callback', function(done){ - var app = express(); - - app.use(function (req, res, next) { - res.download('test/fixtures/foobar.html', function(err){ - if (!err) return next(new Error('expected error')); - res.send('got ' + err.status + ' ' + err.code); - }); - }); - - request(app) - .get('/') - .expect(200, 'got 404 ENOENT', done); - }) - - it('should remove Content-Disposition', function(done){ - var app = express() - - app.use(function (req, res, next) { - res.download('test/fixtures/foobar.html', function(err){ - if (!err) return next(new Error('expected error')); - res.end('failed'); - }); - }); - - request(app) - .get('/') - .expect(utils.shouldNotHaveHeader('Content-Disposition')) - .expect(200, 'failed', done) - }) - }) -}) - -function tryRequire (name) { - try { - return require(name) - } catch (e) { - return {} - } -} diff --git a/test/res.format.js b/test/res.format.js deleted file mode 100644 index cba6fe13..00000000 --- a/test/res.format.js +++ /dev/null @@ -1,243 +0,0 @@ -'use strict' - -var after = require('after') -var express = require('../') - , request = require('supertest') - , assert = require('assert'); - -var app1 = express(); - -app1.use(function(req, res, next){ - res.format({ - 'text/plain': function(){ - res.send('hey'); - }, - - 'text/html': function(){ - res.send('
hey
'); - }, - - 'application/json': function(a, b, c){ - assert(req === a) - assert(res === b) - assert(next === c) - res.send({ message: 'hey' }); - } - }); -}); - -app1.use(function(err, req, res, next){ - if (!err.types) throw err; - res.send(err.status, 'Supports: ' + err.types.join(', ')); -}) - -var app2 = express(); - -app2.use(function(req, res, next){ - res.format({ - text: function(){ res.send('hey') }, - html: function(){ res.send('hey
') }, - json: function(){ res.send({ message: 'hey' }) } - }); -}); - -app2.use(function(err, req, res, next){ - res.send(err.status, 'Supports: ' + err.types.join(', ')); -}) - -var app3 = express(); - -app3.use(function(req, res, next){ - res.format({ - text: function(){ res.send('hey') }, - default: function (a, b, c) { - assert(req === a) - assert(res === b) - assert(next === c) - res.send('default') - } - }) -}); - -var app4 = express(); - -app4.get('/', function (req, res) { - res.format({ - text: function(){ res.send('hey') }, - html: function(){ res.send('hey
') }, - json: function(){ res.send({ message: 'hey' }) } - }); -}); - -app4.use(function(err, req, res, next){ - res.send(err.status, 'Supports: ' + err.types.join(', ')); -}) - -var app5 = express(); - -app5.use(function (req, res, next) { - res.format({ - default: function () { res.send('hey') } - }); -}); - -describe('res', function(){ - describe('.format(obj)', function(){ - describe('with canonicalized mime types', function(){ - test(app1); - }) - - describe('with extnames', function(){ - test(app2); - }) - - describe('with parameters', function(){ - var app = express(); - - app.use(function(req, res, next){ - res.format({ - 'text/plain; charset=utf-8': function(){ res.send('hey') }, - 'text/html; foo=bar; bar=baz': function(){ res.send('hey
') }, - 'application/json; q=0.5': function(){ res.send({ message: 'hey' }) } - }); - }); - - app.use(function(err, req, res, next){ - res.send(err.status, 'Supports: ' + err.types.join(', ')); - }); - - test(app); - }) - - describe('given .default', function(){ - it('should be invoked instead of auto-responding', function(done){ - request(app3) - .get('/') - .set('Accept', 'text/html') - .expect('default', done); - }) - - it('should work when only .default is provided', function (done) { - request(app5) - .get('/') - .set('Accept', '*/*') - .expect('hey', done); - }) - - it('should be able to invoke other formatter', function (done) { - var app = express() - - app.use(function (req, res, next) { - res.format({ - json: function () { res.send('json') }, - default: function () { - res.header('x-default', '1') - this.json() - } - }) - }) - - request(app) - .get('/') - .set('Accept', 'text/plain') - .expect(200) - .expect('x-default', '1') - .expect('json') - .end(done) - }) - }) - - describe('in router', function(){ - test(app4); - }) - - describe('in router', function(){ - var app = express(); - var router = express.Router(); - - router.get('/', function (req, res) { - res.format({ - text: function(){ res.send('hey') }, - html: function(){ res.send('hey
') }, - json: function(){ res.send({ message: 'hey' }) } - }); - }); - - router.use(function(err, req, res, next){ - res.send(err.status, 'Supports: ' + err.types.join(', ')); - }) - - app.use(router) - - test(app) - }) - }) -}) - -function test(app) { - it('should utilize qvalues in negotiation', function(done){ - request(app) - .get('/') - .set('Accept', 'text/html; q=.5, application/json, */*; q=.1') - .expect({"message":"hey"}, done); - }) - - it('should allow wildcard type/subtypes', function(done){ - request(app) - .get('/') - .set('Accept', 'text/html; q=.5, application/*, */*; q=.1') - .expect({"message":"hey"}, done); - }) - - it('should default the Content-Type', function(done){ - request(app) - .get('/') - .set('Accept', 'text/html; q=.5, text/plain') - .expect('Content-Type', 'text/plain; charset=utf-8') - .expect('hey', done); - }) - - it('should set the correct charset for the Content-Type', function (done) { - var cb = after(3, done) - - request(app) - .get('/') - .set('Accept', 'text/html') - .expect('Content-Type', 'text/html; charset=utf-8', cb) - - request(app) - .get('/') - .set('Accept', 'text/plain') - .expect('Content-Type', 'text/plain; charset=utf-8', cb) - - request(app) - .get('/') - .set('Accept', 'application/json') - .expect('Content-Type', 'application/json; charset=utf-8', cb) - }) - - it('should Vary: Accept', function(done){ - request(app) - .get('/') - .set('Accept', 'text/html; q=.5, text/plain') - .expect('Vary', 'Accept', done); - }) - - describe('when Accept is not present', function(){ - it('should invoke the first callback', function(done){ - request(app) - .get('/') - .expect('hey', done); - }) - }) - - describe('when no match is made', function(){ - it('should should respond with 406 not acceptable', function(done){ - request(app) - .get('/') - .set('Accept', 'foo/bar') - .expect('Supports: text/plain, text/html, application/json') - .expect(406, done) - }) - }) -} diff --git a/test/res.get.js b/test/res.get.js deleted file mode 100644 index a5f12e2e..00000000 --- a/test/res.get.js +++ /dev/null @@ -1,21 +0,0 @@ -'use strict' - -var express = require('..'); -var request = require('supertest'); - -describe('res', function(){ - describe('.get(field)', function(){ - it('should get the response header field', function (done) { - var app = express(); - - app.use(function (req, res) { - res.setHeader('Content-Type', 'text/x-foo'); - res.send(res.get('Content-Type')); - }); - - request(app) - .get('/') - .expect(200, 'text/x-foo', done); - }) - }) -}) diff --git a/test/res.json.js b/test/res.json.js deleted file mode 100644 index dcaceae5..00000000 --- a/test/res.json.js +++ /dev/null @@ -1,229 +0,0 @@ -'use strict' - -var express = require('../') - , request = require('supertest') - , assert = require('assert'); - -describe('res', function(){ - describe('.json(object)', function(){ - it('should not support jsonp callbacks', function(done){ - var app = express(); - - app.use(function(req, res){ - res.json({ foo: 'bar' }); - }); - - request(app) - .get('/?callback=foo') - .expect('{"foo":"bar"}', done); - }) - - it('should not override previous Content-Types', function(done){ - var app = express(); - - app.get('/', function(req, res){ - res.type('application/vnd.example+json'); - res.json({ hello: 'world' }); - }); - - request(app) - .get('/') - .expect('Content-Type', 'application/vnd.example+json; charset=utf-8') - .expect(200, '{"hello":"world"}', done); - }) - - describe('when given primitives', function(){ - it('should respond with json for null', function(done){ - var app = express(); - - app.use(function(req, res){ - res.json(null); - }); - - request(app) - .get('/') - .expect('Content-Type', 'application/json; charset=utf-8') - .expect(200, 'null', done) - }) - - it('should respond with json for Number', function(done){ - var app = express(); - - app.use(function(req, res){ - res.json(300); - }); - - request(app) - .get('/') - .expect('Content-Type', 'application/json; charset=utf-8') - .expect(200, '300', done) - }) - - it('should respond with json for String', function(done){ - var app = express(); - - app.use(function(req, res){ - res.json('str'); - }); - - request(app) - .get('/') - .expect('Content-Type', 'application/json; charset=utf-8') - .expect(200, '"str"', done) - }) - }) - - describe('when given an array', function(){ - it('should respond with json', function(done){ - var app = express(); - - app.use(function(req, res){ - res.json(['foo', 'bar', 'baz']); - }); - - request(app) - .get('/') - .expect('Content-Type', 'application/json; charset=utf-8') - .expect(200, '["foo","bar","baz"]', done) - }) - }) - - describe('when given an object', function(){ - it('should respond with json', function(done){ - var app = express(); - - app.use(function(req, res){ - res.json({ name: 'tobi' }); - }); - - request(app) - .get('/') - .expect('Content-Type', 'application/json; charset=utf-8') - .expect(200, '{"name":"tobi"}', done) - }) - }) - - describe('"json escape" setting', function () { - it('should be undefined by default', function () { - var app = express() - assert.strictEqual(app.get('json escape'), undefined) - }) - - it('should unicode escape HTML-sniffing characters', function (done) { - var app = express() - - app.enable('json escape') - - app.use(function (req, res) { - res.json({ '&': ''); - }); - - request(app) - .get('/') - .set('Host', 'http://example.com') - .set('Accept', 'text/plain, */*') - .expect('Content-Type', /plain/) - .expect('Location', 'http://example.com/?param=%3Cscript%3Ealert(%22hax%22);%3C/script%3E') - .expect(302, 'Found. Redirecting to http://example.com/?param=%3Cscript%3Ealert(%22hax%22);%3C/script%3E', done) - }) - - it('should include the redirect type', function(done){ - var app = express(); - - app.use(function(req, res){ - res.redirect(301, 'http://google.com'); - }); - - request(app) - .get('/') - .set('Accept', 'text/plain, */*') - .expect('Content-Type', /plain/) - .expect('Location', 'http://google.com') - .expect(301, 'Moved Permanently. Redirecting to http://google.com', done); - }) - }) - - describe('when accepting neither text or html', function(){ - it('should respond with an empty body', function(done){ - var app = express(); - - app.use(function(req, res){ - res.redirect('http://google.com'); - }); - - request(app) - .get('/') - .set('Accept', 'application/octet-stream') - .expect(302) - .expect('location', 'http://google.com') - .expect('content-length', '0') - .expect(utils.shouldNotHaveHeader('Content-Type')) - .expect(utils.shouldNotHaveBody()) - .end(done) - }) - }) -}) diff --git a/test/res.render.js b/test/res.render.js deleted file mode 100644 index 50f0b0a7..00000000 --- a/test/res.render.js +++ /dev/null @@ -1,367 +0,0 @@ -'use strict' - -var express = require('..'); -var path = require('path') -var request = require('supertest'); -var tmpl = require('./support/tmpl'); - -describe('res', function(){ - describe('.render(name)', function(){ - it('should support absolute paths', function(done){ - var app = createApp(); - - app.locals.user = { name: 'tobi' }; - - app.use(function(req, res){ - res.render(path.join(__dirname, 'fixtures', 'user.tmpl')) - }); - - request(app) - .get('/') - .expect('tobi
', done); - }) - - it('should support absolute paths with "view engine"', function(done){ - var app = createApp(); - - app.locals.user = { name: 'tobi' }; - app.set('view engine', 'tmpl'); - - app.use(function(req, res){ - res.render(path.join(__dirname, 'fixtures', 'user')) - }); - - request(app) - .get('/') - .expect('tobi
', done); - }) - - it('should error without "view engine" set and file extension to a non-engine module', function (done) { - var app = createApp() - - app.locals.user = { name: 'tobi' } - - app.use(function (req, res) { - res.render(path.join(__dirname, 'fixtures', 'broken.send')) - }) - - request(app) - .get('/') - .expect(500, /does not provide a view engine/, done) - }) - - it('should error without "view engine" set and no file extension', function (done) { - var app = createApp(); - - app.locals.user = { name: 'tobi' }; - - app.use(function(req, res){ - res.render(path.join(__dirname, 'fixtures', 'user')) - }); - - request(app) - .get('/') - .expect(500, /No default engine was specified/, done); - }) - - it('should expose app.locals', function(done){ - var app = createApp(); - - app.set('views', path.join(__dirname, 'fixtures')) - app.locals.user = { name: 'tobi' }; - - app.use(function(req, res){ - res.render('user.tmpl'); - }); - - request(app) - .get('/') - .expect('tobi
', done); - }) - - it('should expose app.locals with `name` property', function(done){ - var app = createApp(); - - app.set('views', path.join(__dirname, 'fixtures')) - app.locals.name = 'tobi'; - - app.use(function(req, res){ - res.render('name.tmpl'); - }); - - request(app) - .get('/') - .expect('tobi
', done); - }) - - it('should support index.This is an email
', done); - }) - }) - - describe('when "views" is given', function(){ - it('should lookup the file in the path', function(done){ - var app = createApp(); - - app.set('views', path.join(__dirname, 'fixtures', 'default_layout')) - - app.use(function(req, res){ - res.render('user.tmpl', { user: { name: 'tobi' } }); - }); - - request(app) - .get('/') - .expect('tobi
', done); - }) - - describe('when array of paths', function(){ - it('should lookup the file in the path', function(done){ - var app = createApp(); - var views = [ - path.join(__dirname, 'fixtures', 'local_layout'), - path.join(__dirname, 'fixtures', 'default_layout') - ] - - app.set('views', views); - - app.use(function(req, res){ - res.render('user.tmpl', { user: { name: 'tobi' } }); - }); - - request(app) - .get('/') - .expect('tobi', done); - }) - - it('should lookup in later paths until found', function(done){ - var app = createApp(); - var views = [ - path.join(__dirname, 'fixtures', 'local_layout'), - path.join(__dirname, 'fixtures', 'default_layout') - ] - - app.set('views', views); - - app.use(function(req, res){ - res.render('name.tmpl', { name: 'tobi' }); - }); - - request(app) - .get('/') - .expect('tobi
', done); - }) - }) - }) - }) - - describe('.render(name, option)', function(){ - it('should render the template', function(done){ - var app = createApp(); - - app.set('views', path.join(__dirname, 'fixtures')) - - var user = { name: 'tobi' }; - - app.use(function(req, res){ - res.render('user.tmpl', { user: user }); - }); - - request(app) - .get('/') - .expect('tobi
', done); - }) - - it('should expose app.locals', function(done){ - var app = createApp(); - - app.set('views', path.join(__dirname, 'fixtures')) - app.locals.user = { name: 'tobi' }; - - app.use(function(req, res){ - res.render('user.tmpl'); - }); - - request(app) - .get('/') - .expect('tobi
', done); - }) - - it('should expose res.locals', function(done){ - var app = createApp(); - - app.set('views', path.join(__dirname, 'fixtures')) - - app.use(function(req, res){ - res.locals.user = { name: 'tobi' }; - res.render('user.tmpl'); - }); - - request(app) - .get('/') - .expect('tobi
', done); - }) - - it('should give precedence to res.locals over app.locals', function(done){ - var app = createApp(); - - app.set('views', path.join(__dirname, 'fixtures')) - app.locals.user = { name: 'tobi' }; - - app.use(function(req, res){ - res.locals.user = { name: 'jane' }; - res.render('user.tmpl', {}); - }); - - request(app) - .get('/') - .expect('jane
', done); - }) - - it('should give precedence to res.render() locals over res.locals', function(done){ - var app = createApp(); - - app.set('views', path.join(__dirname, 'fixtures')) - var jane = { name: 'jane' }; - - app.use(function(req, res){ - res.locals.user = { name: 'tobi' }; - res.render('user.tmpl', { user: jane }); - }); - - request(app) - .get('/') - .expect('jane
', done); - }) - - it('should give precedence to res.render() locals over app.locals', function(done){ - var app = createApp(); - - app.set('views', path.join(__dirname, 'fixtures')) - app.locals.user = { name: 'tobi' }; - var jane = { name: 'jane' }; - - app.use(function(req, res){ - res.render('user.tmpl', { user: jane }); - }); - - request(app) - .get('/') - .expect('jane
', done); - }) - }) - - describe('.render(name, options, fn)', function(){ - it('should pass the resulting string', function(done){ - var app = createApp(); - - app.set('views', path.join(__dirname, 'fixtures')) - - app.use(function(req, res){ - var tobi = { name: 'tobi' }; - res.render('user.tmpl', { user: tobi }, function (err, html) { - html = html.replace('tobi', 'loki'); - res.end(html); - }); - }); - - request(app) - .get('/') - .expect('loki
', done); - }) - }) - - describe('.render(name, fn)', function(){ - it('should pass the resulting string', function(done){ - var app = createApp(); - - app.set('views', path.join(__dirname, 'fixtures')) - - app.use(function(req, res){ - res.locals.user = { name: 'tobi' }; - res.render('user.tmpl', function (err, html) { - html = html.replace('tobi', 'loki'); - res.end(html); - }); - }); - - request(app) - .get('/') - .expect('loki
', done); - }) - - describe('when an error occurs', function(){ - it('should pass it to the callback', function(done){ - var app = createApp(); - - app.set('views', path.join(__dirname, 'fixtures')) - - app.use(function(req, res){ - res.render('user.tmpl', function (err) { - if (err) { - res.status(500).send('got error: ' + err.name) - } - }); - }); - - request(app) - .get('/') - .expect(500, 'got error: RenderError', done) - }) - }) - }) -}) - -function createApp() { - var app = express(); - - app.engine('.tmpl', tmpl); - - return app; -} diff --git a/test/res.send.js b/test/res.send.js deleted file mode 100644 index c92568db..00000000 --- a/test/res.send.js +++ /dev/null @@ -1,596 +0,0 @@ -'use strict' - -var assert = require('assert') -var Buffer = require('safe-buffer').Buffer -var express = require('..'); -var methods = require('methods'); -var request = require('supertest'); -var utils = require('./support/utils'); - -describe('res', function(){ - describe('.send()', function(){ - it('should set body to ""', function(done){ - var app = express(); - - app.use(function(req, res){ - res.send(); - }); - - request(app) - .get('/') - .expect(200, '', done); - }) - }) - - describe('.send(null)', function(){ - it('should set body to ""', function(done){ - var app = express(); - - app.use(function(req, res){ - res.send(null); - }); - - request(app) - .get('/') - .expect('Content-Length', '0') - .expect(200, '', done); - }) - }) - - describe('.send(undefined)', function(){ - it('should set body to ""', function(done){ - var app = express(); - - app.use(function(req, res){ - res.send(undefined); - }); - - request(app) - .get('/') - .expect(200, '', done); - }) - }) - - describe('.send(code)', function(){ - it('should set .statusCode', function(done){ - var app = express(); - - app.use(function(req, res){ - res.send(201) - }); - - request(app) - .get('/') - .expect('Created') - .expect(201, done); - }) - }) - - describe('.send(code, body)', function(){ - it('should set .statusCode and body', function(done){ - var app = express(); - - app.use(function(req, res){ - res.send(201, 'Created :)'); - }); - - request(app) - .get('/') - .expect('Created :)') - .expect(201, done); - }) - }) - - describe('.send(body, code)', function(){ - it('should be supported for backwards compat', function(done){ - var app = express(); - - app.use(function(req, res){ - res.send('Bad!', 400); - }); - - request(app) - .get('/') - .expect('Bad!') - .expect(400, done); - }) - }) - - describe('.send(code, number)', function(){ - it('should send number as json', function(done){ - var app = express(); - - app.use(function(req, res){ - res.send(200, 0.123); - }); - - request(app) - .get('/') - .expect('Content-Type', 'application/json; charset=utf-8') - .expect(200, '0.123', done); - }) - }) - - describe('.send(String)', function(){ - it('should send as html', function(done){ - var app = express(); - - app.use(function(req, res){ - res.send('hey
'); - }); - - request(app) - .get('/') - .expect('Content-Type', 'text/html; charset=utf-8') - .expect(200, 'hey
', done); - }) - - it('should set ETag', function (done) { - var app = express(); - - app.use(function (req, res) { - var str = Array(1000).join('-'); - res.send(str); - }); - - request(app) - .get('/') - .expect('ETag', 'W/"3e7-qPnkJ3CVdVhFJQvUBfF10TmVA7g"') - .expect(200, done); - }) - - it('should not override Content-Type', function(done){ - var app = express(); - - app.use(function(req, res){ - res.set('Content-Type', 'text/plain').send('hey'); - }); - - request(app) - .get('/') - .expect('Content-Type', 'text/plain; charset=utf-8') - .expect(200, 'hey', done); - }) - - it('should override charset in Content-Type', function(done){ - var app = express(); - - app.use(function(req, res){ - res.set('Content-Type', 'text/plain; charset=iso-8859-1').send('hey'); - }); - - request(app) - .get('/') - .expect('Content-Type', 'text/plain; charset=utf-8') - .expect(200, 'hey', done); - }) - - it('should keep charset in Content-Type for Buffers', function(done){ - var app = express(); - - app.use(function(req, res){ - res.set('Content-Type', 'text/plain; charset=iso-8859-1').send(Buffer.from('hi')) - }); - - request(app) - .get('/') - .expect('Content-Type', 'text/plain; charset=iso-8859-1') - .expect(200, 'hi', done); - }) - }) - - describe('.send(Buffer)', function(){ - it('should send as octet-stream', function(done){ - var app = express(); - - app.use(function(req, res){ - res.send(Buffer.from('hello')) - }); - - request(app) - .get('/') - .expect(200) - .expect('Content-Type', 'application/octet-stream') - .expect(utils.shouldHaveBody(Buffer.from('hello'))) - .end(done) - }) - - it('should set ETag', function (done) { - var app = express(); - - app.use(function (req, res) { - res.send(Buffer.alloc(999, '-')) - }); - - request(app) - .get('/') - .expect('ETag', 'W/"3e7-qPnkJ3CVdVhFJQvUBfF10TmVA7g"') - .expect(200, done); - }) - - it('should not override Content-Type', function(done){ - var app = express(); - - app.use(function(req, res){ - res.set('Content-Type', 'text/plain').send(Buffer.from('hey')) - }); - - request(app) - .get('/') - .expect('Content-Type', 'text/plain; charset=utf-8') - .expect(200, 'hey', done); - }) - - it('should not override ETag', function (done) { - var app = express() - - app.use(function (req, res) { - res.type('text/plain').set('ETag', '"foo"').send(Buffer.from('hey')) - }) - - request(app) - .get('/') - .expect('ETag', '"foo"') - .expect(200, 'hey', done) - }) - }) - - describe('.send(Object)', function(){ - it('should send as application/json', function(done){ - var app = express(); - - app.use(function(req, res){ - res.send({ name: 'tobi' }); - }); - - request(app) - .get('/') - .expect('Content-Type', 'application/json; charset=utf-8') - .expect(200, '{"name":"tobi"}', done) - }) - }) - - describe('when the request method is HEAD', function(){ - it('should ignore the body', function(done){ - var app = express(); - - app.use(function(req, res){ - res.send('yay'); - }); - - request(app) - .head('/') - .expect(200) - .expect(utils.shouldNotHaveBody()) - .end(done) - }) - }) - - describe('when .statusCode is 204', function(){ - it('should strip Content-* fields, Transfer-Encoding field, and body', function(done){ - var app = express(); - - app.use(function(req, res){ - res.status(204).set('Transfer-Encoding', 'chunked').send('foo'); - }); - - request(app) - .get('/') - .expect(utils.shouldNotHaveHeader('Content-Type')) - .expect(utils.shouldNotHaveHeader('Content-Length')) - .expect(utils.shouldNotHaveHeader('Transfer-Encoding')) - .expect(204, '', done); - }) - }) - - describe('when .statusCode is 205', function () { - it('should strip Transfer-Encoding field and body, set Content-Length', function (done) { - var app = express() - - app.use(function (req, res) { - res.status(205).set('Transfer-Encoding', 'chunked').send('foo') - }) - - request(app) - .get('/') - .expect(utils.shouldNotHaveHeader('Transfer-Encoding')) - .expect('Content-Length', '0') - .expect(205, '', done) - }) - }) - - describe('when .statusCode is 304', function(){ - it('should strip Content-* fields, Transfer-Encoding field, and body', function(done){ - var app = express(); - - app.use(function(req, res){ - res.status(304).set('Transfer-Encoding', 'chunked').send('foo'); - }); - - request(app) - .get('/') - .expect(utils.shouldNotHaveHeader('Content-Type')) - .expect(utils.shouldNotHaveHeader('Content-Length')) - .expect(utils.shouldNotHaveHeader('Transfer-Encoding')) - .expect(304, '', done); - }) - }) - - it('should always check regardless of length', function(done){ - var app = express(); - var etag = '"asdf"'; - - app.use(function(req, res, next){ - res.set('ETag', etag); - res.send('hey'); - }); - - request(app) - .get('/') - .set('If-None-Match', etag) - .expect(304, done); - }) - - it('should respond with 304 Not Modified when fresh', function(done){ - var app = express(); - var etag = '"asdf"'; - - app.use(function(req, res){ - var str = Array(1000).join('-'); - res.set('ETag', etag); - res.send(str); - }); - - request(app) - .get('/') - .set('If-None-Match', etag) - .expect(304, done); - }) - - it('should not perform freshness check unless 2xx or 304', function(done){ - var app = express(); - var etag = '"asdf"'; - - app.use(function(req, res, next){ - res.status(500); - res.set('ETag', etag); - res.send('hey'); - }); - - request(app) - .get('/') - .set('If-None-Match', etag) - .expect('hey') - .expect(500, done); - }) - - it('should not support jsonp callbacks', function(done){ - var app = express(); - - app.use(function(req, res){ - res.send({ foo: 'bar' }); - }); - - request(app) - .get('/?callback=foo') - .expect('{"foo":"bar"}', done); - }) - - it('should be chainable', function (done) { - var app = express() - - app.use(function (req, res) { - assert.equal(res.send('hey'), res) - }) - - request(app) - .get('/') - .expect(200, 'hey', done) - }) - - describe('"etag" setting', function () { - describe('when enabled', function () { - it('should send ETag', function (done) { - var app = express(); - - app.use(function (req, res) { - res.send('kajdslfkasdf'); - }); - - app.enable('etag'); - - request(app) - .get('/') - .expect('ETag', 'W/"c-IgR/L5SF7CJQff4wxKGF/vfPuZ0"') - .expect(200, done); - }); - - methods.forEach(function (method) { - if (method === 'connect') return; - - it('should send ETag in response to ' + method.toUpperCase() + ' request', function (done) { - var app = express(); - - app[method]('/', function (req, res) { - res.send('kajdslfkasdf'); - }); - - request(app) - [method]('/') - .expect('ETag', 'W/"c-IgR/L5SF7CJQff4wxKGF/vfPuZ0"') - .expect(200, done); - }) - }); - - it('should send ETag for empty string response', function (done) { - var app = express(); - - app.use(function (req, res) { - res.send(''); - }); - - app.enable('etag'); - - request(app) - .get('/') - .expect('ETag', 'W/"0-2jmj7l5rSw0yVb/vlWAYkK/YBwk"') - .expect(200, done); - }) - - it('should send ETag for long response', function (done) { - var app = express(); - - app.use(function (req, res) { - var str = Array(1000).join('-'); - res.send(str); - }); - - app.enable('etag'); - - request(app) - .get('/') - .expect('ETag', 'W/"3e7-qPnkJ3CVdVhFJQvUBfF10TmVA7g"') - .expect(200, done); - }); - - it('should not override ETag when manually set', function (done) { - var app = express(); - - app.use(function (req, res) { - res.set('etag', '"asdf"'); - res.send(200); - }); - - app.enable('etag'); - - request(app) - .get('/') - .expect('ETag', '"asdf"') - .expect(200, done); - }); - - it('should not send ETag for res.send()', function (done) { - var app = express(); - - app.use(function (req, res) { - res.send(); - }); - - app.enable('etag'); - - request(app) - .get('/') - .expect(utils.shouldNotHaveHeader('ETag')) - .expect(200, done); - }) - }); - - describe('when disabled', function () { - it('should send no ETag', function (done) { - var app = express(); - - app.use(function (req, res) { - var str = Array(1000).join('-'); - res.send(str); - }); - - app.disable('etag'); - - request(app) - .get('/') - .expect(utils.shouldNotHaveHeader('ETag')) - .expect(200, done); - }); - - it('should send ETag when manually set', function (done) { - var app = express(); - - app.disable('etag'); - - app.use(function (req, res) { - res.set('etag', '"asdf"'); - res.send(200); - }); - - request(app) - .get('/') - .expect('ETag', '"asdf"') - .expect(200, done); - }); - }); - - describe('when "strong"', function () { - it('should send strong ETag', function (done) { - var app = express(); - - app.set('etag', 'strong'); - - app.use(function (req, res) { - res.send('hello, world!'); - }); - - request(app) - .get('/') - .expect('ETag', '"d-HwnTDHB9U/PRbFMN1z1wps51lqk"') - .expect(200, done); - }) - }) - - describe('when "weak"', function () { - it('should send weak ETag', function (done) { - var app = express(); - - app.set('etag', 'weak'); - - app.use(function (req, res) { - res.send('hello, world!'); - }); - - request(app) - .get('/') - .expect('ETag', 'W/"d-HwnTDHB9U/PRbFMN1z1wps51lqk"') - .expect(200, done) - }) - }) - - describe('when a function', function () { - it('should send custom ETag', function (done) { - var app = express(); - - app.set('etag', function (body, encoding) { - var chunk = !Buffer.isBuffer(body) - ? Buffer.from(body, encoding) - : body; - assert.strictEqual(chunk.toString(), 'hello, world!') - return '"custom"'; - }); - - app.use(function (req, res) { - res.send('hello, world!'); - }); - - request(app) - .get('/') - .expect('ETag', '"custom"') - .expect(200, done); - }) - - it('should not send falsy ETag', function (done) { - var app = express(); - - app.set('etag', function (body, encoding) { - return undefined; - }); - - app.use(function (req, res) { - res.send('hello, world!'); - }); - - request(app) - .get('/') - .expect(utils.shouldNotHaveHeader('ETag')) - .expect(200, done); - }) - }) - }) -}) diff --git a/test/res.sendFile.js b/test/res.sendFile.js deleted file mode 100644 index 4db0a3b6..00000000 --- a/test/res.sendFile.js +++ /dev/null @@ -1,1412 +0,0 @@ -'use strict' - -var after = require('after'); -var asyncHooks = tryRequire('async_hooks') -var Buffer = require('safe-buffer').Buffer -var express = require('../') - , request = require('supertest') - , assert = require('assert'); -var onFinished = require('on-finished'); -var path = require('path'); -var fixtures = path.join(__dirname, 'fixtures'); -var utils = require('./support/utils'); - -var describeAsyncHooks = typeof asyncHooks.AsyncLocalStorage === 'function' - ? describe - : describe.skip - -describe('res', function(){ - describe('.sendFile(path)', function () { - it('should error missing path', function (done) { - var app = createApp(); - - request(app) - .get('/') - .expect(500, /path.*required/, done); - }); - - it('should error for non-string path', function (done) { - var app = createApp(42) - - request(app) - .get('/') - .expect(500, /TypeError: path must be a string to res.sendFile/, done) - }) - - it('should error for non-absolute path', function (done) { - var app = createApp('name.txt') - - request(app) - .get('/') - .expect(500, /TypeError: path must be absolute/, done) - }) - - it('should transfer a file', function (done) { - var app = createApp(path.resolve(fixtures, 'name.txt')); - - request(app) - .get('/') - .expect(200, 'tobi', done); - }); - - it('should transfer a file with special characters in string', function (done) { - var app = createApp(path.resolve(fixtures, '% of dogs.txt')); - - request(app) - .get('/') - .expect(200, '20%', done); - }); - - it('should include ETag', function (done) { - var app = createApp(path.resolve(fixtures, 'name.txt')); - - request(app) - .get('/') - .expect('ETag', /^(?:W\/)?"[^"]+"$/) - .expect(200, 'tobi', done); - }); - - it('should 304 when ETag matches', function (done) { - var app = createApp(path.resolve(fixtures, 'name.txt')); - - request(app) - .get('/') - .expect('ETag', /^(?:W\/)?"[^"]+"$/) - .expect(200, 'tobi', function (err, res) { - if (err) return done(err); - var etag = res.headers.etag; - request(app) - .get('/') - .set('If-None-Match', etag) - .expect(304, done); - }); - }); - - it('should 404 for directory', function (done) { - var app = createApp(path.resolve(fixtures, 'blog')); - - request(app) - .get('/') - .expect(404, done); - }); - - it('should 404 when not found', function (done) { - var app = createApp(path.resolve(fixtures, 'does-no-exist')); - - app.use(function (req, res) { - res.statusCode = 200; - res.send('no!'); - }); - - request(app) - .get('/') - .expect(404, done); - }); - - it('should send cache-control by default', function (done) { - var app = createApp(path.resolve(__dirname, 'fixtures/name.txt')) - - request(app) - .get('/') - .expect('Cache-Control', 'public, max-age=0') - .expect(200, done) - }) - - it('should not serve dotfiles by default', function (done) { - var app = createApp(path.resolve(__dirname, 'fixtures/.name')) - - request(app) - .get('/') - .expect(404, done) - }) - - it('should not override manual content-types', function (done) { - var app = express(); - - app.use(function (req, res) { - res.contentType('application/x-bogus'); - res.sendFile(path.resolve(fixtures, 'name.txt')); - }); - - request(app) - .get('/') - .expect('Content-Type', 'application/x-bogus') - .end(done); - }) - - it('should not error if the client aborts', function (done) { - var app = express(); - var cb = after(2, done) - var error = null - - app.use(function (req, res) { - setImmediate(function () { - res.sendFile(path.resolve(fixtures, 'name.txt')); - setTimeout(function () { - cb(error) - }, 10) - }) - test.req.abort() - }); - - app.use(function (err, req, res, next) { - error = err - next(err) - }); - - var server = app.listen() - var test = request(server).get('/') - test.end(function (err) { - assert.ok(err) - server.close(cb) - }) - }) - }) - - describe('.sendFile(path, fn)', function () { - it('should invoke the callback when complete', function (done) { - var cb = after(2, done); - var app = createApp(path.resolve(fixtures, 'name.txt'), cb); - - request(app) - .get('/') - .expect(200, cb); - }) - - it('should invoke the callback when client aborts', function (done) { - var cb = after(2, done) - var app = express(); - - app.use(function (req, res) { - setImmediate(function () { - res.sendFile(path.resolve(fixtures, 'name.txt'), function (err) { - assert.ok(err) - assert.strictEqual(err.code, 'ECONNABORTED') - cb() - }); - }); - test.req.abort() - }); - - var server = app.listen() - var test = request(server).get('/') - test.end(function (err) { - assert.ok(err) - server.close(cb) - }) - }) - - it('should invoke the callback when client already aborted', function (done) { - var cb = after(2, done) - var app = express(); - - app.use(function (req, res) { - onFinished(res, function () { - res.sendFile(path.resolve(fixtures, 'name.txt'), function (err) { - assert.ok(err) - assert.strictEqual(err.code, 'ECONNABORTED') - cb() - }); - }); - test.req.abort() - }); - - var server = app.listen() - var test = request(server).get('/') - test.end(function (err) { - assert.ok(err) - server.close(cb) - }) - }) - - it('should invoke the callback without error when HEAD', function (done) { - var app = express(); - var cb = after(2, done); - - app.use(function (req, res) { - res.sendFile(path.resolve(fixtures, 'name.txt'), cb); - }); - - request(app) - .head('/') - .expect(200, cb); - }); - - it('should invoke the callback without error when 304', function (done) { - var app = express(); - var cb = after(3, done); - - app.use(function (req, res) { - res.sendFile(path.resolve(fixtures, 'name.txt'), cb); - }); - - request(app) - .get('/') - .expect('ETag', /^(?:W\/)?"[^"]+"$/) - .expect(200, 'tobi', function (err, res) { - if (err) return cb(err); - var etag = res.headers.etag; - request(app) - .get('/') - .set('If-None-Match', etag) - .expect(304, cb); - }); - }); - - it('should invoke the callback on 404', function(done){ - var app = express(); - - app.use(function (req, res) { - res.sendFile(path.resolve(fixtures, 'does-not-exist'), function (err) { - res.send(err ? 'got ' + err.status + ' error' : 'no error') - }); - }); - - request(app) - .get('/') - .expect(200, 'got 404 error', done) - }) - - describeAsyncHooks('async local storage', function () { - it('should presist store', function (done) { - var app = express() - var cb = after(2, done) - var store = { foo: 'bar' } - - app.use(function (req, res, next) { - req.asyncLocalStorage = new asyncHooks.AsyncLocalStorage() - req.asyncLocalStorage.run(store, next) - }) - - app.use(function (req, res) { - res.sendFile(path.resolve(fixtures, 'name.txt'), function (err) { - if (err) return cb(err) - - var local = req.asyncLocalStorage.getStore() - - assert.strictEqual(local.foo, 'bar') - cb() - }) - }) - - request(app) - .get('/') - .expect('Content-Type', 'text/plain; charset=UTF-8') - .expect(200, 'tobi', cb) - }) - - it('should presist store on error', function (done) { - var app = express() - var store = { foo: 'bar' } - - app.use(function (req, res, next) { - req.asyncLocalStorage = new asyncHooks.AsyncLocalStorage() - req.asyncLocalStorage.run(store, next) - }) - - app.use(function (req, res) { - res.sendFile(path.resolve(fixtures, 'does-not-exist'), function (err) { - var local = req.asyncLocalStorage.getStore() - - if (local) { - res.setHeader('x-store-foo', String(local.foo)) - } - - res.send(err ? 'got ' + err.status + ' error' : 'no error') - }) - }) - - request(app) - .get('/') - .expect(200) - .expect('x-store-foo', 'bar') - .expect('got 404 error') - .end(done) - }) - }) - }) - - describe('.sendFile(path, options)', function () { - it('should pass options to send module', function (done) { - request(createApp(path.resolve(fixtures, 'name.txt'), { start: 0, end: 1 })) - .get('/') - .expect(200, 'to', done) - }) - - describe('with "acceptRanges" option', function () { - describe('when true', function () { - it('should advertise byte range accepted', function (done) { - var app = express() - - app.use(function (req, res) { - res.sendFile(path.resolve(fixtures, 'nums.txt'), { - acceptRanges: true - }) - }) - - request(app) - .get('/') - .expect(200) - .expect('Accept-Ranges', 'bytes') - .expect('123456789') - .end(done) - }) - - it('should respond to range request', function (done) { - var app = express() - - app.use(function (req, res) { - res.sendFile(path.resolve(fixtures, 'nums.txt'), { - acceptRanges: true - }) - }) - - request(app) - .get('/') - .set('Range', 'bytes=0-4') - .expect(206, '12345', done) - }) - }) - - describe('when false', function () { - it('should not advertise accept-ranges', function (done) { - var app = express() - - app.use(function (req, res) { - res.sendFile(path.resolve(fixtures, 'nums.txt'), { - acceptRanges: false - }) - }) - - request(app) - .get('/') - .expect(200) - .expect(utils.shouldNotHaveHeader('Accept-Ranges')) - .end(done) - }) - - it('should not honor range requests', function (done) { - var app = express() - - app.use(function (req, res) { - res.sendFile(path.resolve(fixtures, 'nums.txt'), { - acceptRanges: false - }) - }) - - request(app) - .get('/') - .set('Range', 'bytes=0-4') - .expect(200, '123456789', done) - }) - }) - }) - - describe('with "cacheControl" option', function () { - describe('when true', function () { - it('should send cache-control header', function (done) { - var app = express() - - app.use(function (req, res) { - res.sendFile(path.resolve(fixtures, 'user.html'), { - cacheControl: true - }) - }) - - request(app) - .get('/') - .expect(200) - .expect('Cache-Control', 'public, max-age=0') - .end(done) - }) - }) - - describe('when false', function () { - it('should not send cache-control header', function (done) { - var app = express() - - app.use(function (req, res) { - res.sendFile(path.resolve(fixtures, 'user.html'), { - cacheControl: false - }) - }) - - request(app) - .get('/') - .expect(200) - .expect(utils.shouldNotHaveHeader('Cache-Control')) - .end(done) - }) - }) - }) - - describe('with "dotfiles" option', function () { - describe('when "allow"', function () { - it('should allow dotfiles', function (done) { - var app = express() - - app.use(function (req, res) { - res.sendFile(path.resolve(fixtures, '.name'), { - dotfiles: 'allow' - }) - }) - - request(app) - .get('/') - .expect(200) - .expect(utils.shouldHaveBody(Buffer.from('tobi'))) - .end(done) - }) - }) - - describe('when "deny"', function () { - it('should deny dotfiles', function (done) { - var app = express() - - app.use(function (req, res) { - res.sendFile(path.resolve(fixtures, '.name'), { - dotfiles: 'deny' - }) - }) - - request(app) - .get('/') - .expect(403) - .expect(/Forbidden/) - .end(done) - }) - }) - - describe('when "ignore"', function () { - it('should ignore dotfiles', function (done) { - var app = express() - - app.use(function (req, res) { - res.sendFile(path.resolve(fixtures, '.name'), { - dotfiles: 'ignore' - }) - }) - - request(app) - .get('/') - .expect(404) - .expect(/Not Found/) - .end(done) - }) - }) - }) - - describe('with "headers" option', function () { - it('should set headers on response', function (done) { - var app = express() - - app.use(function (req, res) { - res.sendFile(path.resolve(fixtures, 'user.html'), { - headers: { - 'X-Foo': 'Bar', - 'X-Bar': 'Foo' - } - }) - }) - - request(app) - .get('/') - .expect(200) - .expect('X-Foo', 'Bar') - .expect('X-Bar', 'Foo') - .end(done) - }) - - it('should use last header when duplicated', function (done) { - var app = express() - - app.use(function (req, res) { - res.sendFile(path.resolve(fixtures, 'user.html'), { - headers: { - 'X-Foo': 'Bar', - 'x-foo': 'bar' - } - }) - }) - - request(app) - .get('/') - .expect(200) - .expect('X-Foo', 'bar') - .end(done) - }) - - it('should override Content-Type', function (done) { - var app = express() - - app.use(function (req, res) { - res.sendFile(path.resolve(fixtures, 'user.html'), { - headers: { - 'Content-Type': 'text/x-custom' - } - }) - }) - - request(app) - .get('/') - .expect(200) - .expect('Content-Type', 'text/x-custom') - .end(done) - }) - - it('should not set headers on 404', function (done) { - var app = express() - - app.use(function (req, res) { - res.sendFile(path.resolve(fixtures, 'does-not-exist'), { - headers: { - 'X-Foo': 'Bar' - } - }) - }) - - request(app) - .get('/') - .expect(404) - .expect(utils.shouldNotHaveHeader('X-Foo')) - .end(done) - }) - }) - - describe('with "immutable" option', function () { - describe('when true', function () { - it('should send cache-control header with immutable', function (done) { - var app = express() - - app.use(function (req, res) { - res.sendFile(path.resolve(fixtures, 'user.html'), { - immutable: true - }) - }) - - request(app) - .get('/') - .expect(200) - .expect('Cache-Control', 'public, max-age=0, immutable') - .end(done) - }) - }) - - describe('when false', function () { - it('should not send cache-control header with immutable', function (done) { - var app = express() - - app.use(function (req, res) { - res.sendFile(path.resolve(fixtures, 'user.html'), { - immutable: false - }) - }) - - request(app) - .get('/') - .expect(200) - .expect('Cache-Control', 'public, max-age=0') - .end(done) - }) - }) - }) - - describe('with "lastModified" option', function () { - describe('when true', function () { - it('should send last-modified header', function (done) { - var app = express() - - app.use(function (req, res) { - res.sendFile(path.resolve(fixtures, 'user.html'), { - lastModified: true - }) - }) - - request(app) - .get('/') - .expect(200) - .expect(utils.shouldHaveHeader('Last-Modified')) - .end(done) - }) - - it('should conditionally respond with if-modified-since', function (done) { - var app = express() - - app.use(function (req, res) { - res.sendFile(path.resolve(fixtures, 'user.html'), { - lastModified: true - }) - }) - - request(app) - .get('/') - .set('If-Modified-Since', (new Date(Date.now() + 99999).toUTCString())) - .expect(304, done) - }) - }) - - describe('when false', function () { - it('should not have last-modified header', function (done) { - var app = express() - - app.use(function (req, res) { - res.sendFile(path.resolve(fixtures, 'user.html'), { - lastModified: false - }) - }) - - request(app) - .get('/') - .expect(200) - .expect(utils.shouldNotHaveHeader('Last-Modified')) - .end(done) - }) - - it('should not honor if-modified-since', function (done) { - var app = express() - - app.use(function (req, res) { - res.sendFile(path.resolve(fixtures, 'user.html'), { - lastModified: false - }) - }) - - request(app) - .get('/') - .set('If-Modified-Since', (new Date(Date.now() + 99999).toUTCString())) - .expect(200) - .expect(utils.shouldNotHaveHeader('Last-Modified')) - .end(done) - }) - }) - }) - - describe('with "maxAge" option', function () { - it('should set cache-control max-age to milliseconds', function (done) { - var app = express() - - app.use(function (req, res) { - res.sendFile(path.resolve(fixtures, 'user.html'), { - maxAge: 20000 - }) - }) - - request(app) - .get('/') - .expect(200) - .expect('Cache-Control', 'public, max-age=20') - .end(done) - }) - - it('should cap cache-control max-age to 1 year', function (done) { - var app = express() - - app.use(function (req, res) { - res.sendFile(path.resolve(fixtures, 'user.html'), { - maxAge: 99999999999 - }) - }) - - request(app) - .get('/') - .expect(200) - .expect('Cache-Control', 'public, max-age=31536000') - .end(done) - }) - - it('should min cache-control max-age to 0', function (done) { - var app = express() - - app.use(function (req, res) { - res.sendFile(path.resolve(fixtures, 'user.html'), { - maxAge: -20000 - }) - }) - - request(app) - .get('/') - .expect(200) - .expect('Cache-Control', 'public, max-age=0') - .end(done) - }) - - it('should floor cache-control max-age', function (done) { - var app = express() - - app.use(function (req, res) { - res.sendFile(path.resolve(fixtures, 'user.html'), { - maxAge: 21911.23 - }) - }) - - request(app) - .get('/') - .expect(200) - .expect('Cache-Control', 'public, max-age=21') - .end(done) - }) - - describe('when cacheControl: false', function () { - it('should not send cache-control', function (done) { - var app = express() - - app.use(function (req, res) { - res.sendFile(path.resolve(fixtures, 'user.html'), { - cacheControl: false, - maxAge: 20000 - }) - }) - - request(app) - .get('/') - .expect(200) - .expect(utils.shouldNotHaveHeader('Cache-Control')) - .end(done) - }) - }) - - describe('when string', function () { - it('should accept plain number as milliseconds', function (done) { - var app = express() - - app.use(function (req, res) { - res.sendFile(path.resolve(fixtures, 'user.html'), { - maxAge: '20000' - }) - }) - - request(app) - .get('/') - .expect(200) - .expect('Cache-Control', 'public, max-age=20') - .end(done) - }) - - it('should accept suffix "s" for seconds', function (done) { - var app = express() - - app.use(function (req, res) { - res.sendFile(path.resolve(fixtures, 'user.html'), { - maxAge: '20s' - }) - }) - - request(app) - .get('/') - .expect(200) - .expect('Cache-Control', 'public, max-age=20') - .end(done) - }) - - it('should accept suffix "m" for minutes', function (done) { - var app = express() - - app.use(function (req, res) { - res.sendFile(path.resolve(fixtures, 'user.html'), { - maxAge: '20m' - }) - }) - - request(app) - .get('/') - .expect(200) - .expect('Cache-Control', 'public, max-age=1200') - .end(done) - }) - - it('should accept suffix "d" for days', function (done) { - var app = express() - - app.use(function (req, res) { - res.sendFile(path.resolve(fixtures, 'user.html'), { - maxAge: '20d' - }) - }) - - request(app) - .get('/') - .expect(200) - .expect('Cache-Control', 'public, max-age=1728000') - .end(done) - }) - }) - }) - - describe('with "root" option', function () { - it('should allow relative path', function (done) { - var app = express() - - app.use(function (req, res) { - res.sendFile('name.txt', { - root: fixtures - }) - }) - - request(app) - .get('/') - .expect(200, 'tobi', done) - }) - - it('should allow up within root', function (done) { - var app = express() - - app.use(function (req, res) { - res.sendFile('fake/../name.txt', { - root: fixtures - }) - }) - - request(app) - .get('/') - .expect(200, 'tobi', done) - }) - - it('should reject up outside root', function (done) { - var app = express() - - app.use(function (req, res) { - res.sendFile('..' + path.sep + path.relative(path.dirname(fixtures), path.join(fixtures, 'name.txt')), { - root: fixtures - }) - }) - - request(app) - .get('/') - .expect(403, done) - }) - - it('should reject reading outside root', function (done) { - var app = express() - - app.use(function (req, res) { - res.sendFile('../name.txt', { - root: fixtures - }) - }) - - request(app) - .get('/') - .expect(403, done) - }) - }) - }) - - describe('.sendfile(path, fn)', function(){ - it('should invoke the callback when complete', function(done){ - var app = express(); - var cb = after(2, done); - - app.use(function(req, res){ - res.sendfile('test/fixtures/user.html', cb) - }); - - request(app) - .get('/') - .expect(200, cb); - }) - - it('should utilize the same options as express.static()', function(done){ - var app = express(); - - app.use(function(req, res){ - res.sendfile('test/fixtures/user.html', { maxAge: 60000 }); - }); - - request(app) - .get('/') - .expect('Cache-Control', 'public, max-age=60') - .end(done); - }) - - it('should invoke the callback when client aborts', function (done) { - var cb = after(2, done) - var app = express(); - - app.use(function (req, res) { - setImmediate(function () { - res.sendfile('test/fixtures/name.txt', function (err) { - assert.ok(err) - assert.strictEqual(err.code, 'ECONNABORTED') - cb() - }); - }); - test.req.abort() - }); - - var server = app.listen() - var test = request(server).get('/') - test.end(function (err) { - assert.ok(err) - server.close(cb) - }) - }) - - it('should invoke the callback when client already aborted', function (done) { - var cb = after(2, done) - var app = express(); - - app.use(function (req, res) { - onFinished(res, function () { - res.sendfile('test/fixtures/name.txt', function (err) { - assert.ok(err) - assert.strictEqual(err.code, 'ECONNABORTED') - cb() - }); - }); - test.req.abort() - }); - - var server = app.listen() - var test = request(server).get('/') - test.end(function (err) { - assert.ok(err) - server.close(cb) - }) - }) - - it('should invoke the callback without error when HEAD', function (done) { - var app = express(); - var cb = after(2, done); - - app.use(function (req, res) { - res.sendfile('test/fixtures/name.txt', cb); - }); - - request(app) - .head('/') - .expect(200, cb); - }); - - it('should invoke the callback without error when 304', function (done) { - var app = express(); - var cb = after(3, done); - - app.use(function (req, res) { - res.sendfile('test/fixtures/name.txt', cb); - }); - - request(app) - .get('/') - .expect('ETag', /^(?:W\/)?"[^"]+"$/) - .expect(200, 'tobi', function (err, res) { - if (err) return cb(err); - var etag = res.headers.etag; - request(app) - .get('/') - .set('If-None-Match', etag) - .expect(304, cb); - }); - }); - - it('should invoke the callback on 404', function(done){ - var app = express(); - var calls = 0; - - app.use(function(req, res){ - res.sendfile('test/fixtures/nope.html', function(err){ - assert.equal(calls++, 0); - assert(!res.headersSent); - res.send(err.message); - }); - }); - - request(app) - .get('/') - .expect(200, /^ENOENT.*?, stat/, done); - }) - - it('should not override manual content-types', function(done){ - var app = express(); - - app.use(function(req, res){ - res.contentType('txt'); - res.sendfile('test/fixtures/user.html'); - }); - - request(app) - .get('/') - .expect('Content-Type', 'text/plain; charset=utf-8') - .end(done); - }) - - it('should invoke the callback on 403', function(done){ - var app = express() - - app.use(function(req, res){ - res.sendfile('test/fixtures/foo/../user.html', function(err){ - assert(!res.headersSent); - res.send(err.message); - }); - }); - - request(app) - .get('/') - .expect('Forbidden') - .expect(200, done); - }) - - it('should invoke the callback on socket error', function(done){ - var app = express() - - app.use(function(req, res){ - res.sendfile('test/fixtures/user.html', function(err){ - assert.ok(err) - assert.ok(!res.headersSent) - assert.strictEqual(err.message, 'broken!') - done(); - }); - - req.socket.destroy(new Error('broken!')) - }); - - request(app) - .get('/') - .end(function(){}); - }) - - describeAsyncHooks('async local storage', function () { - it('should presist store', function (done) { - var app = express() - var cb = after(2, done) - var store = { foo: 'bar' } - - app.use(function (req, res, next) { - req.asyncLocalStorage = new asyncHooks.AsyncLocalStorage() - req.asyncLocalStorage.run(store, next) - }) - - app.use(function (req, res) { - res.sendfile('test/fixtures/name.txt', function (err) { - if (err) return cb(err) - - var local = req.asyncLocalStorage.getStore() - - assert.strictEqual(local.foo, 'bar') - cb() - }) - }) - - request(app) - .get('/') - .expect('Content-Type', 'text/plain; charset=UTF-8') - .expect(200, 'tobi', cb) - }) - - it('should presist store on error', function (done) { - var app = express() - var store = { foo: 'bar' } - - app.use(function (req, res, next) { - req.asyncLocalStorage = new asyncHooks.AsyncLocalStorage() - req.asyncLocalStorage.run(store, next) - }) - - app.use(function (req, res) { - res.sendfile('test/fixtures/does-not-exist', function (err) { - var local = req.asyncLocalStorage.getStore() - - if (local) { - res.setHeader('x-store-foo', String(local.foo)) - } - - res.send(err ? 'got ' + err.status + ' error' : 'no error') - }) - }) - - request(app) - .get('/') - .expect(200) - .expect('x-store-foo', 'bar') - .expect('got 404 error') - .end(done) - }) - }) - }) - - describe('.sendfile(path)', function(){ - it('should not serve dotfiles', function(done){ - var app = express(); - - app.use(function(req, res){ - res.sendfile('test/fixtures/.name'); - }); - - request(app) - .get('/') - .expect(404, done); - }) - - it('should accept dotfiles option', function(done){ - var app = express(); - - app.use(function(req, res){ - res.sendfile('test/fixtures/.name', { dotfiles: 'allow' }); - }); - - request(app) - .get('/') - .expect(200) - .expect(utils.shouldHaveBody(Buffer.from('tobi'))) - .end(done) - }) - - it('should accept headers option', function(done){ - var app = express(); - var headers = { - 'x-success': 'sent', - 'x-other': 'done' - }; - - app.use(function(req, res){ - res.sendfile('test/fixtures/user.html', { headers: headers }); - }); - - request(app) - .get('/') - .expect('x-success', 'sent') - .expect('x-other', 'done') - .expect(200, done); - }) - - it('should ignore headers option on 404', function(done){ - var app = express(); - var headers = { 'x-success': 'sent' }; - - app.use(function(req, res){ - res.sendfile('test/fixtures/user.nothing', { headers: headers }); - }); - - request(app) - .get('/') - .expect(utils.shouldNotHaveHeader('X-Success')) - .expect(404, done); - }) - - it('should transfer a file', function (done) { - var app = express(); - - app.use(function (req, res) { - res.sendfile('test/fixtures/name.txt'); - }); - - request(app) - .get('/') - .expect(200, 'tobi', done); - }); - - it('should transfer a directory index file', function (done) { - var app = express(); - - app.use(function (req, res) { - res.sendfile('test/fixtures/blog/'); - }); - - request(app) - .get('/') - .expect(200, 'index', done); - }); - - it('should 404 for directory without trailing slash', function (done) { - var app = express(); - - app.use(function (req, res) { - res.sendfile('test/fixtures/blog'); - }); - - request(app) - .get('/') - .expect(404, done); - }); - - it('should transfer a file with urlencoded name', function (done) { - var app = express(); - - app.use(function (req, res) { - res.sendfile('test/fixtures/%25%20of%20dogs.txt'); - }); - - request(app) - .get('/') - .expect(200, '20%', done); - }); - - it('should not error if the client aborts', function (done) { - var app = express(); - var cb = after(2, done) - var error = null - - app.use(function (req, res) { - setImmediate(function () { - res.sendfile(path.resolve(fixtures, 'name.txt')); - setTimeout(function () { - cb(error) - }, 10) - }); - test.req.abort() - }); - - app.use(function (err, req, res, next) { - error = err - next(err) - }); - - var server = app.listen() - var test = request(server).get('/') - test.end(function (err) { - assert.ok(err) - server.close(cb) - }) - }) - - describe('with an absolute path', function(){ - it('should transfer the file', function(done){ - var app = express(); - - app.use(function(req, res){ - res.sendfile(path.join(__dirname, '/fixtures/user.html')) - }); - - request(app) - .get('/') - .expect('Content-Type', 'text/html; charset=UTF-8') - .expect(200, '{{user.name}}
', done); - }) - }) - - describe('with a relative path', function(){ - it('should transfer the file', function(done){ - var app = express(); - - app.use(function(req, res){ - res.sendfile('test/fixtures/user.html'); - }); - - request(app) - .get('/') - .expect('Content-Type', 'text/html; charset=UTF-8') - .expect(200, '{{user.name}}
', done); - }) - - it('should serve relative to "root"', function(done){ - var app = express(); - - app.use(function(req, res){ - res.sendfile('user.html', { root: 'test/fixtures/' }); - }); - - request(app) - .get('/') - .expect('Content-Type', 'text/html; charset=UTF-8') - .expect(200, '{{user.name}}
', done); - }) - - it('should consider ../ malicious when "root" is not set', function(done){ - var app = express(); - - app.use(function(req, res){ - res.sendfile('test/fixtures/foo/../user.html'); - }); - - request(app) - .get('/') - .expect(403, done); - }) - - it('should allow ../ when "root" is set', function(done){ - var app = express(); - - app.use(function(req, res){ - res.sendfile('foo/../user.html', { root: 'test/fixtures' }); - }); - - request(app) - .get('/') - .expect(200, done); - }) - - it('should disallow requesting out of "root"', function(done){ - var app = express(); - - app.use(function(req, res){ - res.sendfile('foo/../../user.html', { root: 'test/fixtures' }); - }); - - request(app) - .get('/') - .expect(403, done); - }) - - it('should next(404) when not found', function(done){ - var app = express() - , calls = 0; - - app.use(function(req, res){ - res.sendfile('user.html'); - }); - - app.use(function(req, res){ - assert(0, 'this should not be called'); - }); - - app.use(function(err, req, res, next){ - ++calls; - next(err); - }); - - request(app) - .get('/') - .expect(404, function (err) { - if (err) return done(err) - assert.strictEqual(calls, 1) - done() - }) - }) - - describe('with non-GET', function(){ - it('should still serve', function(done){ - var app = express() - - app.use(function(req, res){ - res.sendfile(path.join(__dirname, '/fixtures/name.txt')) - }); - - request(app) - .get('/') - .expect('tobi', done); - }) - }) - }) - }) - - describe('.sendfile(path, options)', function () { - it('should pass options to send module', function (done) { - var app = express() - - app.use(function (req, res) { - res.sendfile(path.resolve(fixtures, 'name.txt'), { start: 0, end: 1 }) - }) - - request(app) - .get('/') - .expect(200, 'to', done) - }) - }) -}) - -function createApp(path, options, fn) { - var app = express(); - - app.use(function (req, res) { - res.sendFile(path, options, fn); - }); - - return app; -} - -function tryRequire (name) { - try { - return require(name) - } catch (e) { - return {} - } -} diff --git a/test/res.sendStatus.js b/test/res.sendStatus.js deleted file mode 100644 index 9b1de838..00000000 --- a/test/res.sendStatus.js +++ /dev/null @@ -1,32 +0,0 @@ -'use strict' - -var express = require('..') -var request = require('supertest') - -describe('res', function () { - describe('.sendStatus(statusCode)', function () { - it('should send the status code and message as body', function (done) { - var app = express(); - - app.use(function(req, res){ - res.sendStatus(201); - }); - - request(app) - .get('/') - .expect(201, 'Created', done); - }) - - it('should work with unknown code', function (done) { - var app = express(); - - app.use(function(req, res){ - res.sendStatus(599); - }); - - request(app) - .get('/') - .expect(599, '599', done); - }) - }) -}) diff --git a/test/res.set.js b/test/res.set.js deleted file mode 100644 index 04511c1c..00000000 --- a/test/res.set.js +++ /dev/null @@ -1,124 +0,0 @@ -'use strict' - -var express = require('..'); -var request = require('supertest'); - -describe('res', function(){ - describe('.set(field, value)', function(){ - it('should set the response header field', function(done){ - var app = express(); - - app.use(function(req, res){ - res.set('Content-Type', 'text/x-foo; charset=utf-8').end(); - }); - - request(app) - .get('/') - .expect('Content-Type', 'text/x-foo; charset=utf-8') - .end(done); - }) - - it('should coerce to a string', function (done) { - var app = express(); - - app.use(function (req, res) { - res.set('X-Number', 123); - res.end(typeof res.get('X-Number')); - }); - - request(app) - .get('/') - .expect('X-Number', '123') - .expect(200, 'string', done); - }) - }) - - describe('.set(field, values)', function(){ - it('should set multiple response header fields', function(done){ - var app = express(); - - app.use(function(req, res){ - res.set('Set-Cookie', ["type=ninja", "language=javascript"]); - res.send(res.get('Set-Cookie')); - }); - - request(app) - .get('/') - .expect('["type=ninja","language=javascript"]', done); - }) - - it('should coerce to an array of strings', function (done) { - var app = express(); - - app.use(function (req, res) { - res.set('X-Numbers', [123, 456]); - res.end(JSON.stringify(res.get('X-Numbers'))); - }); - - request(app) - .get('/') - .expect('X-Numbers', '123, 456') - .expect(200, '["123","456"]', done); - }) - - it('should not set a charset of one is already set', function (done) { - var app = express(); - - app.use(function (req, res) { - res.set('Content-Type', 'text/html; charset=lol'); - res.end(); - }); - - request(app) - .get('/') - .expect('Content-Type', 'text/html; charset=lol') - .expect(200, done); - }) - - it('should throw when Content-Type is an array', function (done) { - var app = express() - - app.use(function (req, res) { - res.set('Content-Type', ['text/html']) - res.end() - }); - - request(app) - .get('/') - .expect(500, /TypeError: Content-Type cannot be set to an Array/, done) - }) - }) - - describe('.set(object)', function(){ - it('should set multiple fields', function(done){ - var app = express(); - - app.use(function(req, res){ - res.set({ - 'X-Foo': 'bar', - 'X-Bar': 'baz' - }).end(); - }); - - request(app) - .get('/') - .expect('X-Foo', 'bar') - .expect('X-Bar', 'baz') - .end(done); - }) - - it('should coerce to a string', function (done) { - var app = express(); - - app.use(function (req, res) { - res.set({ 'X-Number': 123 }); - res.end(typeof res.get('X-Number')); - }); - - request(app) - .get('/') - .expect('X-Number', '123') - .expect(200, 'string', done); - }) - }) -}) diff --git a/test/res.status.js b/test/res.status.js deleted file mode 100644 index 1fe08344..00000000 --- a/test/res.status.js +++ /dev/null @@ -1,202 +0,0 @@ -'use strict' - -var express = require('../') -var request = require('supertest') - -var isIoJs = process.release - ? process.release.name === 'io.js' - : ['v1.', 'v2.', 'v3.'].indexOf(process.version.slice(0, 3)) !== -1 - -describe('res', function () { - describe('.status(code)', function () { - describe('when "code" is undefined', function () { - it('should raise error for invalid status code', function (done) { - var app = express() - - app.use(function (req, res) { - res.status(undefined).end() - }) - - request(app) - .get('/') - .expect(500, /Invalid status code/, function (err) { - if (isIoJs) { - done(err ? null : new Error('expected error')) - } else { - done(err) - } - }) - }) - }) - - describe('when "code" is null', function () { - it('should raise error for invalid status code', function (done) { - var app = express() - - app.use(function (req, res) { - res.status(null).end() - }) - - request(app) - .get('/') - .expect(500, /Invalid status code/, function (err) { - if (isIoJs) { - done(err ? null : new Error('expected error')) - } else { - done(err) - } - }) - }) - }) - - describe('when "code" is 201', function () { - it('should set the response status code to 201', function (done) { - var app = express() - - app.use(function (req, res) { - res.status(201).end() - }) - - request(app) - .get('/') - .expect(201, done) - }) - }) - - describe('when "code" is 302', function () { - it('should set the response status code to 302', function (done) { - var app = express() - - app.use(function (req, res) { - res.status(302).end() - }) - - request(app) - .get('/') - .expect(302, done) - }) - }) - - describe('when "code" is 403', function () { - it('should set the response status code to 403', function (done) { - var app = express() - - app.use(function (req, res) { - res.status(403).end() - }) - - request(app) - .get('/') - .expect(403, done) - }) - }) - - describe('when "code" is 501', function () { - it('should set the response status code to 501', function (done) { - var app = express() - - app.use(function (req, res) { - res.status(501).end() - }) - - request(app) - .get('/') - .expect(501, done) - }) - }) - - describe('when "code" is "410"', function () { - it('should set the response status code to 410', function (done) { - var app = express() - - app.use(function (req, res) { - res.status('410').end() - }) - - request(app) - .get('/') - .expect(410, done) - }) - }) - - describe('when "code" is 410.1', function () { - it('should set the response status code to 410', function (done) { - var app = express() - - app.use(function (req, res) { - res.status(410.1).end() - }) - - request(app) - .get('/') - .expect(410, function (err) { - if (isIoJs) { - done(err ? null : new Error('expected error')) - } else { - done(err) - } - }) - }) - }) - - describe('when "code" is 1000', function () { - it('should raise error for invalid status code', function (done) { - var app = express() - - app.use(function (req, res) { - res.status(1000).end() - }) - - request(app) - .get('/') - .expect(500, /Invalid status code/, function (err) { - if (isIoJs) { - done(err ? null : new Error('expected error')) - } else { - done(err) - } - }) - }) - }) - - describe('when "code" is 99', function () { - it('should raise error for invalid status code', function (done) { - var app = express() - - app.use(function (req, res) { - res.status(99).end() - }) - - request(app) - .get('/') - .expect(500, /Invalid status code/, function (err) { - if (isIoJs) { - done(err ? null : new Error('expected error')) - } else { - done(err) - } - }) - }) - }) - - describe('when "code" is -401', function () { - it('should raise error for invalid status code', function (done) { - var app = express() - - app.use(function (req, res) { - res.status(-401).end() - }) - - request(app) - .get('/') - .expect(500, /Invalid status code/, function (err) { - if (isIoJs) { - done(err ? null : new Error('expected error')) - } else { - done(err) - } - }) - }) - }) - }) -}) diff --git a/test/res.type.js b/test/res.type.js deleted file mode 100644 index 980717a6..00000000 --- a/test/res.type.js +++ /dev/null @@ -1,46 +0,0 @@ -'use strict' - -var express = require('../') - , request = require('supertest'); - -describe('res', function(){ - describe('.type(str)', function(){ - it('should set the Content-Type based on a filename', function(done){ - var app = express(); - - app.use(function(req, res){ - res.type('foo.js').end('var name = "tj";'); - }); - - request(app) - .get('/') - .expect('Content-Type', 'application/javascript; charset=utf-8') - .end(done) - }) - - it('should default to application/octet-stream', function(done){ - var app = express(); - - app.use(function(req, res){ - res.type('rawr').end('var name = "tj";'); - }); - - request(app) - .get('/') - .expect('Content-Type', 'application/octet-stream', done); - }) - - it('should set the Content-Type with type/subtype', function(done){ - var app = express(); - - app.use(function(req, res){ - res.type('application/vnd.amazon.ebook') - .end('var name = "tj";'); - }); - - request(app) - .get('/') - .expect('Content-Type', 'application/vnd.amazon.ebook', done); - }) - }) -}) diff --git a/test/res.vary.js b/test/res.vary.js deleted file mode 100644 index 1efc20b4..00000000 --- a/test/res.vary.js +++ /dev/null @@ -1,91 +0,0 @@ -'use strict' - -var express = require('..'); -var request = require('supertest'); -var utils = require('./support/utils'); - -describe('res.vary()', function(){ - describe('with no arguments', function(){ - it('should not set Vary', function (done) { - var app = express(); - - app.use(function (req, res) { - res.vary(); - res.end(); - }); - - request(app) - .get('/') - .expect(utils.shouldNotHaveHeader('Vary')) - .expect(200, done); - }) - }) - - describe('with an empty array', function(){ - it('should not set Vary', function (done) { - var app = express(); - - app.use(function (req, res) { - res.vary([]); - res.end(); - }); - - request(app) - .get('/') - .expect(utils.shouldNotHaveHeader('Vary')) - .expect(200, done); - }) - }) - - describe('with an array', function(){ - it('should set the values', function (done) { - var app = express(); - - app.use(function (req, res) { - res.vary(['Accept', 'Accept-Language', 'Accept-Encoding']); - res.end(); - }); - - request(app) - .get('/') - .expect('Vary', 'Accept, Accept-Language, Accept-Encoding') - .expect(200, done); - }) - }) - - describe('with a string', function(){ - it('should set the value', function (done) { - var app = express(); - - app.use(function (req, res) { - res.vary('Accept'); - res.end(); - }); - - request(app) - .get('/') - .expect('Vary', 'Accept') - .expect(200, done); - }) - }) - - describe('when the value is present', function(){ - it('should not add it again', function (done) { - var app = express(); - - app.use(function (req, res) { - res.vary('Accept'); - res.vary('Accept-Encoding'); - res.vary('Accept-Encoding'); - res.vary('Accept-Encoding'); - res.vary('Accept'); - res.end(); - }); - - request(app) - .get('/') - .expect('Vary', 'Accept, Accept-Encoding') - .expect(200, done); - }) - }) -}) diff --git a/test/utils.js b/test/utils.js deleted file mode 100644 index 9a38ede6..00000000 --- a/test/utils.js +++ /dev/null @@ -1,103 +0,0 @@ -'use strict' - -var assert = require('assert'); -var Buffer = require('safe-buffer').Buffer -var utils = require('../lib/utils'); - -describe('utils.etag(body, encoding)', function(){ - it('should support strings', function(){ - assert.strictEqual(utils.etag('express!'), - '"8-O2uVAFaQ1rZvlKLT14RnuvjPIdg"') - }) - - it('should support utf8 strings', function(){ - assert.strictEqual(utils.etag('express❤', 'utf8'), - '"a-JBiXf7GyzxwcrxY4hVXUwa7tmks"') - }) - - it('should support buffer', function(){ - assert.strictEqual(utils.etag(Buffer.from('express!')), - '"8-O2uVAFaQ1rZvlKLT14RnuvjPIdg"') - }) - - it('should support empty string', function(){ - assert.strictEqual(utils.etag(''), - '"0-2jmj7l5rSw0yVb/vlWAYkK/YBwk"') - }) -}) - -describe('utils.setCharset(type, charset)', function () { - it('should do anything without type', function () { - assert.strictEqual(utils.setCharset(), undefined); - }); - - it('should return type if not given charset', function () { - assert.strictEqual(utils.setCharset('text/html'), 'text/html'); - }); - - it('should keep charset if not given charset', function () { - assert.strictEqual(utils.setCharset('text/html; charset=utf-8'), 'text/html; charset=utf-8'); - }); - - it('should set charset', function () { - assert.strictEqual(utils.setCharset('text/html', 'utf-8'), 'text/html; charset=utf-8'); - }); - - it('should override charset', function () { - assert.strictEqual(utils.setCharset('text/html; charset=iso-8859-1', 'utf-8'), 'text/html; charset=utf-8'); - }); -}); - -describe('utils.wetag(body, encoding)', function(){ - it('should support strings', function(){ - assert.strictEqual(utils.wetag('express!'), - 'W/"8-O2uVAFaQ1rZvlKLT14RnuvjPIdg"') - }) - - it('should support utf8 strings', function(){ - assert.strictEqual(utils.wetag('express❤', 'utf8'), - 'W/"a-JBiXf7GyzxwcrxY4hVXUwa7tmks"') - }) - - it('should support buffer', function(){ - assert.strictEqual(utils.wetag(Buffer.from('express!')), - 'W/"8-O2uVAFaQ1rZvlKLT14RnuvjPIdg"') - }) - - it('should support empty string', function(){ - assert.strictEqual(utils.wetag(''), - 'W/"0-2jmj7l5rSw0yVb/vlWAYkK/YBwk"') - }) -}) - -describe('utils.isAbsolute()', function(){ - it('should support windows', function(){ - assert(utils.isAbsolute('c:\\')); - assert(utils.isAbsolute('c:/')); - assert(!utils.isAbsolute(':\\')); - }) - - it('should support windows unc', function(){ - assert(utils.isAbsolute('\\\\foo\\bar')) - }) - - it('should support unices', function(){ - assert(utils.isAbsolute('/foo/bar')); - assert(!utils.isAbsolute('foo/bar')); - }) -}) - -describe('utils.flatten(arr)', function(){ - it('should flatten an array', function(){ - var arr = ['one', ['two', ['three', 'four'], 'five']]; - var flat = utils.flatten(arr) - - assert.strictEqual(flat.length, 5) - assert.strictEqual(flat[0], 'one') - assert.strictEqual(flat[1], 'two') - assert.strictEqual(flat[2], 'three') - assert.strictEqual(flat[3], 'four') - assert.strictEqual(flat[4], 'five') - assert.ok(flat.every(function (v) { return typeof v === 'string' })) - }) -})