streamline tests

Author: heldinz

test/_helper.js

@@ -18,15 +18,13 @@ export function createFile({ contents }) {
 
 const setUp = ({ isFromLatin1 = false, isStream = false } = {}) => {
 	let from = UTF8;
-	let iconvLiteFrom = UTF8;
 	let to = LATIN1;
-	let iconvLiteTo = LATIN1_ISO;
+	let pluginOptions = { to: LATIN1_ISO };
 
 	if (isFromLatin1) {
 		from = LATIN1;
-		iconvLiteFrom = LATIN1_ISO;
 		to = UTF8;
-		iconvLiteTo = UTF8;
+		pluginOptions = { from: LATIN1_ISO };
 	}
 
 	const defaultBuffer = Buffer.from(testString);
@@ -41,10 +39,10 @@ const setUp = ({ isFromLatin1 = false, isStream = false } = {}) => {
 	return {
 		from,
 		to,
-		iconvLiteFrom,
-		iconvLiteTo,
+		pluginOptions,
 		vinylFile: createFile({ contents: fileContents }),
 		expected: testString,
+		isStream,
 	};
 };
 

test/test.js

@@ -61,84 +61,56 @@ const unsupportedEncoding = test.macro({
 			},
 		);
 	},
-	title(option) {
-		return `throws on unsupported ${option} encoding`;
+	title(providedTitle) {
+		return `throws on unsupported ${providedTitle} encoding`;
 	},
 });
 
 for (let option of ['from', 'to']) {
 	test(option, unsupportedEncoding, option, 'ahfkjdsahfk');
 }
 
-test('ignores null files', async (t) => {
-	const stream = convertEncoding({ to: LATIN1 });
-	const promise = pEvent(stream, 'data');
-
-	stream.end(createFile({ contents: null }));
-
-	const file = await promise;
-	const actual = file.contents;
-	const expected = null;
-
-	t.is(actual, expected);
-});
-
-test(`converts a buffer from ${UTF8} to ${LATIN1}`, async (t) => {
-	const { to, iconvLiteTo, vinylFile, expected } = setUpFromUTF8Buffer();
-
-	const stream = convertEncoding({ to: iconvLiteTo });
-	const promise = pEvent(stream, 'data');
-
-	stream.end(vinylFile);
-
-	const file = await promise;
-	const contentsBuffer = Buffer.from(file.contents, to);
-	const actual = contentsBuffer.toString(to);
-
-	t.is(actual, expected);
-});
+const convert = test.macro({
+	async exec(t, input, expected) {
+		const { isStream = false, pluginOptions, to, vinylFile } = input;
 
-test(`converts a buffer from ${LATIN1} to ${UTF8}`, async (t) => {
-	const { to, iconvLiteFrom, vinylFile, expected } = setUpFromLatin1Buffer();
+		const stream = convertEncoding(pluginOptions);
+		const promise = pEvent(stream, 'data');
 
-	const stream = convertEncoding({ from: iconvLiteFrom });
-	const promise = pEvent(stream, 'data');
-
-	stream.end(vinylFile);
-
-	const file = await promise;
-	const contentsBuffer = Buffer.from(file.contents, to);
-	const actual = contentsBuffer.toString(to);
+		stream.end(vinylFile);
 
-	t.is(actual, expected);
-});
+		const file = await promise;
+		const contentsBuffer = isStream
+			? await buffer(file.contents)
+			: Buffer.from(file.contents, to);
+		const actual = contentsBuffer.toString(to);
 
-test(`converts a stream from ${UTF8} to ${LATIN1}`, async (t) => {
-	const { to, iconvLiteTo, vinylFile, expected } = setUpFromUTF8Stream();
-
-	const stream = convertEncoding({ to: iconvLiteTo });
-	const promise = pEvent(stream, 'data');
-
-	stream.end(vinylFile);
-
-	const file = await promise;
-	const contentsBuffer = await buffer(file.contents);
-	const actual = contentsBuffer.toString(to);
-
-	t.is(actual, expected);
+		t.is(actual, expected);
+	},
+	title(_, { isStream, from, to }) {
+		return `converts a ${isStream ? 'stream' : 'buffer'} from ${from} to ${to}`;
+	},
 });
 
-test(`converts a stream from ${LATIN1} to ${UTF8}`, async (t) => {
-	const { to, iconvLiteFrom, vinylFile, expected } = setUpFromLatin1Stream();
+const conversionTestCases = [
+	{ ...setUpFromUTF8Buffer() },
+	{ ...setUpFromLatin1Buffer() },
+	{ ...setUpFromUTF8Stream() },
+	{ ...setUpFromLatin1Stream() },
+];
+for (let testCase of conversionTestCases) {
+	test(convert, testCase, testCase.expected);
+}
 
-	const stream = convertEncoding({ from: iconvLiteFrom });
+test('ignores null files', async (t) => {
+	const stream = convertEncoding({ to: LATIN1 });
 	const promise = pEvent(stream, 'data');
 
-	stream.end(vinylFile);
+	stream.end(createFile({ contents: null }));
 
 	const file = await promise;
-	const contentsBuffer = await buffer(file.contents);
-	const actual = contentsBuffer.toString(to);
+	const actual = file.contents;
+	const expected = null;
 
 	t.is(actual, expected);
 });