Skip to content

Commit fbea74b

Browse files
cpojercpojer
committed
Remove HasteResolver completely.
1 parent b743e43 commit fbea74b

12 files changed

Lines changed: 75 additions & 150 deletions

‎src/Runtime/__tests__/Runtime-NODE_PATH-test.js‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,32 +17,29 @@ const normalizeConfig = require('../../config/normalize');
1717

1818
describe('Runtime', () => {
1919
let Runtime;
20-
let HasteResolver;
20+
let createHasteMap;
2121
let JSDOMEnvironment;
2222

2323
const rootDir = path.join(__dirname, 'test_root');
2424
const rootPath = path.join(rootDir, 'root.js');
25-
const config = normalizeConfig({
25+
const baseConfig = normalizeConfig({
2626
cacheDirectory: global.CACHE_DIRECTORY,
2727
name: 'Runtime-NODE_PATH-tests',
2828
rootDir: path.resolve(__dirname, 'test_root'),
2929
});
3030

31-
function buildLoader() {
31+
function buildLoader(config) {
32+
config = Object.assign({}, baseConfig, config);
3233
const environment = new JSDOMEnvironment(config);
33-
const resolver = new HasteResolver(config, {
34-
resetCache: false,
35-
maxWorkers: 1,
36-
});
37-
return resolver.getHasteMap().then(
38-
response => new Runtime(config, environment, response)
39-
);
34+
return createHasteMap(config, {resetCache: false, maxWorkers: 1})
35+
.build()
36+
.then(response => new Runtime(config, environment, response));
4037
}
4138

4239
function initHasteModuleLoader(nodePath) {
4340
process.env.NODE_PATH = nodePath;
4441
Runtime = require('../Runtime');
45-
HasteResolver = require('../../resolvers/HasteResolver');
42+
createHasteMap = require('../../lib/createHasteMap');
4643
JSDOMEnvironment = require('jest-environment-jsdom');
4744
}
4845

‎src/Runtime/__tests__/Runtime-genMockFromModule-test.js‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,28 @@ const normalizeConfig = require('../../config/normalize');
1717

1818
describe('nodeRuntime', () => {
1919
let Runtime;
20-
let HasteResolver;
20+
let createHasteMap;
2121
let JSDOMEnvironment;
2222

2323
const rootDir = path.resolve(__dirname, 'test_root');
2424
const rootPath = path.resolve(rootDir, 'root.js');
25-
const config = normalizeConfig({
25+
const baseConfig = normalizeConfig({
2626
cacheDirectory: global.CACHE_DIRECTORY,
2727
name: 'nodeRuntime-genMockFromModule-tests',
2828
rootDir,
2929
});
3030

31-
function buildLoader() {
31+
function buildLoader(config) {
32+
config = Object.assign({}, baseConfig, config);
3233
const environment = new JSDOMEnvironment(config);
33-
const resolver = new HasteResolver(config, {
34-
resetCache: false,
35-
maxWorkers: 1,
36-
});
37-
return resolver.getHasteMap().then(
38-
response => new Runtime(config, environment, response)
39-
);
34+
return createHasteMap(config, {resetCache: false, maxWorkers: 1})
35+
.build()
36+
.then(response => new Runtime(config, environment, response));
4037
}
4138

4239
beforeEach(() => {
4340
Runtime = require('../Runtime');
44-
HasteResolver = require('../../resolvers/HasteResolver');
41+
createHasteMap = require('../../lib/createHasteMap');
4542
JSDOMEnvironment = require('jest-environment-jsdom');
4643
});
4744

‎src/Runtime/__tests__/Runtime-getTestEnvData-test.js‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,40 +17,37 @@ const normalizeConfig = require('../../config/normalize');
1717

1818
describe('Runtime', () => {
1919
let Runtime;
20-
let HasteResolver;
20+
let createHasteMap;
2121
let JSDOMEnvironment;
2222

2323
const rootDir = path.join(__dirname, 'test_root');
2424
const rootPath = path.join(rootDir, 'root.js');
25-
const config = normalizeConfig({
25+
const baseConfig = normalizeConfig({
2626
cacheDirectory: global.CACHE_DIRECTORY,
2727
name: 'Runtime-getTestEnvData-tests',
2828
rootDir,
2929
testEnvData: {someTestData: 42},
3030
});
3131

32-
function buildLoader() {
32+
function buildLoader(config) {
33+
config = Object.assign({}, baseConfig, config);
3334
const environment = new JSDOMEnvironment(config);
34-
const resolver = new HasteResolver(config, {
35-
resetCache: false,
36-
maxWorkers: 1,
37-
});
38-
return resolver.getHasteMap().then(
39-
response => new Runtime(config, environment, response)
40-
);
35+
return createHasteMap(config, {resetCache: false, maxWorkers: 1})
36+
.build()
37+
.then(response => new Runtime(config, environment, response));
4138
}
4239

4340
beforeEach(() => {
4441
Runtime = require('../Runtime');
45-
HasteResolver = require('../../resolvers/HasteResolver');
42+
createHasteMap = require('../../lib/createHasteMap');
4643
JSDOMEnvironment = require('jest-environment-jsdom');
4744
});
4845

4946
pit('passes config data through to jest.envData', () => {
5047
return buildLoader().then(loader => {
5148
const root = loader.requireModule(rootDir, rootPath);
5249
const envData = root.jest.getTestEnvData();
53-
expect(envData).toEqual(config.testEnvData);
50+
expect(envData).toEqual(baseConfig.testEnvData);
5451
});
5552
});
5653

‎src/Runtime/__tests__/Runtime-jest-fn.js‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,28 @@ const normalizeConfig = require('../../config/normalize');
1717

1818
describe('Runtime', () => {
1919
let Runtime;
20-
let HasteResolver;
20+
let createHasteMap;
2121
let JSDOMEnvironment;
2222

2323
const rootDir = path.join(__dirname, 'test_root');
2424
const rootPath = path.join(rootDir, 'root.js');
25-
const config = normalizeConfig({
25+
const baseConfig = normalizeConfig({
2626
cacheDirectory: global.CACHE_DIRECTORY,
2727
name: 'Runtime-jest-fn-tests',
2828
rootDir,
2929
});
3030

31-
function buildLoader() {
31+
function buildLoader(config) {
32+
config = Object.assign({}, baseConfig, config);
3233
const environment = new JSDOMEnvironment(config);
33-
const resolver = new HasteResolver(config, {
34-
resetCache: false,
35-
maxWorkers: 1,
36-
});
37-
return resolver.getHasteMap().then(
38-
response => new Runtime(config, environment, response)
39-
);
34+
return createHasteMap(config, {resetCache: false, maxWorkers: 1})
35+
.build()
36+
.then(response => new Runtime(config, environment, response));
4037
}
4138

4239
beforeEach(() => {
4340
Runtime = require('../Runtime');
44-
HasteResolver = require('../../resolvers/HasteResolver');
41+
createHasteMap = require('../../lib/createHasteMap');
4542
JSDOMEnvironment = require('jest-environment-jsdom');
4643
});
4744

‎src/Runtime/__tests__/Runtime-jsdom-env-test.js‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,30 +18,27 @@ const normalizeConfig = require('../../config/normalize');
1818

1919
describe('Runtime', () => {
2020
let Runtime;
21-
let HasteResolver;
21+
let createHasteMap;
2222
let JSDOMEnvironment;
2323

2424
const rootDir = path.join(__dirname, 'test_root');
25-
const config = normalizeConfig({
25+
const baseConfig = normalizeConfig({
2626
cacheDirectory: global.CACHE_DIRECTORY,
2727
name: 'Runtime-jsdom-env-tests',
2828
rootDir,
2929
});
3030

31-
function buildLoader() {
31+
function buildLoader(config) {
32+
config = Object.assign({}, baseConfig, config);
3233
const environment = new JSDOMEnvironment(config);
33-
const resolver = new HasteResolver(config, {
34-
resetCache: false,
35-
maxWorkers: 1,
36-
});
37-
return resolver.getHasteMap().then(
38-
response => new Runtime(config, environment, response)
39-
);
34+
return createHasteMap(config, {resetCache: false, maxWorkers: 1})
35+
.build()
36+
.then(response => new Runtime(config, environment, response));
4037
}
4138

4239
beforeEach(() => {
4340
Runtime = require('../Runtime');
44-
HasteResolver = require('../../resolvers/HasteResolver');
41+
createHasteMap = require('../../lib/createHasteMap');
4542
JSDOMEnvironment = require('jest-environment-jsdom');
4643
});
4744

‎src/Runtime/__tests__/Runtime-mock-test.js‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,28 @@ const normalizeConfig = require('../../config/normalize');
1717

1818
describe('Runtime', () => {
1919
let Runtime;
20-
let HasteResolver;
20+
let createHasteMap;
2121
let JSDOMEnvironment;
2222

2323
const rootDir = path.join(__dirname, 'test_root');
2424
const rootPath = path.join(rootDir, 'root.js');
25-
const config = normalizeConfig({
25+
const baseConfig = normalizeConfig({
2626
cacheDirectory: global.CACHE_DIRECTORY,
2727
name: 'Runtime-mock-tests',
2828
rootDir,
2929
});
3030

31-
function buildLoader() {
31+
function buildLoader(config) {
32+
config = Object.assign({}, baseConfig, config);
3233
const environment = new JSDOMEnvironment(config);
33-
const resolver = new HasteResolver(config, {
34-
resetCache: false,
35-
maxWorkers: 1,
36-
});
37-
return resolver.getHasteMap().then(
38-
response => new Runtime(config, environment, response)
39-
);
34+
return createHasteMap(config, {resetCache: false, maxWorkers: 1})
35+
.build()
36+
.then(response => new Runtime(config, environment, response));
4037
}
4138

4239
beforeEach(() => {
4340
Runtime = require('../Runtime');
44-
HasteResolver = require('../../resolvers/HasteResolver');
41+
createHasteMap = require('../../lib/createHasteMap');
4542
JSDOMEnvironment = require('jest-environment-jsdom');
4643
});
4744

‎src/Runtime/__tests__/Runtime-requireMock-test.js‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,28 @@ const normalizeConfig = require('../../config/normalize');
1717

1818
describe('Runtime', () => {
1919
let Runtime;
20-
let HasteResolver;
20+
let createHasteMap;
2121
let JSDOMEnvironment;
2222

2323
const rootDir = path.join(__dirname, 'test_root');
2424
const rootPath = path.join(rootDir, 'root.js');
25-
const config = normalizeConfig({
25+
const baseConfig = normalizeConfig({
2626
cacheDirectory: global.CACHE_DIRECTORY,
2727
name: 'Runtime-requireMock-tests',
2828
rootDir,
2929
});
3030

31-
function buildLoader() {
31+
function buildLoader(config) {
32+
config = Object.assign({}, baseConfig, config);
3233
const environment = new JSDOMEnvironment(config);
33-
const resolver = new HasteResolver(config, {
34-
resetCache: false,
35-
maxWorkers: 1,
36-
});
37-
return resolver.getHasteMap().then(
38-
response => new Runtime(config, environment, response)
39-
);
34+
return createHasteMap(config, {resetCache: false, maxWorkers: 1})
35+
.build()
36+
.then(response => new Runtime(config, environment, response));
4037
}
4138

4239
beforeEach(() => {
4340
Runtime = require('../Runtime');
44-
HasteResolver = require('../../resolvers/HasteResolver');
41+
createHasteMap = require('../../lib/createHasteMap');
4542
JSDOMEnvironment = require('jest-environment-jsdom');
4643
});
4744

‎src/Runtime/__tests__/Runtime-requireModule-test.js‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const normalizeConfig = require('../../config/normalize');
1717

1818
describe('Runtime', () => {
1919
let Runtime;
20-
let HasteResolver;
20+
let createHasteMap;
2121
let JSDOMEnvironment;
2222

2323
const rootDir = path.join(__dirname, 'test_root');
@@ -31,18 +31,14 @@ describe('Runtime', () => {
3131
function buildLoader(config) {
3232
config = Object.assign({}, baseConfig, config);
3333
const environment = new JSDOMEnvironment(config);
34-
const resolver = new HasteResolver(config, {
35-
resetCache: false,
36-
maxWorkers: 1,
37-
});
38-
return resolver.getHasteMap().then(
39-
response => new Runtime(config, environment, response)
40-
);
34+
return createHasteMap(config, {resetCache: false, maxWorkers: 1})
35+
.build()
36+
.then(response => new Runtime(config, environment, response));
4137
}
4238

4339
beforeEach(() => {
4440
Runtime = require('../Runtime');
45-
HasteResolver = require('../../resolvers/HasteResolver');
41+
createHasteMap = require('../../lib/createHasteMap');
4642
JSDOMEnvironment = require('jest-environment-jsdom');
4743
});
4844

‎src/Runtime/__tests__/Runtime-requireModuleOrMock-test.js‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const normalizeConfig = require('../../config/normalize');
1717

1818
describe('Runtime', () => {
1919
let Runtime;
20-
let HasteResolver;
20+
let createHasteMap;
2121
let JSDOMEnvironment;
2222

2323
const rootDir = path.join(__dirname, 'test_root');
@@ -37,18 +37,14 @@ describe('Runtime', () => {
3737
function buildLoader(config) {
3838
config = Object.assign({}, baseConfig, config);
3939
const environment = new JSDOMEnvironment(config);
40-
const resolver = new HasteResolver(config, {
41-
resetCache: false,
42-
maxWorkers: 1,
43-
});
44-
return resolver.getHasteMap().then(
45-
response => new Runtime(config, environment, response)
46-
);
40+
return createHasteMap(config, {resetCache: false, maxWorkers: 1})
41+
.build()
42+
.then(response => new Runtime(config, environment, response));
4743
}
4844

4945
beforeEach(() => {
5046
Runtime = require('../Runtime');
51-
HasteResolver = require('../../resolvers/HasteResolver');
47+
createHasteMap = require('../../lib/createHasteMap');
5248
JSDOMEnvironment = require('jest-environment-jsdom');
5349
});
5450

0 commit comments

Comments
 (0)
⚡