Skip to content

Commit

Permalink
Remove HasteResolver completely.
Browse files Browse the repository at this point in the history
  • Loading branch information
@cpojer
cpojer committed Apr 18, 2016
1 parent b743e43 commit fbea74b
Show file tree
Hide file tree
Showing 12 changed files with 75 additions and 150 deletions.
19 changes: 8 additions & 11 deletions src/Runtime/__tests__/Runtime-NODE_PATH-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,32 +17,29 @@ const normalizeConfig = require('../../config/normalize');

describe('Runtime', () => {
let Runtime;
let HasteResolver;
let createHasteMap;
let JSDOMEnvironment;

const rootDir = path.join(__dirname, 'test_root');
const rootPath = path.join(rootDir, 'root.js');
const config = normalizeConfig({
const baseConfig = normalizeConfig({
cacheDirectory: global.CACHE_DIRECTORY,
name: 'Runtime-NODE_PATH-tests',
rootDir: path.resolve(__dirname, 'test_root'),
});

function buildLoader() {
function buildLoader(config) {
config = Object.assign({}, baseConfig, config);
const environment = new JSDOMEnvironment(config);
const resolver = new HasteResolver(config, {
resetCache: false,
maxWorkers: 1,
});
return resolver.getHasteMap().then(
response => new Runtime(config, environment, response)
);
return createHasteMap(config, {resetCache: false, maxWorkers: 1})
.build()
.then(response => new Runtime(config, environment, response));
}

function initHasteModuleLoader(nodePath) {
process.env.NODE_PATH = nodePath;
Runtime = require('../Runtime');
HasteResolver = require('../../resolvers/HasteResolver');
createHasteMap = require('../../lib/createHasteMap');
JSDOMEnvironment = require('jest-environment-jsdom');
}

Expand Down
19 changes: 8 additions & 11 deletions src/Runtime/__tests__/Runtime-genMockFromModule-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,31 +17,28 @@ const normalizeConfig = require('../../config/normalize');

describe('nodeRuntime', () => {
let Runtime;
let HasteResolver;
let createHasteMap;
let JSDOMEnvironment;

const rootDir = path.resolve(__dirname, 'test_root');
const rootPath = path.resolve(rootDir, 'root.js');
const config = normalizeConfig({
const baseConfig = normalizeConfig({
cacheDirectory: global.CACHE_DIRECTORY,
name: 'nodeRuntime-genMockFromModule-tests',
rootDir,
});

function buildLoader() {
function buildLoader(config) {
config = Object.assign({}, baseConfig, config);
const environment = new JSDOMEnvironment(config);
const resolver = new HasteResolver(config, {
resetCache: false,
maxWorkers: 1,
});
return resolver.getHasteMap().then(
response => new Runtime(config, environment, response)
);
return createHasteMap(config, {resetCache: false, maxWorkers: 1})
.build()
.then(response => new Runtime(config, environment, response));
}

beforeEach(() => {
Runtime = require('../Runtime');
HasteResolver = require('../../resolvers/HasteResolver');
createHasteMap = require('../../lib/createHasteMap');
JSDOMEnvironment = require('jest-environment-jsdom');
});

Expand Down
21 changes: 9 additions & 12 deletions src/Runtime/__tests__/Runtime-getTestEnvData-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,40 +17,37 @@ const normalizeConfig = require('../../config/normalize');

describe('Runtime', () => {
let Runtime;
let HasteResolver;
let createHasteMap;
let JSDOMEnvironment;

const rootDir = path.join(__dirname, 'test_root');
const rootPath = path.join(rootDir, 'root.js');
const config = normalizeConfig({
const baseConfig = normalizeConfig({
cacheDirectory: global.CACHE_DIRECTORY,
name: 'Runtime-getTestEnvData-tests',
rootDir,
testEnvData: {someTestData: 42},
});

function buildLoader() {
function buildLoader(config) {
config = Object.assign({}, baseConfig, config);
const environment = new JSDOMEnvironment(config);
const resolver = new HasteResolver(config, {
resetCache: false,
maxWorkers: 1,
});
return resolver.getHasteMap().then(
response => new Runtime(config, environment, response)
);
return createHasteMap(config, {resetCache: false, maxWorkers: 1})
.build()
.then(response => new Runtime(config, environment, response));
}

beforeEach(() => {
Runtime = require('../Runtime');
HasteResolver = require('../../resolvers/HasteResolver');
createHasteMap = require('../../lib/createHasteMap');
JSDOMEnvironment = require('jest-environment-jsdom');
});

pit('passes config data through to jest.envData', () => {
return buildLoader().then(loader => {
const root = loader.requireModule(rootDir, rootPath);
const envData = root.jest.getTestEnvData();
expect(envData).toEqual(config.testEnvData);
expect(envData).toEqual(baseConfig.testEnvData);
});
});

Expand Down
19 changes: 8 additions & 11 deletions src/Runtime/__tests__/Runtime-jest-fn.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,31 +17,28 @@ const normalizeConfig = require('../../config/normalize');

describe('Runtime', () => {
let Runtime;
let HasteResolver;
let createHasteMap;
let JSDOMEnvironment;

const rootDir = path.join(__dirname, 'test_root');
const rootPath = path.join(rootDir, 'root.js');
const config = normalizeConfig({
const baseConfig = normalizeConfig({
cacheDirectory: global.CACHE_DIRECTORY,
name: 'Runtime-jest-fn-tests',
rootDir,
});

function buildLoader() {
function buildLoader(config) {
config = Object.assign({}, baseConfig, config);
const environment = new JSDOMEnvironment(config);
const resolver = new HasteResolver(config, {
resetCache: false,
maxWorkers: 1,
});
return resolver.getHasteMap().then(
response => new Runtime(config, environment, response)
);
return createHasteMap(config, {resetCache: false, maxWorkers: 1})
.build()
.then(response => new Runtime(config, environment, response));
}

beforeEach(() => {
Runtime = require('../Runtime');
HasteResolver = require('../../resolvers/HasteResolver');
createHasteMap = require('../../lib/createHasteMap');
JSDOMEnvironment = require('jest-environment-jsdom');
});

Expand Down
19 changes: 8 additions & 11 deletions src/Runtime/__tests__/Runtime-jsdom-env-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,30 +18,27 @@ const normalizeConfig = require('../../config/normalize');

describe('Runtime', () => {
let Runtime;
let HasteResolver;
let createHasteMap;
let JSDOMEnvironment;

const rootDir = path.join(__dirname, 'test_root');
const config = normalizeConfig({
const baseConfig = normalizeConfig({
cacheDirectory: global.CACHE_DIRECTORY,
name: 'Runtime-jsdom-env-tests',
rootDir,
});

function buildLoader() {
function buildLoader(config) {
config = Object.assign({}, baseConfig, config);
const environment = new JSDOMEnvironment(config);
const resolver = new HasteResolver(config, {
resetCache: false,
maxWorkers: 1,
});
return resolver.getHasteMap().then(
response => new Runtime(config, environment, response)
);
return createHasteMap(config, {resetCache: false, maxWorkers: 1})
.build()
.then(response => new Runtime(config, environment, response));
}

beforeEach(() => {
Runtime = require('../Runtime');
HasteResolver = require('../../resolvers/HasteResolver');
createHasteMap = require('../../lib/createHasteMap');
JSDOMEnvironment = require('jest-environment-jsdom');
});

Expand Down
19 changes: 8 additions & 11 deletions src/Runtime/__tests__/Runtime-mock-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,31 +17,28 @@ const normalizeConfig = require('../../config/normalize');

describe('Runtime', () => {
let Runtime;
let HasteResolver;
let createHasteMap;
let JSDOMEnvironment;

const rootDir = path.join(__dirname, 'test_root');
const rootPath = path.join(rootDir, 'root.js');
const config = normalizeConfig({
const baseConfig = normalizeConfig({
cacheDirectory: global.CACHE_DIRECTORY,
name: 'Runtime-mock-tests',
rootDir,
});

function buildLoader() {
function buildLoader(config) {
config = Object.assign({}, baseConfig, config);
const environment = new JSDOMEnvironment(config);
const resolver = new HasteResolver(config, {
resetCache: false,
maxWorkers: 1,
});
return resolver.getHasteMap().then(
response => new Runtime(config, environment, response)
);
return createHasteMap(config, {resetCache: false, maxWorkers: 1})
.build()
.then(response => new Runtime(config, environment, response));
}

beforeEach(() => {
Runtime = require('../Runtime');
HasteResolver = require('../../resolvers/HasteResolver');
createHasteMap = require('../../lib/createHasteMap');
JSDOMEnvironment = require('jest-environment-jsdom');
});

Expand Down
19 changes: 8 additions & 11 deletions src/Runtime/__tests__/Runtime-requireMock-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,31 +17,28 @@ const normalizeConfig = require('../../config/normalize');

describe('Runtime', () => {
let Runtime;
let HasteResolver;
let createHasteMap;
let JSDOMEnvironment;

const rootDir = path.join(__dirname, 'test_root');
const rootPath = path.join(rootDir, 'root.js');
const config = normalizeConfig({
const baseConfig = normalizeConfig({
cacheDirectory: global.CACHE_DIRECTORY,
name: 'Runtime-requireMock-tests',
rootDir,
});

function buildLoader() {
function buildLoader(config) {
config = Object.assign({}, baseConfig, config);
const environment = new JSDOMEnvironment(config);
const resolver = new HasteResolver(config, {
resetCache: false,
maxWorkers: 1,
});
return resolver.getHasteMap().then(
response => new Runtime(config, environment, response)
);
return createHasteMap(config, {resetCache: false, maxWorkers: 1})
.build()
.then(response => new Runtime(config, environment, response));
}

beforeEach(() => {
Runtime = require('../Runtime');
HasteResolver = require('../../resolvers/HasteResolver');
createHasteMap = require('../../lib/createHasteMap');
JSDOMEnvironment = require('jest-environment-jsdom');
});

Expand Down
14 changes: 5 additions & 9 deletions src/Runtime/__tests__/Runtime-requireModule-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const normalizeConfig = require('../../config/normalize');

describe('Runtime', () => {
let Runtime;
let HasteResolver;
let createHasteMap;
let JSDOMEnvironment;

const rootDir = path.join(__dirname, 'test_root');
Expand All @@ -31,18 +31,14 @@ describe('Runtime', () => {
function buildLoader(config) {
config = Object.assign({}, baseConfig, config);
const environment = new JSDOMEnvironment(config);
const resolver = new HasteResolver(config, {
resetCache: false,
maxWorkers: 1,
});
return resolver.getHasteMap().then(
response => new Runtime(config, environment, response)
);
return createHasteMap(config, {resetCache: false, maxWorkers: 1})
.build()
.then(response => new Runtime(config, environment, response));
}

beforeEach(() => {
Runtime = require('../Runtime');
HasteResolver = require('../../resolvers/HasteResolver');
createHasteMap = require('../../lib/createHasteMap');
JSDOMEnvironment = require('jest-environment-jsdom');
});

Expand Down
14 changes: 5 additions & 9 deletions src/Runtime/__tests__/Runtime-requireModuleOrMock-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const normalizeConfig = require('../../config/normalize');

describe('Runtime', () => {
let Runtime;
let HasteResolver;
let createHasteMap;
let JSDOMEnvironment;

const rootDir = path.join(__dirname, 'test_root');
Expand All @@ -37,18 +37,14 @@ describe('Runtime', () => {
function buildLoader(config) {
config = Object.assign({}, baseConfig, config);
const environment = new JSDOMEnvironment(config);
const resolver = new HasteResolver(config, {
resetCache: false,
maxWorkers: 1,
});
return resolver.getHasteMap().then(
response => new Runtime(config, environment, response)
);
return createHasteMap(config, {resetCache: false, maxWorkers: 1})
.build()
.then(response => new Runtime(config, environment, response));
}

beforeEach(() => {
Runtime = require('../Runtime');
HasteResolver = require('../../resolvers/HasteResolver');
createHasteMap = require('../../lib/createHasteMap');
JSDOMEnvironment = require('jest-environment-jsdom');
});

Expand Down
Loading

0 comments on commit fbea74b

Please sign in to comment.