Fix errors of test dir

sindresorhus · Mar 22, 2019 · 2e73b2a · 2e73b2a
1 parent 748ecf5
commit 2e73b2a
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 17 deletions.
diff --git a/package.json b/package.json
@@ -58,7 +58,7 @@
 		"capture-website": "^0.3.0",
 		"date-fns": "^1.30.1",
 		"filenamify": "^3.0.0",
-		"filenamify-url": "^1.0.0",
+		"filenamify-url": "^2.0.0",
 		"get-res": "^3.0.0",
 		"lodash.template": "^4.0.1",
 		"log-symbols": "^2.1.0",
@@ -70,22 +70,17 @@
 	},
 	"devDependencies": {
 		"@sindresorhus/tsconfig": "^0.3.0",
-		"@types/image-size": "^0.7.0",
-		"@types/node": "^11.11.4",
 		"@types/array-uniq": "^1.0.1",
-		"@types/easydate": "^2.2.0",
-		"@types/file-type": "^10.6.0",
-		"@types/filenamify-url": "^1.0.0",
+		"@types/cookie": "^0.3.2",
 		"@types/get-res": "^3.0.1",
+		"@types/image-size": "^0.7.0",
 		"@types/lodash.template": "^4.4.5",
 		"@types/log-symbols": "^2.0.0",
-		"@types/make-dir": "^1.0.3",
-		"@types/mem": "^1.1.2",
+		"@types/node": "^11.11.4",
 		"@types/path-exists": "^3.0.0",
 		"@types/pify": "^3.0.2",
 		"@types/plur": "^3.0.0",
 		"@types/sinon": "^7.0.6",
-		"@types/unused-filename": "^1.0.0",
 		"@types/viewport-list": "^5.1.1",
 		"@typescript-eslint/eslint-plugin": "^1.3.0",
 		"ava": "^1.2.0",

diff --git a/test/_server.ts b/test/_server.ts
@@ -7,14 +7,14 @@ import pify from 'pify';
 
 export const host = 'localhost';
 
-interface TestServer extends http.Server {
+export interface TestServer extends http.Server {
 	host: string;
 	port: number;
 	url: string;
 	protocol: string;
 }
 
-const baseCreateServer = (fn): (() => Promise<TestServer>) => {
+const baseCreateServer = (fn: http.RequestListener): (() => Promise<TestServer>) => {
 	return async (): Promise<TestServer> => {
 		const port = await getPort();
 		const server = http.createServer(fn) as TestServer;
@@ -24,6 +24,7 @@ const baseCreateServer = (fn): (() => Promise<TestServer>) => {
 		server.url = `http://${host}:${port}`;
 		server.protocol = 'http';
 		server.listen(port);
+		// @ts-ignore
 		server.close = pify(server.close);
 
 		return server;
@@ -36,6 +37,7 @@ export const createServer = baseCreateServer((_request, response) => {
 });
 
 export const createCookieServer = baseCreateServer((request, response) => {
+	// @ts-ignore
 	const color = cookie.parse(request.headers.cookie).pageresColor || 'white';
 	response.writeHead(200, {'content-type': 'text/html'});
 	response.end(`<body><div style="background: ${color}; position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div></body`);

diff --git a/test/cookie.ts b/test/cookie.ts
@@ -1,10 +1,15 @@
-import test from 'ava';
+import test, {ExecutionContext} from 'ava';
+// @ts-ignore
 import PNG from 'png-js';
 import pify from 'pify';
 import Pageres from '../source';
 import {createCookieServer} from './_server';
 
-async function cookieTest(input, t): Promise<void> {
+interface Cookie {
+	[key: string]: string;
+}
+
+async function cookieTest(input: string | Cookie, t: ExecutionContext): Promise<void> {
 	const server = await createCookieServer();
 
 	const screenshots = await new Pageres({cookies: [input]})

diff --git a/test/test.ts b/test/test.ts
@@ -3,28 +3,29 @@ import path from 'path';
 import test from 'ava';
 import imageSize from 'image-size';
 import dateFns from 'date-fns';
+// @ts-ignore
 import PNG from 'png-js';
 import pify from 'pify';
 import pathExists from 'path-exists';
 import sinon from 'sinon';
 import fileType from 'file-type';
 import Pageres, {Screenshot} from '../source';
-import {createServer} from './_server';
+import {createServer, TestServer} from './_server';
 
 const fsP = pify(fs);
 
 const hasScreenshotsWithFilenames = (screenshots: Screenshot[], filenames: string[]): boolean => {
 	return screenshots.some(screenshot => filenames.includes(screenshot.filename));
 };
 
-const getPngPixels = async (buffer): Promise<Buffer> => {
+const getPngPixels = async (buffer: Buffer): Promise<Buffer> => {
 	const png = new PNG(buffer);
 	const pixels = await pify(png.decode.bind(png), {errorFirst: false})();
 	return pixels;
 };
 
-let server;
-let serverFileName;
+let server: TestServer;
+let serverFileName: string;
 test.before(async () => {
 	server = await createServer();
 	serverFileName = server.url
@@ -245,11 +246,13 @@ test('`scale` option', async t => {
 
 test('support data URL', async t => {
 	const screenshots = await new Pageres().src('data:text/html;base64,PGgxPkZPTzwvaDE+', ['100x100']).run();
+	// @ts-ignore
 	t.is(fileType(screenshots[0]).mime, 'image/png');
 });
 
 test('`format` option', async t => {
 	const screenshots = await new Pageres().src(server.url, ['100x100'], {format: 'jpg'}).run();
+	// @ts-ignore
 	t.is(fileType(screenshots[0]).mime, 'image/jpeg');
 });