Skip to content

Commit 827217e

Browse files
kentaromiuraFacebook Github Bot 8
authored andcommitted
Codemodded HasteModuleLoader to Runtime
Summary:I used https://github.com/kentaromiura/Reshape to write a codemod that allowed me to safely codemod HasteModuleLoader and check any file that could use it, I used `Runtime` as a new name as it was one of the alternatives me and cpojer discussed. I've decided to go with a codemod for multiple reasons: we can reuse it for another similar refactor it gave me instantly feedback on what's was missing as I fix the same problem on multiple files at the same time and I was confident I did not miss any if `Runtime` is not a good name I can easily change it and force push again it's fun :) details of the codemod: command: ``` ./reshape -p "../jest/src/HasteModuleLoader/**/*" -e ./test_transforms/objectify.js ./RefactorHasteModuleLoader/move.js ./RefactorHasteModuleLoader/applyChanges.js -aa ./RefactorHasteModuleLoader/fixRequires.js ./RefactorHasteModuleLoader/removeFolder.js ``` RefactorHasteModuleLoader/move.js: ``` var path = require('path'); module.exports = function(actions){ actions.reso Closes jestjs#869 Differential Revision: D3150088 fb-gh-sync-id: 396fc810657e3e4700db2cf39757df2dd485aa1d fbshipit-source-id: 396fc810657e3e4700db2cf39757df2dd485aa1d
1 parent 7e42304 commit 827217e

39 files changed

+51
-51
lines changed
File renamed without changes.

src/HasteModuleLoader/__tests__/HasteModuleLoader-NODE_PATH-test.js renamed to src/Runtime/__tests__/Runtime-NODE_PATH-test.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ jest.mock('../../environments/JSDOMEnvironment');
1515
const path = require('path');
1616
const normalizeConfig = require('../../config/normalize');
1717

18-
describe('HasteModuleLoader', function() {
19-
let HasteModuleLoader;
18+
describe('Runtime', function() {
19+
let Runtime;
2020
let HasteResolver;
2121
let JSDOMEnvironment;
2222

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

@@ -33,14 +33,14 @@ describe('HasteModuleLoader', function() {
3333
const resolver = new HasteResolver(config, {resetCache: false});
3434
return resolver.getHasteMap().then(
3535
response => resolver.end().then(() =>
36-
new HasteModuleLoader(config, environment, response)
36+
new Runtime(config, environment, response)
3737
)
3838
);
3939
}
4040

4141
function initHasteModuleLoader(nodePath) {
4242
process.env.NODE_PATH = nodePath;
43-
HasteModuleLoader = require('../HasteModuleLoader');
43+
Runtime = require('../Runtime');
4444
HasteResolver = require('../../resolvers/HasteResolver');
4545
JSDOMEnvironment = require('../../environments/JSDOMEnvironment');
4646
}
@@ -69,7 +69,7 @@ describe('HasteModuleLoader', function() {
6969

7070
pit('doesnt find modules if NODE_PATH is relative', function() {
7171
const nodePath = process.cwd().substr(path.sep.length) +
72-
'src/HasteModuleLoader/__tests__/NODE_PATH_dir';
72+
'src/Runtime/__tests__/NODE_PATH_dir';
7373
initHasteModuleLoader(nodePath);
7474
return buildLoader().then(function(loader) {
7575
expect(() => {

src/HasteModuleLoader/__tests__/HasteModuleLoader-currentTestPath-test.js renamed to src/Runtime/__tests__/Runtime-currentTestPath-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
jest.disableAutomock();
1313

14-
describe('nodeHasteModuleLoader', function() {
14+
describe('nodeRuntime', function() {
1515
describe('currentTestPath', function() {
1616
it('makes the current test path available', function() {
1717
expect(jest.currentTestPath()).toMatch(/currentTestPath-test/);

src/HasteModuleLoader/__tests__/HasteModuleLoader-genMockFromModule-test.js renamed to src/Runtime/__tests__/Runtime-genMockFromModule-test.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ jest.mock('../../environments/JSDOMEnvironment');
1515
const path = require('path');
1616
const normalizeConfig = require('../../config/normalize');
1717

18-
describe('nodeHasteModuleLoader', function() {
19-
let HasteModuleLoader;
18+
describe('nodeRuntime', function() {
19+
let Runtime;
2020
let HasteResolver;
2121
let JSDOMEnvironment;
2222

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

@@ -33,13 +33,13 @@ describe('nodeHasteModuleLoader', function() {
3333
const resolver = new HasteResolver(config, {resetCache: false});
3434
return resolver.getHasteMap().then(
3535
response => resolver.end().then(() =>
36-
new HasteModuleLoader(config, environment, response)
36+
new Runtime(config, environment, response)
3737
)
3838
);
3939
}
4040

4141
beforeEach(function() {
42-
HasteModuleLoader = require('../HasteModuleLoader');
42+
Runtime = require('../Runtime');
4343
HasteResolver = require('../../resolvers/HasteResolver');
4444
JSDOMEnvironment = require('../../environments/JSDOMEnvironment');
4545
});

src/HasteModuleLoader/__tests__/HasteModuleLoader-getTestEnvData-test.js renamed to src/Runtime/__tests__/Runtime-getTestEnvData-test.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ jest.mock('../../environments/JSDOMEnvironment');
1515
const path = require('path');
1616
const normalizeConfig = require('../../config/normalize');
1717

18-
describe('HasteModuleLoader', function() {
19-
let HasteModuleLoader;
18+
describe('Runtime', function() {
19+
let Runtime;
2020
let HasteResolver;
2121
let JSDOMEnvironment;
2222

2323
const rootDir = path.join(__dirname, 'test_root');
2424
const rootPath = path.join(rootDir, 'root.js');
2525
const config = normalizeConfig({
2626
cacheDirectory: global.CACHE_DIRECTORY,
27-
name: 'HasteModuleLoader-getTestEnvData-tests',
27+
name: 'Runtime-getTestEnvData-tests',
2828
rootDir,
2929
testEnvData: {someTestData: 42},
3030
});
@@ -34,13 +34,13 @@ describe('HasteModuleLoader', function() {
3434
const resolver = new HasteResolver(config, {resetCache: false});
3535
return resolver.getHasteMap().then(
3636
response => resolver.end().then(() =>
37-
new HasteModuleLoader(config, environment, response)
37+
new Runtime(config, environment, response)
3838
)
3939
);
4040
}
4141

4242
beforeEach(function() {
43-
HasteModuleLoader = require('../HasteModuleLoader');
43+
Runtime = require('../Runtime');
4444
HasteResolver = require('../../resolvers/HasteResolver');
4545
JSDOMEnvironment = require('../../environments/JSDOMEnvironment');
4646
});

src/HasteModuleLoader/__tests__/HasteModuleLoader-jest-fn.js renamed to src/Runtime/__tests__/Runtime-jest-fn.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ jest.mock('../../environments/JSDOMEnvironment');
1515
const path = require('path');
1616
const normalizeConfig = require('../../config/normalize');
1717

18-
describe('HasteModuleLoader', () => {
19-
let HasteModuleLoader;
18+
describe('Runtime', () => {
19+
let Runtime;
2020
let HasteResolver;
2121
let JSDOMEnvironment;
2222

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

@@ -33,13 +33,13 @@ describe('HasteModuleLoader', () => {
3333
const resolver = new HasteResolver(config, {resetCache: false});
3434
return resolver.getHasteMap().then(
3535
response => resolver.end().then(() =>
36-
new HasteModuleLoader(config, environment, response)
36+
new Runtime(config, environment, response)
3737
)
3838
);
3939
}
4040

4141
beforeEach(() => {
42-
HasteModuleLoader = require('../HasteModuleLoader');
42+
Runtime = require('../Runtime');
4343
HasteResolver = require('../../resolvers/HasteResolver');
4444
JSDOMEnvironment = require('../../environments/JSDOMEnvironment');
4545
});

src/HasteModuleLoader/__tests__/HasteModuleLoader-jsdom-env-test.js renamed to src/Runtime/__tests__/Runtime-jsdom-env-test.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ jasmine.DEFAULT_TIMEOUT_INTERVAL = 15000;
1616
const path = require('path');
1717
const normalizeConfig = require('../../config/normalize');
1818

19-
describe('HasteModuleLoader', function() {
20-
let HasteModuleLoader;
19+
describe('Runtime', function() {
20+
let Runtime;
2121
let HasteResolver;
2222
let JSDOMEnvironment;
2323

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

@@ -33,13 +33,13 @@ describe('HasteModuleLoader', function() {
3333
const resolver = new HasteResolver(config, {resetCache: false});
3434
return resolver.getHasteMap().then(
3535
response => resolver.end().then(() =>
36-
new HasteModuleLoader(config, environment, response)
36+
new Runtime(config, environment, response)
3737
)
3838
);
3939
}
4040

4141
beforeEach(function() {
42-
HasteModuleLoader = require('../HasteModuleLoader');
42+
Runtime = require('../Runtime');
4343
HasteResolver = require('../../resolvers/HasteResolver');
4444
JSDOMEnvironment = require('../../environments/JSDOMEnvironment');
4545
});
@@ -75,9 +75,9 @@ describe('HasteModuleLoader', function() {
7575
hasThrown = true;
7676

7777
if (process.platform === 'win32') {
78-
expect(err.stack).toMatch(/^Error: throwing fn\s+at sum.+HasteModuleLoader\\__tests__\\test_root\\throwing-fn.js:12:9/);
78+
expect(err.stack).toMatch(/^Error: throwing fn\s+at sum.+Runtime\\__tests__\\test_root\\throwing-fn.js:12:9/);
7979
} else {
80-
expect(err.stack).toMatch(/^Error: throwing fn\s+at sum.+HasteModuleLoader\/__tests__\/test_root\/throwing-fn.js:12:9/);
80+
expect(err.stack).toMatch(/^Error: throwing fn\s+at sum.+Runtime\/__tests__\/test_root\/throwing-fn.js:12:9/);
8181
}
8282
}
8383
expect(hasThrown).toBe(true);

src/HasteModuleLoader/__tests__/HasteModuleLoader-mock-test.js renamed to src/Runtime/__tests__/Runtime-mock-test.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ jest.mock('../../environments/JSDOMEnvironment');
1515
const path = require('path');
1616
const normalizeConfig = require('../../config/normalize');
1717

18-
describe('HasteModuleLoader', () => {
19-
let HasteModuleLoader;
18+
describe('Runtime', () => {
19+
let Runtime;
2020
let HasteResolver;
2121
let JSDOMEnvironment;
2222

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

@@ -33,13 +33,13 @@ describe('HasteModuleLoader', () => {
3333
const resolver = new HasteResolver(config, {resetCache: false});
3434
return resolver.getHasteMap().then(
3535
response => resolver.end().then(() =>
36-
new HasteModuleLoader(config, environment, response)
36+
new Runtime(config, environment, response)
3737
)
3838
);
3939
}
4040

4141
beforeEach(() => {
42-
HasteModuleLoader = require('../HasteModuleLoader');
42+
Runtime = require('../Runtime');
4343
HasteResolver = require('../../resolvers/HasteResolver');
4444
JSDOMEnvironment = require('../../environments/JSDOMEnvironment');
4545
});

src/HasteModuleLoader/__tests__/HasteModuleLoader-requireMock-test.js renamed to src/Runtime/__tests__/Runtime-requireMock-test.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ jest.mock('../../environments/JSDOMEnvironment');
1515
const path = require('path');
1616
const normalizeConfig = require('../../config/normalize');
1717

18-
describe('HasteModuleLoader', function() {
19-
let HasteModuleLoader;
18+
describe('Runtime', function() {
19+
let Runtime;
2020
let HasteResolver;
2121
let JSDOMEnvironment;
2222

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

@@ -33,13 +33,13 @@ describe('HasteModuleLoader', function() {
3333
const resolver = new HasteResolver(config, {resetCache: false});
3434
return resolver.getHasteMap().then(
3535
response => resolver.end().then(() =>
36-
new HasteModuleLoader(config, environment, response)
36+
new Runtime(config, environment, response)
3737
)
3838
);
3939
}
4040

4141
beforeEach(function() {
42-
HasteModuleLoader = require('../HasteModuleLoader');
42+
Runtime = require('../Runtime');
4343
HasteResolver = require('../../resolvers/HasteResolver');
4444
JSDOMEnvironment = require('../../environments/JSDOMEnvironment');
4545
});

src/HasteModuleLoader/__tests__/HasteModuleLoader-requireModule-test.js renamed to src/Runtime/__tests__/Runtime-requireModule-test.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ jest.mock('../../environments/JSDOMEnvironment');
1515
const path = require('path');
1616
const normalizeConfig = require('../../config/normalize');
1717

18-
describe('HasteModuleLoader', function() {
19-
let HasteModuleLoader;
18+
describe('Runtime', function() {
19+
let Runtime;
2020
let HasteResolver;
2121
let JSDOMEnvironment;
2222

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

@@ -34,13 +34,13 @@ describe('HasteModuleLoader', function() {
3434
const resolver = new HasteResolver(config, {resetCache: false});
3535
return resolver.getHasteMap().then(
3636
response => resolver.end().then(() =>
37-
new HasteModuleLoader(config, environment, response)
37+
new Runtime(config, environment, response)
3838
)
3939
);
4040
}
4141

4242
beforeEach(function() {
43-
HasteModuleLoader = require('../HasteModuleLoader');
43+
Runtime = require('../Runtime');
4444
HasteResolver = require('../../resolvers/HasteResolver');
4545
JSDOMEnvironment = require('../../environments/JSDOMEnvironment');
4646
});

src/HasteModuleLoader/__tests__/HasteModuleLoader-requireModuleOrMock-test.js renamed to src/Runtime/__tests__/Runtime-requireModuleOrMock-test.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ jest.mock('../../environments/JSDOMEnvironment');
1515
const path = require('path');
1616
const normalizeConfig = require('../../config/normalize');
1717

18-
describe('HasteModuleLoader', function() {
19-
let HasteModuleLoader;
18+
describe('Runtime', function() {
19+
let Runtime;
2020
let HasteResolver;
2121
let JSDOMEnvironment;
2222

2323
const rootDir = path.join(__dirname, 'test_root');
2424
const rootPath = path.join(rootDir, 'root.js');
2525
const baseConfig = normalizeConfig({
2626
cacheDirectory: global.CACHE_DIRECTORY,
27-
name: 'HasteModuleLoader-requireModuleOrMock-tests',
27+
name: 'Runtime-requireModuleOrMock-tests',
2828
rootDir,
2929
moduleNameMapper: {
3030
'^image![a-zA-Z0-9$_-]+$': 'GlobalImageStub',
@@ -40,13 +40,13 @@ describe('HasteModuleLoader', function() {
4040
const resolver = new HasteResolver(config, {resetCache: false});
4141
return resolver.getHasteMap().then(
4242
response => resolver.end().then(() =>
43-
new HasteModuleLoader(config, environment, response)
43+
new Runtime(config, environment, response)
4444
)
4545
);
4646
}
4747

4848
beforeEach(function() {
49-
HasteModuleLoader = require('../HasteModuleLoader');
49+
Runtime = require('../Runtime');
5050
HasteResolver = require('../../resolvers/HasteResolver');
5151
JSDOMEnvironment = require('../../environments/JSDOMEnvironment');
5252
});

src/__tests__/TestRunner-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ describe('TestRunner', () => {
6161
const rootDir = path.join(
6262
__dirname,
6363
'..',
64-
'HasteModuleLoader',
64+
'Runtime',
6565
'__tests__',
6666
'test_root'
6767
);

src/config/defaults.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ module.exports = {
2020
coverageReporters: ['json', 'text', 'lcov', 'clover'],
2121
globals: {},
2222
moduleFileExtensions: ['js', 'json', 'node'],
23-
moduleLoader: require.resolve('../HasteModuleLoader/HasteModuleLoader'),
23+
moduleLoader: require.resolve('../Runtime/Runtime'),
2424
moduleResolver: require.resolve('../resolvers/HasteResolver'),
2525
haste: {
2626
providesModuleNodeModules: [],

0 commit comments

Comments
 (0)