@samitouri / QOS-React / commits / 9011182c55

Configure Jest with Stack and Fiber as separate projects (#10214)

* Disable Fiber specific test run in CI This disables the comparison against previously recorded test. Instead, we'll rely on jest failures to fail tests. * Extract jest config into two separate projects for Fiber and Stack Allows us to run both in the same jest run. The setupMocks file is forked into specific environment configuration for each project. This replaces the environment variable. I used copy pasta here to make it clear. We can abstract this later. It's clear to me that simply extracting shared stuff is not the best way to abstract this. setupMocks for example didn't need all the code in both branches. I think that some of the stuff that is shared such as error message extracting etc. should probably be lifted out into a stand-alone jest project instead of being shared. * Fix class equivalence test There's a behavior change when projects are used which makes setupTestFrameworkScriptFile not override the normal config. This test should probably just move to a separate CI script or something less hacky. * Only run Fiber tests with scripts/fiber/record-tests

Sebastian Markbåge committed Jul 19, 2017 at 10:35 UTC 9011182c5539bb7e165b4e3430c545dce7706fa6
11 files changed +183 -132
package.json
+4 -35
@@ -120,40 +120,9 @@
120 "version-check": "node ./scripts/tasks/version-check.js"
121 },
122 "jest": {
123 - "modulePathIgnorePatterns": [
124 - "/.module-cache/",
125 - "<rootDir>/build/",
126 - "<rootDir>/scripts/rollup/shims/",
127 - "<rootDir>/scripts/bench/"
128 - ],
129 - "rootDir": "",
130 - "transform": {
131 - ".*": "./scripts/jest/preprocessor.js"
132 - },
133 - "setupFiles": [
134 - "./scripts/jest/environment.js"
135 - ],
136 - "setupTestFrameworkScriptFile": "./scripts/jest/test-framework-setup.js",
137 - "testRegex": "/__tests__/.*(\\.js|coffee|ts)$",
138 - "moduleFileExtensions": [
139 - "js",
140 - "json",
141 - "node",
142 - "coffee",
143 - "ts"
144 - ],
145 - "roots": [
146 - "<rootDir>/eslint-rules",
147 - "<rootDir>/mocks",
148 - "<rootDir>/scripts",
149 - "<rootDir>/src",
150 - "node_modules/fbjs"
151 - ],
152 - "collectCoverageFrom": [
153 - "src/**/*.js",
154 - "!src/__mocks__/vendor/third_party/*.js",
155 - "!src/test/*.js"
156 - ],
157 - "timers": "fake"
123 + "projects": [
124 + "<rootDir>/scripts/jest/stack.config.json",
125 + "<rootDir>/scripts/jest/fiber.config.json"
126 + ]
127 }
128 }
scripts/circleci/test_entry_point.sh
-4
@@ -8,10 +8,6 @@ if [ $((1 % CIRCLE_NODE_TOTAL)) -eq "$CIRCLE_NODE_INDEX" ]; then
8 COMMANDS_TO_RUN+=('./scripts/circleci/test_coverage.sh')
9 fi
10
11 -if [ $((2 % CIRCLE_NODE_TOTAL)) -eq "$CIRCLE_NODE_INDEX" ]; then
12 - COMMANDS_TO_RUN+=('./scripts/circleci/test_fiber.sh')
13 -fi
14 -
11 if [ $((3 % CIRCLE_NODE_TOTAL)) -eq "$CIRCLE_NODE_INDEX" ]; then
12 COMMANDS_TO_RUN+=('node ./scripts/tasks/eslint')
13 fi
scripts/circleci/test_fiber.sh deleted
-9
@@ -1,9 +0,0 @@
1 -#!/bin/bash
2 -
3 -set -e
4 -
5 -echo 'Testing in fiber mode...'
6 -./scripts/fiber/record-tests --track-facts --max-workers 1
7 -git --no-pager diff scripts/fiber
8 -FIBER_TESTS_STATUS=$(git status --porcelain scripts/fiber)
9 -test -z "$FIBER_TESTS_STATUS"
scripts/fiber/record-tests
+4 -3
@@ -15,8 +15,10 @@ const TestWatcher = require('jest').TestWatcher;
15 const createContext = require('jest-runtime').createContext;
16 const readConfig = require('jest-config').readConfig;
17
18 -const argv = {};
18 const root = path.normalize(path.join(__dirname, '..', '..'));
19 +const argv = {
20 + config: path.join(root, 'scripts/jest/fiber.config.json'),
21 +};
22 const testPathPattern = '';
23
24 function wrapRunnerFile(runnerPath) {
@@ -79,7 +81,7 @@ function wrapRunner(originalPath) {
81 }
82
83 function runJest(maxWorkers) {
82 - let { config } = readConfig(argv, root)
84 + let { config } = readConfig(argv, root);
85 config = Object.assign({}, config, {
86 testRunner: wrapRunnerFile(config.testRunner),
87 maxWorkers: maxWorkers,
@@ -121,7 +123,6 @@ function formatResults(runResults, predicate) {
123 }
124
125 function recordTests(maxWorkers, trackFacts) {
124 - process.env.REACT_JEST_USE_FIBER = true;
126 runJest(maxWorkers)
127 .then((runResults) => {
128 const passing = formatResults(
scripts/jest/fiber.config.json new
+38
@@ -0,0 +1,38 @@
1 +{
2 + "modulePathIgnorePatterns": [
3 + "/.module-cache/",
4 + "<rootDir>/build/",
5 + "<rootDir>/scripts/rollup/shims/",
6 + "<rootDir>/scripts/bench/"
7 + ],
8 + "rootDir": "../../",
9 + "transform": {
10 + ".*": "./scripts/jest/preprocessor.js"
11 + },
12 + "setupFiles": [
13 + "./scripts/jest/fiber.setup.js",
14 + "./scripts/jest/environment.js"
15 + ],
16 + "setupTestFrameworkScriptFile": "./scripts/jest/test-framework-setup.js",
17 + "testRegex": "/__tests__/.*(\\.js|coffee|ts)$",
18 + "moduleFileExtensions": [
19 + "js",
20 + "json",
21 + "node",
22 + "coffee",
23 + "ts"
24 + ],
25 + "roots": [
26 + "<rootDir>/eslint-rules",
27 + "<rootDir>/mocks",
28 + "<rootDir>/scripts",
29 + "<rootDir>/src",
30 + "node_modules/fbjs"
31 + ],
32 + "collectCoverageFrom": [
33 + "src/**/*.js",
34 + "!src/__mocks__/vendor/third_party/*.js",
35 + "!src/test/*.js"
36 + ],
37 + "timers": "fake"
38 +}
scripts/jest/fiber.setup.js renamed
+2 -2
@@ -5,7 +5,7 @@
5 jest.mock('ReactDOMFeatureFlags', () => {
6 const flags = require.requireActual('ReactDOMFeatureFlags');
7 return Object.assign({}, flags, {
8 - useFiber: !!process.env.REACT_JEST_USE_FIBER,
8 + useFiber: true,
9 });
10 });
11 jest.mock('ReactFeatureFlags', () => {
@@ -17,7 +17,7 @@ jest.mock('ReactFeatureFlags', () => {
17 jest.mock('ReactNativeFeatureFlags', () => {
18 const flags = require.requireActual('ReactNativeFeatureFlags');
19 return Object.assign({}, flags, {
20 - useFiber: !!process.env.REACT_JEST_USE_FIBER,
20 + useFiber: true,
21 });
22 });
23
scripts/jest/setupSpecEquivalenceReporter.js
-2
@@ -9,8 +9,6 @@
9
10 'use strict';
11
12 -require('./setupMocks');
13 -
12 var expect = global.expect;
13
14 var numExpectations = 0;
scripts/jest/stack.config.json new
+38
@@ -0,0 +1,38 @@
1 +{
2 + "modulePathIgnorePatterns": [
3 + "/.module-cache/",
4 + "<rootDir>/build/",
5 + "<rootDir>/scripts/rollup/shims/",
6 + "<rootDir>/scripts/bench/"
7 + ],
8 + "rootDir": "../../",
9 + "transform": {
10 + ".*": "./scripts/jest/preprocessor.js"
11 + },
12 + "setupFiles": [
13 + "./scripts/jest/stack.setup.js",
14 + "./scripts/jest/environment.js"
15 + ],
16 + "setupTestFrameworkScriptFile": "./scripts/jest/test-framework-setup.js",
17 + "testRegex": "/__tests__/.*(\\.js|coffee|ts)$",
18 + "moduleFileExtensions": [
19 + "js",
20 + "json",
21 + "node",
22 + "coffee",
23 + "ts"
24 + ],
25 + "roots": [
26 + "<rootDir>/eslint-rules",
27 + "<rootDir>/mocks",
28 + "<rootDir>/scripts",
29 + "<rootDir>/src",
30 + "node_modules/fbjs"
31 + ],
32 + "collectCoverageFrom": [
33 + "src/**/*.js",
34 + "!src/__mocks__/vendor/third_party/*.js",
35 + "!src/test/*.js"
36 + ],
37 + "timers": "fake"
38 +}
scripts/jest/stack.setup.js new
+20
@@ -0,0 +1,20 @@
1 +'use strict';
2 +
3 +// We want to globally mock this but jest doesn't let us do that by default
4 +// for a file that already exists. So we have to explicitly mock it.
5 +jest.mock('ReactDOMFeatureFlags', () => {
6 + const flags = require.requireActual('ReactDOMFeatureFlags');
7 + return Object.assign({}, flags, {
8 + useFiber: false,
9 + });
10 +});
11 +jest.mock('ReactNativeFeatureFlags', () => {
12 + const flags = require.requireActual('ReactNativeFeatureFlags');
13 + return Object.assign({}, flags, {
14 + useFiber: false,
15 + });
16 +});
17 +
18 +// Error logging varies between Fiber and Stack;
19 +// Rather than fork dozens of tests, mock the error-logging file by default.
20 +jest.mock('ReactFiberErrorLogger');
scripts/jest/test-framework-setup.js
+70 -66
@@ -1,80 +1,84 @@
1 'use strict';
2
3 -require('./setupMocks');
3 +if (process.env.REACT_CLASS_EQUIVALENCE_TEST) {
4 + // Inside the class equivalence tester, we have a custom environment, let's
5 + // require that instead.
6 + require('./setupSpecEquivalenceReporter.js');
7 +} else {
8 + var env = jasmine.getEnv();
9
5 -var env = jasmine.getEnv();
6 -
7 -var callCount = 0;
8 -var oldError = console.error;
9 -var newError = function() {
10 - callCount++;
11 - oldError.apply(this, arguments);
12 -};
10 + var callCount = 0;
11 + var oldError = console.error;
12 + var newError = function() {
13 + callCount++;
14 + oldError.apply(this, arguments);
15 + };
16
14 -console.error = newError;
17 + console.error = newError;
18
16 -// TODO: Stop using spyOn in all the test since that seem deprecated.
17 -// Legacy upgrade path from https://github.com/facebook/jest/blob/21a2b7aaee366af7ed87ae78c5b2d58cf3f5fb86/packages/jest-matchers/src/spy_matchers.js#L160
18 -const isSpy = spy => spy.calls && typeof spy.calls.count === 'function';
19 + // TODO: Stop using spyOn in all the test since that seem deprecated.
20 + // Legacy upgrade path from https://github.com/facebook/jest/blob/21a2b7aaee366af7ed87ae78c5b2d58cf3f5fb86/packages/jest-matchers/src/spy_matchers.js#L160
21 + const isSpy = spy => spy.calls && typeof spy.calls.count === 'function';
22
20 -env.beforeEach(() => {
21 - callCount = 0;
22 - jasmine.addMatchers({
23 - toBeReset() {
24 - return {
25 - compare(actual) {
26 - // TODO: Catch test cases that call spyOn() but don't inspect the mock
27 - // properly.
28 - if (actual !== newError && !isSpy(actual)) {
23 + env.beforeEach(() => {
24 + callCount = 0;
25 + jasmine.addMatchers({
26 + toBeReset() {
27 + return {
28 + compare(actual) {
29 + // TODO: Catch test cases that call spyOn() but don't inspect the mock
30 + // properly.
31 + if (actual !== newError && !isSpy(actual)) {
32 + return {
33 + pass: false,
34 + message: () =>
35 + 'Test did not tear down console.error mock properly.',
36 + };
37 + }
38 + return {pass: true};
39 + },
40 + };
41 + },
42 + toNotHaveBeenCalled() {
43 + return {
44 + compare(actual) {
45 return {
30 - pass: false,
46 + pass: callCount === 0,
47 message: () =>
32 - 'Test did not tear down console.error mock properly.',
48 + 'Expected test not to warn. If the warning is expected, mock ' +
49 + "it out using spyOn(console, 'error'); and test that the " +
50 + 'warning occurs.',
51 };
34 - }
35 - return {pass: true};
36 - },
37 - };
38 - },
39 - toNotHaveBeenCalled() {
40 - return {
41 - compare(actual) {
42 - return {
43 - pass: callCount === 0,
44 - message: () =>
45 - 'Expected test not to warn. If the warning is expected, mock ' +
46 - "it out using spyOn(console, 'error'); and test that the " +
47 - 'warning occurs.',
48 - };
49 - },
50 - };
51 - },
52 + },
53 + };
54 + },
55 + });
56 + });
57 + env.afterEach(() => {
58 + expect(console.error).toBeReset();
59 + expect(console.error).toNotHaveBeenCalled();
60 });
53 -});
54 -env.afterEach(() => {
55 - expect(console.error).toBeReset();
56 - expect(console.error).toNotHaveBeenCalled();
57 -});
61
59 -function wrapDevMatcher(obj, name) {
60 - const original = obj[name];
61 - obj[name] = function devMatcher() {
62 - try {
63 - original.apply(this, arguments);
64 - } catch (e) {
65 - global.__hadDevFailures = e.stack;
62 + function wrapDevMatcher(obj, name) {
63 + const original = obj[name];
64 + obj[name] = function devMatcher() {
65 + try {
66 + original.apply(this, arguments);
67 + } catch (e) {
68 + global.__hadDevFailures = e.stack;
69 + }
70 + };
71 + }
72 +
73 + const expectDev = function expectDev(actual) {
74 + const expectation = expect(actual);
75 + if (global.__suppressDevFailures) {
76 + Object.keys(expectation).forEach(name => {
77 + wrapDevMatcher(expectation, name);
78 + wrapDevMatcher(expectation.not, name);
79 + });
80 }
81 + return expectation;
82 };
83 + global.expectDev = expectDev;
84 }
69 -
70 -const expectDev = function expectDev(actual) {
71 - const expectation = expect(actual);
72 - if (global.__suppressDevFailures) {
73 - Object.keys(expectation).forEach(name => {
74 - wrapDevMatcher(expectation, name);
75 - wrapDevMatcher(expectation.not, name);
76 - });
77 - }
78 - return expectation;
79 -};
80 -global.expectDev = expectDev;
src/isomorphic/modern/class/__tests__/ReactClassEquivalence-test.js
+7 -11
@@ -32,16 +32,12 @@ function runJest(testFile) {
32 var cwd = process.cwd();
33 var extension = process.platform === 'win32' ? '.cmd' : '';
34 var jestBin = path.resolve('node_modules', '.bin', 'jest' + extension);
35 - var setupFile = path.resolve(
36 - 'scripts',
37 - 'jest',
38 - 'setupSpecEquivalenceReporter.js',
39 - );
40 - var result = spawnSync(
41 - jestBin,
42 - [testFile, '--setupTestFrameworkScriptFile', setupFile],
43 - {cwd},
44 - );
35 + var result = spawnSync(jestBin, [testFile], {
36 + cwd,
37 + env: Object.assign({}, process.env, {
38 + REACT_CLASS_EQUIVALENCE_TEST: 'true',
39 + }),
40 + });
41
42 if (result.error) {
43 throw result.error;
@@ -59,7 +55,7 @@ function runJest(testFile) {
55 );
56 }
57
62 - return result.stdout.toString();
58 + return result.stdout.toString() + result.stderr.toString();
59 }
60
61 function compareResults(a, b) {