Added 10 integration tests

package.json

@@ -4,8 +4,9 @@
   "description": "The routing foundation of `serve` and static deployments on Now",
   "main": "src/index.js",
   "scripts": {
-    "test": "yarn run lint",
-    "lint": "zeit-eslint --ext .jsx,.js .",
+    "test": "yarn run test-lint && yarn run test-integration",
+    "test-lint": "zeit-eslint --ext .jsx,.js .",
+    "test-integration": "ava test/integration.js --fail-fast",
     "lint-staged": "git diff --diff-filter=ACMRT --cached --name-only '*.js' '*.jsx' | xargs zeit-eslint",
     "build-views": "dottojs -s ./src -d ./src",
     "prepublish": "yarn run build-views"
@@ -24,9 +25,15 @@
   "devDependencies": {
     "@zeit/eslint-config-node": "0.2.13",
     "@zeit/git-hooks": "0.1.4",
+    "ava": "0.25.0",
     "commander": "2.15.1",
     "dot": "1.1.2",
-    "eslint": "4.19.1"
+    "eslint": "4.19.1",
+    "micro": "9.3.1",
+    "node-fetch": "2.1.2",
+    "request": "2.87.0",
+    "request-promise": "4.2.2",
+    "test-listen": "1.1.0"
   },
   "eslintConfig": {
     "extends": [

src/index.js

@@ -86,7 +86,9 @@ const applyRewrites = (requestPath, rewrites = []) => {
 };
 
 const shouldRedirect = (decodedPath, {redirects = [], trailingSlash}, cleanUrl) => {
-	if (redirects.length === 0) {
+	const slashing = typeof trailingSlash === 'boolean';
+
+	if (redirects.length === 0 && !slashing) {
 		return null;
 	}
 
@@ -104,7 +106,7 @@ const shouldRedirect = (decodedPath, {redirects = [], trailingSlash}, cleanUrl)
 		cleanedUrl = true;
 	}
 
-	if (typeof trailingSlash === 'boolean') {
+	if (slashing) {
 		const {ext, name} = path.parse(decodedPath);
 		const isTrailed = decodedPath.endsWith('/');
 		const isDotfile = name.startsWith('.');
@@ -430,7 +432,11 @@ module.exports = async (request, response, config = {}, methods = {}) => {
 		}
 	}
 
-	const acceptsJSON = request.headers.accept.includes('application/json');
+	let acceptsJSON = null;
+
+	if (request.headers.accept) {
+		acceptsJSON = request.headers.accept.includes('application/json');
+	}
 
 	if (((stats && stats.isDirectory()) || !stats) && acceptsJSON) {
 		response.setHeader('Content-Type', 'application/json');
@@ -453,8 +459,13 @@ module.exports = async (request, response, config = {}, methods = {}) => {
 
 		if (directory) {
 			response.statusCode = 200;
-			response.end(directory);
 
+			// When JSON is accepted, we already set the header before
+			if (!response.getHeader('Content-Type')) {
+				response.setHeader('Content-Type', 'text/html; charset=utf-8');
+			}
+
+			response.end(directory);
 			return;
 		}
 

test/integration.js

@@ -0,0 +1,218 @@
+// Native
+const path = require('path');
+
+// Packages
+const test = require('ava');
+const listen = require('test-listen');
+const micro = require('micro');
+const fetch = require('node-fetch');
+const fs = require('fs-extra');
+
+// Utilities
+const handler = require('../');
+
+const getUrl = config => {
+	const server = micro(async (request, response) => {
+		await handler(request, response, config);
+	});
+
+	return listen(server);
+};
+
+const getDirectoryContents = async (location = process.cwd(), sub) => {
+	const excluded = [
+		'.DS_Store',
+		'.git'
+	];
+
+	const content = await fs.readdir(location);
+
+	if (sub) {
+		content.unshift('..');
+	}
+
+	return content.filter(item => !excluded.includes(item));
+};
+
+test('render html directory listing', async t => {
+	const contents = await getDirectoryContents();
+
+	const url = await getUrl();
+	const response = await fetch(url);
+	const text = await response.text();
+
+	const type = response.headers.get('content-type');
+
+	t.is(type, 'text/html; charset=utf-8');
+	t.true(contents.every(item => text.includes(item)));
+});
+
+test('render json directory listing', async t => {
+	const contents = await getDirectoryContents();
+	const url = await getUrl();
+
+	const response = await fetch(url, {
+		headers: {
+			Accept: 'application/json'
+		}
+	});
+
+	const type = response.headers.get('content-type');
+	t.is(type, 'application/json');
+
+	const {files} = await response.json();
+
+	const existing = files.every(file => {
+		const full = file.base.replace('/', '');
+		return contents.includes(full);
+	});
+
+	t.true(existing);
+});
+
+test('render html sub directory listing', async t => {
+	const name = '.circleci';
+
+	const sub = path.join(process.cwd(), name);
+	const contents = await getDirectoryContents(sub, true);
+	const url = await getUrl();
+	const response = await fetch(`${url}/${name}`);
+	const text = await response.text();
+
+	const type = response.headers.get('content-type');
+	t.is(type, 'text/html; charset=utf-8');
+
+	t.true(contents.every(item => text.includes(item)));
+});
+
+test('render json sub directory listing', async t => {
+	const name = 'src';
+
+	const sub = path.join(process.cwd(), name);
+	const contents = await getDirectoryContents(sub, true);
+	const url = await getUrl();
+
+	const response = await fetch(`${url}/${name}`, {
+		headers: {
+			Accept: 'application/json'
+		}
+	});
+
+	const type = response.headers.get('content-type');
+	t.is(type, 'application/json');
+
+	const {files} = await response.json();
+
+	const existing = files.every(file => {
+		const full = file.base.replace('/', '');
+		return contents.includes(full);
+	});
+
+	t.true(existing);
+});
+
+test('render dotfile', async t => {
+	const name = '.yarnrc';
+	const related = path.join(process.cwd(), name);
+
+	const content = await fs.readFile(related, 'utf8');
+	const url = await getUrl();
+	const response = await fetch(`${url}/${name}`);
+	const text = await response.text();
+
+	t.deepEqual(content, text);
+});
+
+test('render json file', async t => {
+	const name = 'package.json';
+	const related = path.join(process.cwd(), name);
+
+	const content = await fs.readJSON(related);
+	const url = await getUrl();
+	const response = await fetch(`${url}/${name}`);
+
+	const type = response.headers.get('content-type');
+	t.is(type, 'application/json');
+
+	const text = await response.text();
+	const spec = JSON.parse(text);
+
+	t.deepEqual(spec, content);
+});
+
+test('use `public` config property', async t => {
+	const name = 'src';
+	const url = await getUrl({'public': name});
+
+	const response = await fetch(url, {
+		headers: {
+			Accept: 'application/json'
+		}
+	});
+
+	const {files, directory} = await response.json();
+	t.is(directory, 'src/');
+
+	const type = response.headers.get('content-type');
+	t.is(type, 'application/json');
+
+	const related = path.join(process.cwd(), name);
+	const contents = await getDirectoryContents(related);
+
+	const existing = files.every(file => {
+		const full = file.base.replace('/', '');
+		return contents.includes(full);
+	});
+
+	t.true(existing);
+});
+
+test('set `trailingSlash` config property to `true`', async t => {
+	const url = await getUrl({
+		trailingSlash: true
+	});
+
+	const target = `${url}/test`;
+
+	const response = await fetch(target, {
+		redirect: 'manual',
+		follow: 0
+	});
+
+	const location = response.headers.get('location');
+	t.is(location, `${target}/`);
+});
+
+test('set `trailingSlash` config property to `false`', async t => {
+	const url = await getUrl({
+		trailingSlash: false
+	});
+
+	const target = `${url}/test`;
+
+	const response = await fetch(`${target}/`, {
+		redirect: 'manual',
+		follow: 0
+	});
+
+	const location = response.headers.get('location');
+	t.is(location, target);
+});
+
+test('set `rewrites` config property to wildcard paths', async t => {
+	const destination = '.yarnrc';
+	const related = path.join(process.cwd(), destination);
+	const content = await fs.readFile(related, 'utf8');
+
+	const url = await getUrl({
+		rewrites: [{
+			source: 'face/**',
+			destination
+		}]
+	});
+
+	const response = await fetch(`${url}/face/delete`);
+	const text = await response.text();
+
+	t.is(text, content);
+});