Skip to content

Commit

Permalink
Refactor Jest scripts directory structure
Browse files Browse the repository at this point in the history
Introduces a more consistent naming scheme.
  • Loading branch information
gaearon committed Nov 22, 2017
1 parent 2ec7101 commit 9bb8e67
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 7 deletions.
7 changes: 2 additions & 5 deletions scripts/jest/config.source.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@ module.exports = {
transform: {
'.*': require.resolve('./preprocessor.js'),
},
setupFiles: [
require.resolve('./setup.js'),
require.resolve('./environment.js'),
],
setupTestFrameworkScriptFile: require.resolve('./test-framework-setup.js'),
setupFiles: [require.resolve('./setupEnvironment.js')],
setupTestFrameworkScriptFile: require.resolve('./setupTests.js'),
testRegex: '/__tests__/.*(\\.js|\\.coffee|[^d]\\.ts)$',
moduleFileExtensions: ['js', 'json', 'node', 'coffee', 'ts'],
rootDir: process.cwd(),
Expand Down
2 changes: 1 addition & 1 deletion scripts/jest/preprocessor.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ var path = require('path');
var babel = require('babel-core');
var coffee = require('coffee-script');

var tsPreprocessor = require('./ts-preprocessor');
var tsPreprocessor = require('./typescript/preprocessor');
var createCacheKeyFunction = require('fbjs-scripts/jest/createCacheKeyFunction');

// Use require.resolve to be resilient to file moves, npm updates, etc
Expand Down
11 changes: 11 additions & 0 deletions scripts/jest/environment.js → scripts/jest/setupEnvironment.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
/* eslint-disable */

jest.mock('shared/ReactFeatureFlags', () => {
// We can alter flags based on environment here
// (e.g. for CI runs with different flags).
return require.requireActual('shared/ReactFeatureFlags');
});

// Error logging varies between Fiber and Stack;
// Rather than fork dozens of tests, mock the error-logging file by default.
// TODO: direct imports like some-package/src/* are bad. Fix me.
jest.mock('react-reconciler/src/ReactFiberErrorLogger');

const NODE_ENV = process.env.NODE_ENV;
if (NODE_ENV !== 'development' && NODE_ENV !== 'production') {
throw new Error('NODE_ENV must either be set to development or production.');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
if (process.env.REACT_CLASS_EQUIVALENCE_TEST) {
// Inside the class equivalence tester, we have a custom environment, let's
// require that instead.
require('./setupSpecEquivalenceReporter.js');
require('./spec-equivalence-reporter/setupTests.js');
} else {
var env = jasmine.getEnv();
var errorMap = require('../error-codes/codes.json');
Expand Down
File renamed without changes.
File renamed without changes.

0 comments on commit 9bb8e67

Please sign in to comment.