Skip to content

Commit 7543c45

Browse files
sokrasokra
authored
Merge pull request webpack#7168 from webpack/test/jest-improvements
Test/jest improvements
2 parents afd889a + 91bcdfb commit 7543c45

File tree

79 files changed

+2674
-2460
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+2674
-2460
lines changed

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
"type-lint": "tsc --pretty",
114114
"fix": "yarn code-lint --fix",
115115
"pretty": "prettier \"setup/**/*.js\" \"lib/**/*.js\" \"bin/*.js\" \"hot/*.js\" \"buildin/*.js\" \"test/*.js\" \"test/**/webpack.config.js\" \"examples/**/webpack.config.js\" \"schemas/**/*.js\" \"declarations.d.ts\" --write",
116-
"schema-lint": "node --max-old-space-size=4096 node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/*.lint.js\"",
116+
"schema-lint": "node --max-old-space-size=4096 node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/*.lint.js\" --no-verbose",
117117
"benchmark": "node --max-old-space-size=4096 --trace-deprecation node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/*.benchmark.js\" --runInBand",
118118
"cover": "yarn cover:init && yarn cover:all && yarn cover:report",
119119
"cover:init": "rimraf coverage",

‎test/StatsTestCases.test.js

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -118,19 +118,7 @@ describe("StatsTestCases", () => {
118118
.replace(/[\t ]*Version:.+\n/g, "")
119119
.replace(path.join(base, testName), "Xdir/" + testName)
120120
.replace(/ dependencies:Xms/g, "");
121-
const expected = fs
122-
.readFileSync(path.join(base, testName, "expected.txt"), "utf-8")
123-
.replace(/\r/g, "");
124-
if (actual !== expected) {
125-
fs.writeFileSync(
126-
path.join(base, testName, "actual.txt"),
127-
actual,
128-
"utf-8"
129-
);
130-
} else if (fs.existsSync(path.join(base, testName, "actual.txt"))) {
131-
fs.unlinkSync(path.join(base, testName, "actual.txt"));
132-
}
133-
expect(actual).toBe(expected);
121+
expect(actual).toMatchSnapshot();
134122
done();
135123
});
136124
});

‎test/WatchTestCases.test.js

Lines changed: 42 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ const path = require("path");
55
const fs = require("fs");
66
const vm = require("vm");
77
const mkdirp = require("mkdirp");
8+
const rimraf = require("rimraf");
89
const checkArrayExpectation = require("./checkArrayExpectation");
910
const { remove } = require("./helpers/remove");
1011

@@ -76,9 +77,7 @@ describe("WatchTestCases", () => {
7677
"js",
7778
"watch-src",
7879
category.name,
79-
`${testName}-${Math.random()
80-
.toPrecision(21)
81-
.slice(2)}`
80+
testName
8281
);
8382
const testDirectory = path.join(casesPath, category.name, testName);
8483
const runs = fs
@@ -89,7 +88,9 @@ describe("WatchTestCases", () => {
8988
})
9089
.map(name => ({ name }));
9190

92-
let exportedTests = [];
91+
beforeAll(done => {
92+
rimraf(tempDirectory, done);
93+
});
9394

9495
it(
9596
testName + " should compile",
@@ -201,6 +202,8 @@ describe("WatchTestCases", () => {
201202
)
202203
return;
203204

205+
const exportedTests = [];
206+
204207
function _it(title, fn) {
205208
exportedTests.push({ title, fn, timeout: 45000 });
206209
}
@@ -293,38 +296,43 @@ describe("WatchTestCases", () => {
293296
if (exportedTests.length < 1)
294297
return done(new Error("No tests exported by test case"));
295298

296-
runIdx++;
297-
if (runIdx < runs.length) {
298-
run = runs[runIdx];
299-
waitMode = true;
300-
setTimeout(() => {
301-
waitMode = false;
302-
currentWatchStepModule.step = run.name;
303-
copyDiff(
304-
path.join(testDirectory, run.name),
305-
tempDirectory,
306-
false
307-
);
308-
}, 1500);
309-
} else {
310-
watching.close();
299+
const continueStep = () => {
300+
runIdx++;
301+
if (runIdx < runs.length) {
302+
run = runs[runIdx];
303+
waitMode = true;
304+
setTimeout(() => {
305+
waitMode = false;
306+
currentWatchStepModule.step = run.name;
307+
copyDiff(
308+
path.join(testDirectory, run.name),
309+
tempDirectory,
310+
false
311+
);
312+
}, 1500);
313+
} else {
314+
watching.close();
311315

312-
const asyncSuite = describe("exported tests", () => {
313-
exportedTests.forEach(
314-
({ title, fn, timeout }) =>
315-
fn
316-
? fit(title, fn, timeout)
317-
: fit(title, () => {}).pend("Skipped")
318-
);
319-
});
320-
// workaround for jest running clearSpies on the wrong suite (invoked by clearResourcesForRunnable)
321-
asyncSuite.disabled = true;
316+
done();
317+
}
318+
};
322319

323-
jasmine
324-
.getEnv()
325-
.execute([asyncSuite.id], asyncSuite)
326-
.then(done, done);
327-
}
320+
// Run the tests
321+
const asyncSuite = describe(`step ${run.name}`, () => {
322+
exportedTests.forEach(
323+
({ title, fn, timeout }) =>
324+
fn
325+
? fit(title, fn, timeout)
326+
: fit(title, () => {}).pend("Skipped")
327+
);
328+
});
329+
// workaround for jest running clearSpies on the wrong suite (invoked by clearResourcesForRunnable)
330+
asyncSuite.disabled = true;
331+
332+
jasmine
333+
.getEnv()
334+
.execute([asyncSuite.id], asyncSuite)
335+
.then(continueStep, done);
328336
}
329337
);
330338
}, 300);

0 commit comments

Comments
 (0)