Skip to content

Commit 0f30ed4

Browse files
idefacebook-github-bot
authored andcommitted
Migrate IntegrationTests from Haste to path-based requires (#24750)
Summary: This is another step in moving RN towards standard path-based requires. All the requires in `IntegrationTests` have been rewritten to use relative requires. This commit uses requires that are relative to `react-native/...` assuming that IntegrationTests are meant to try consuming RN rather than being part of it. See the umbrella issue at #24316 for more detail. [General] [Changed] - Migrate IntegrationTests from Haste to path-based requires Pull Request resolved: #24750 Differential Revision: D15258019 Pulled By: cpojer fbshipit-source-id: 01ac01ba4699f8ba424353f74e745b4057f79b59
1 parent 58608d5 commit 0f30ed4

8 files changed

+16
-13
lines changed

IntegrationTests/AccessibilityManagerTest.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
const React = require('react');
1414
const ReactNative = require('react-native');
1515
const {View} = ReactNative;
16-
const RCTDeviceEventEmitter = require('RCTDeviceEventEmitter');
16+
const RCTDeviceEventEmitter = require('react-native/Libraries/EventEmitter/RCTDeviceEventEmitter');
1717
const {TestModule, AccessibilityManager} = ReactNative.NativeModules;
1818

1919
class AccessibilityManagerTest extends React.Component<{}> {

IntegrationTests/AppEventsTest.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const ReactNative = require('react-native');
1515
const {NativeAppEventEmitter, StyleSheet, Text, View} = ReactNative;
1616
const {TestModule} = ReactNative.NativeModules;
1717

18-
const deepDiffer = require('deepDiffer');
18+
const deepDiffer = require('react-native/Libraries/Utilities/differ/deepDiffer');
1919

2020
const TEST_PAYLOAD = {foo: 'bar'};
2121

IntegrationTests/AsyncStorageTest.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const ReactNative = require('react-native');
1515
const {AsyncStorage, Text, View, StyleSheet} = ReactNative;
1616
const {TestModule} = ReactNative.NativeModules;
1717

18-
const deepDiffer = require('deepDiffer');
18+
const deepDiffer = require('react-native/Libraries/Utilities/differ/deepDiffer');
1919

2020
const DEBUG = false;
2121

IntegrationTests/IntegrationTestsApp.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
'use strict';
1212

13-
require('InitializeCore');
13+
require('react-native/Libraries/Core/InitializeCore');
1414
const React = require('react');
1515
const ReactNative = require('react-native');
1616
const {
@@ -46,7 +46,7 @@ TESTS.forEach(
4646
);
4747

4848
// Modules required for integration tests
49-
require('LoggingTestModule');
49+
require('./LoggingTestModule');
5050

5151
type Test = any;
5252

IntegrationTests/LayoutEventsTest.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,18 @@ const ReactNative = require('react-native');
1515
const {Image, LayoutAnimation, StyleSheet, Text, View} = ReactNative;
1616
const {TestModule} = ReactNative.NativeModules;
1717

18-
import type {ViewStyleProp} from 'StyleSheet';
18+
import type {ViewStyleProp} from 'react-native/Libraries/StyleSheet/StyleSheet';
1919

20-
const deepDiffer = require('deepDiffer');
20+
const deepDiffer = require('react-native/Libraries/Utilities/differ/deepDiffer');
2121

2222
function debug(...args) {
2323
// console.log.apply(null, arguments);
2424
}
2525

26-
import type {Layout, LayoutEvent} from 'CoreEventTypes';
26+
import type {
27+
Layout,
28+
LayoutEvent,
29+
} from 'react-native/Libraries/Types/CoreEventTypes';
2730

2831
type Props = $ReadOnly<{||}>;
2932

IntegrationTests/LoggingTestModule.js

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

1010
'use strict';
1111

12-
const BatchedBridge = require('BatchedBridge');
12+
const BatchedBridge = require('react-native/Libraries/BatchedBridge/BatchedBridge');
1313

1414
const warning = require('fbjs/lib/warning');
1515
const invariant = require('invariant');

IntegrationTests/ReactContentSizeUpdateTest.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212

1313
const React = require('react');
1414
const ReactNative = require('react-native');
15-
const RCTNativeAppEventEmitter = require('RCTNativeAppEventEmitter');
15+
const RCTNativeAppEventEmitter = require('react-native/Libraries/EventEmitter/RCTNativeAppEventEmitter');
1616

1717
const {View} = ReactNative;
1818

1919
const {TestModule} = ReactNative.NativeModules;
20-
import type EmitterSubscription from 'EmitterSubscription';
20+
import type EmitterSubscription from 'react-native/Libraries/vendor/emitter/EmitterSubscription';
2121

2222
const reactViewWidth = 101;
2323
const reactViewHeight = 102;

IntegrationTests/SizeFlexibilityUpdateTest.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212

1313
const React = require('react');
1414
const ReactNative = require('react-native');
15-
const RCTNativeAppEventEmitter = require('RCTNativeAppEventEmitter');
15+
const RCTNativeAppEventEmitter = require('react-native/Libraries/EventEmitter/RCTNativeAppEventEmitter');
1616
const {View} = ReactNative;
1717

1818
const {TestModule} = ReactNative.NativeModules;
19-
import type EmitterSubscription from 'EmitterSubscription';
19+
import type EmitterSubscription from 'react-native/Libraries/vendor/emitter/EmitterSubscription';
2020

2121
const reactViewWidth = 111;
2222
const reactViewHeight = 222;

0 commit comments

Comments
 (0)