Skip to content

Commit 130b268

Browse files
committed
fix test
1 parent ab3ab1c commit 130b268

File tree

1 file changed

+20
-25
lines changed

1 file changed

+20
-25
lines changed

__test__/diffFiles.test.js

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
/* eslint-disable no-undef */
22
import fs from 'fs';
33
import path from 'path';
4-
import compareFiles from '../src/diffFiles.js';
54
import { fileURLToPath } from 'url';
65
import { dirname } from 'path';
7-
import parseFile from '../src/fileParser.js';
8-
import formatStylish from '../src/formats/styllish.js';
9-
import formatPlain from '../src/formats/plain.js';
10-
import formatJson from '../src/formats/json.js';
6+
import { chooseFormat } from '../src/formats/index.js';
117

128
const __filename = fileURLToPath(import.meta.url);
139
const __dirname = dirname(__filename);
@@ -17,35 +13,34 @@ const getFixturePath = (filename) =>
1713
const readFile = (filename) =>
1814
fs.readFileSync(getFixturePath(filename), 'utf-8');
1915

20-
const prepareFiles = (file1, file2) => {
21-
const parsedFile1 = parseFile(getFixturePath(file1));
22-
const parsedFile2 = parseFile(getFixturePath(file2));
23-
return compareFiles(parsedFile1, parsedFile2);
24-
};
25-
26-
let diffFilesJson;
27-
let diffFilesYaml;
28-
beforeEach(() => {
29-
diffFilesJson = prepareFiles('file1.json', 'file2.json');
30-
diffFilesYaml = prepareFiles('file1.yaml', 'file2.yaml');
31-
});
16+
const expectFormatJson = readFile('expectDiffFormatJson.txt');
17+
const expectFormatPlain = readFile('expectDiffFormatPlain.txt');
18+
const expectFormatStylish = readFile('expectDiffFormatStylish.txt');
3219

3320
test('compareFilesJsonFormatStylish', () => {
34-
const diffFilesFormatStylish = readFile('expectDiffFormatStylish.txt');
35-
expect(formatStylish(diffFilesJson)).toEqual(diffFilesFormatStylish);
21+
expect(
22+
chooseFormat('__fixtures__/file1.json', '__fixtures__/file2.json')
23+
).toEqual(expectFormatStylish);
3624
});
3725

3826
test('compareFilesYamlFormatStylish', () => {
39-
const diffFilesFormatStylish = readFile('expectDiffFormatStylish.txt');
40-
expect(formatStylish(diffFilesYaml)).toEqual(diffFilesFormatStylish);
27+
expect(
28+
chooseFormat(
29+
'__fixtures__/file1.yaml',
30+
'__fixtures__/file2.yaml',
31+
'stylish'
32+
)
33+
).toEqual(expectFormatStylish);
4134
});
4235

4336
test('compareFilesJsonFormatPlain', () => {
44-
const diffFilesFormatPlain = readFile('expectDiffFormatPlain.txt');
45-
expect(formatPlain(diffFilesJson)).toEqual(diffFilesFormatPlain);
37+
expect(
38+
chooseFormat('__fixtures__/file1.yaml', '__fixtures__/file2.json', 'plain')
39+
).toEqual(expectFormatPlain);
4640
});
4741

4842
test('compareFilesFormatJson', () => {
49-
const diffFilesFormatPlain = readFile('expectDiffFormatJson.txt');
50-
expect(formatJson(diffFilesJson)).toEqual(diffFilesFormatPlain);
43+
expect(
44+
chooseFormat('__fixtures__/file1.yaml', '__fixtures__/file2.yaml', 'json')
45+
).toEqual(expectFormatJson);
5146
});

0 commit comments

Comments
 (0)