Skip to content

Commit d088750

Browse files
cpojerfacebook-github-bot-4
authored andcommitted
Fix tests + enable inline requires on react-native
Reviewed By: @sahrens, @vjeux Differential Revision: D2456607
1 parent 6b733bd commit d088750

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

packager/react-packager/src/Activity/__tests__/Activity-test.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ describe('Activity', () => {
6868

6969
expect(() => {
7070
Activity.endEvent(eid);
71-
}).toThrow('event(3) has already ended!');
71+
}).toThrow('event(1) has already ended!');
7272
});
7373
});
7474

@@ -80,8 +80,8 @@ describe('Activity', () => {
8080
Activity.signal(EVENT_NAME, DATA);
8181
jest.runOnlyPendingTimers();
8282

83-
expect(console.log.mock.calls.length).toBe(3);
84-
const consoleMsg = console.log.mock.calls[2][0];
83+
expect(console.log.mock.calls.length).toBe(1);
84+
const consoleMsg = console.log.mock.calls[0][0];
8585
expect(consoleMsg).toContain(EVENT_NAME);
8686
expect(consoleMsg).toContain(JSON.stringify(DATA));
8787
});

packager/react-packager/src/Cache/__tests__/Cache-test.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@ jest
2121

2222
var Promise = require('promise');
2323
var fs = require('fs');
24+
var os = require('os');
2425
var _ = require('underscore');
2526

27+
var Cache = require('../');
28+
2629
describe('JSTransformer Cache', () => {
27-
var Cache;
2830
beforeEach(() => {
29-
require('os').tmpDir.mockImpl(() => 'tmpDir');
30-
Cache = require('../');
31+
os.tmpDir.mockImpl(() => 'tmpDir');
3132
});
3233

3334
describe('getting/setting', () => {

packager/react-packager/src/FileWatcher/__tests__/FileWatcher-test.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ jest
1919
}
2020
});
2121

22+
var FileWatcher = require('../');
23+
var sane = require('sane');
24+
2225
describe('FileWatcher', function() {
23-
var FileWatcher;
2426
var Watcher;
2527

2628
beforeEach(function() {
27-
require('mock-modules').dumpCache();
28-
FileWatcher = require('../');
29-
Watcher = require('sane').WatchmanWatcher;
29+
Watcher = sane.WatchmanWatcher;
3030
Watcher.prototype.once.mockImplementation(function(type, callback) {
3131
callback();
3232
});

packager/react-packager/src/JSTransformer/__tests__/Transformer-test.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ jest
1515
jest.mock('fs');
1616

1717
var Cache = require('../../Cache');
18+
var Transformer = require('../');
1819
var fs = require('fs');
1920

2021
var options;
2122

2223
describe('Transformer', function() {
23-
var Transformer;
2424
var workers;
2525

2626
beforeEach(function() {
@@ -33,7 +33,6 @@ describe('Transformer', function() {
3333
transformModulePath: '/foo/bar',
3434
cache: new Cache({}),
3535
};
36-
Transformer = require('../');
3736
});
3837

3938
pit('should loadFileAndTransform', function() {

0 commit comments

Comments
 (0)