Skip to content

Commit b06128d

Browse files
cleaning up tests
1 parent 44918a6 commit b06128d

File tree

2 files changed

+24
-41
lines changed

2 files changed

+24
-41
lines changed

plugins/node/instrumentation-react-native-navigation/test/NativeNavigationTracker.test.tsx

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,21 @@ import sinon from 'sinon';
2121
import { NativeNavigationTracker } from '../src';
2222
import useProvider from './helpers/hooks/useProvider';
2323
import api from '@opentelemetry/api';
24-
import * as rnn from './helpers/react-native-navigation';
25-
import {
26-
INativeNavigationContainer,
27-
NavigationTrackerConfig,
28-
} from '../src/types/navigation';
24+
import { TrackerConfig } from '../src/types/navigation';
25+
26+
const sandbox = sinon.createSandbox();
27+
const mockDidAppearListener = sandbox.spy();
28+
const mockDidDisappearListener = sandbox.spy();
2929

3030
const AppWithProvider: FC<{
3131
shouldPassProvider: boolean;
32-
config?: NavigationTrackerConfig;
32+
config?: TrackerConfig;
3333
}> = ({ shouldPassProvider, config }) => {
34-
const { Navigation } = rnn;
3534
const provider = useProvider();
36-
const ref = useRef(Navigation.events());
35+
const ref = useRef({
36+
registerComponentDidAppearListener: mockDidAppearListener,
37+
registerComponentDidDisappearListener: mockDidDisappearListener,
38+
});
3739

3840
return (
3941
<NativeNavigationTracker
@@ -47,10 +49,6 @@ const AppWithProvider: FC<{
4749
};
4850

4951
describe('NativeNavigationTracker.tsx', function () {
50-
const sandbox = sinon.createSandbox();
51-
const mockDidAppearListener = sandbox.spy();
52-
const mockDidDisappearListener = sandbox.spy();
53-
5452
let mockConsoleDir: sinon.SinonSpy;
5553
let mockConsoleInfo: sinon.SinonSpy;
5654
let mockConsoleWarn: sinon.SinonSpy;
@@ -59,12 +57,6 @@ describe('NativeNavigationTracker.tsx', function () {
5957
let mockGlobalTracer: sinon.SinonSpy;
6058

6159
beforeEach(function () {
62-
const { Navigation } = rnn;
63-
sandbox.stub(Navigation, 'events').returns({
64-
registerComponentDidAppearListener: mockDidAppearListener,
65-
registerComponentDidDisappearListener: mockDidDisappearListener,
66-
} as unknown as INativeNavigationContainer);
67-
6860
mockAddEventListener = sandbox.spy(AppState, 'addEventListener');
6961
mockConsoleDir = sandbox.spy(console, 'dir');
7062
mockConsoleInfo = sandbox.spy(console, 'info');

plugins/node/instrumentation-react-native-navigation/test/NavigationTracker.test.tsx

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -13,32 +13,38 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
import { FC, ForwardedRef } from 'react';
16+
import { FC } from 'react';
1717
import React, { render } from '@testing-library/react';
1818

1919
import useProvider from './helpers/hooks/useProvider';
2020

21-
import { NavRef } from '../src/hooks/useNavigationTracker';
2221
import { ATTRIBUTES } from '../src/utils/spanFactory';
2322
import sinon from 'sinon';
2423
import { NavigationTracker } from '../src';
2524

2625
import { AppState } from 'react-native';
2726
import api from '@opentelemetry/api';
28-
import * as rnn from './helpers/react-navigation-native';
29-
import { NavigationTrackerConfig } from '../src/types/navigation';
27+
import { TrackerConfig } from '../src/types/navigation';
28+
29+
const sandbox = sinon.createSandbox();
30+
31+
const mockAddListener = sandbox.stub();
32+
const mockGetCurrentRoute = sandbox.stub();
3033

3134
const AppWithProvider: FC<{
3235
shouldPassProvider: boolean;
33-
config?: NavigationTrackerConfig;
36+
config?: TrackerConfig;
3437
}> = ({ shouldPassProvider, config }) => {
35-
const { useNavigationContainerRef } = rnn;
36-
const ref = useNavigationContainerRef();
3738
const provider = useProvider();
3839

3940
return (
4041
<NavigationTracker
41-
ref={ref as unknown as ForwardedRef<NavRef>}
42+
ref={{
43+
current: {
44+
getCurrentRoute: mockGetCurrentRoute,
45+
addListener: mockAddListener,
46+
},
47+
}}
4248
config={config}
4349
provider={shouldPassProvider ? provider.current : undefined}
4450
>
@@ -48,11 +54,6 @@ const AppWithProvider: FC<{
4854
};
4955

5056
describe('NavigationTracker.tsx', function () {
51-
const sandbox = sinon.createSandbox();
52-
53-
const mockAddListener = sandbox.stub();
54-
const mockGetCurrentRoute = sandbox.stub();
55-
5657
let mockAddEventListener: sinon.SinonSpy;
5758
let mockConsoleDir: sinon.SinonSpy;
5859
let mockConsoleInfo: sinon.SinonSpy;
@@ -61,16 +62,6 @@ describe('NavigationTracker.tsx', function () {
6162
let mockGlobalTracer: sinon.SinonSpy;
6263

6364
beforeEach(function () {
64-
sandbox.stub(rnn, 'useNavigationContainerRef').callsFake(
65-
() =>
66-
({
67-
current: {
68-
getCurrentRoute: mockGetCurrentRoute,
69-
addListener: mockAddListener,
70-
},
71-
} as unknown as ReturnType<typeof rnn.useNavigationContainerRef>)
72-
);
73-
7465
mockAddEventListener = sandbox.spy(AppState, 'addEventListener');
7566
mockConsoleDir = sandbox.spy(console, 'dir');
7667
mockConsoleInfo = sandbox.spy(console, 'info');

0 commit comments

Comments
 (0)