Skip to content

test: Replace require.requireActual and require.requireMock #18894

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
scttcper merged 1 commit into from
May 19, 2020
+5 −5
Merged

test: Replace require.requireActual and require.requireMock #18894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tests/js/setup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jest.mock('app/utils/domId');
jest.mock('app/utils/withOrganization');
jest.mock('scroll-to-element', () => jest.fn());
jest.mock('react-router', () => {
const ReactRouter = require.requireActual('react-router');
const ReactRouter = jest.requireActual('react-router');
return {
IndexRedirect: ReactRouter.IndexRedirect,
IndexRoute: ReactRouter.IndexRoute,
Expand All @@ -75,7 +75,7 @@ jest.mock('react-lazyload', () => {
});

jest.mock('react-virtualized', () => {
const ActualReactVirtualized = require.requireActual('react-virtualized');
const ActualReactVirtualized = jest.requireActual('react-virtualized');
return {
...ActualReactVirtualized,
AutoSizer: ({children}) => children({width: 100, height: 100}),
Expand All @@ -97,7 +97,7 @@ jest.mock('echarts-for-react/lib/core', () => {
});

jest.mock('@sentry/browser', () => {
const SentryBrowser = require.requireActual('@sentry/browser');
const SentryBrowser = jest.requireActual('@sentry/browser');
return {
init: jest.fn(),
configureScope: jest.fn(),
Expand Down Expand Up @@ -148,7 +148,7 @@ window.$ = window.jQuery = jQuery;
window.scrollTo = jest.fn();

// This is very commonly used, so expose it globally.
window.MockApiClient = require.requireMock('app/api').Client;
window.MockApiClient = jest.requireMock('app/api').Client;

window.TestStubs = {
// react-router's 'router' context
Expand Down
2 changes: 1 addition & 1 deletion tests/js/spec/components/charts/components/xAxis.spec.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import XAxis from 'app/components/charts/components/xAxis';

jest.mock('moment', () => {
const moment = require.requireActual('moment-timezone');
const moment = jest.requireActual('moment-timezone');
moment.tz.setDefault('America/Los_Angeles'); // Whatever timezone you want
return moment;
});
Expand Down