Skip to content

Commit adf32fe

Browse files
authored
Merge pull request #129 from shayan-deriv/shayan/test-auth-failing-issue
Shayan/checking auth failing issue + fixed test failing issue
2 parents 7837d5f + 2d4832b commit adf32fe

File tree

4 files changed

+46
-15
lines changed

4 files changed

+46
-15
lines changed

src/components/AppFooter/__tests__/AppFooter.spec.tsx

+14
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,20 @@ import AppFooter from '../AppFooter';
1010
jest.mock('@deriv-com/translations');
1111
jest.mock('@/hooks');
1212

13+
Object.defineProperty(window, 'matchMedia', {
14+
value: jest.fn().mockImplementation(query => ({
15+
addEventListener: jest.fn(),
16+
addListener: jest.fn(), // Deprecated
17+
dispatchEvent: jest.fn(),
18+
matches: false,
19+
media: query,
20+
onchange: null,
21+
removeEventListener: jest.fn(),
22+
removeListener: jest.fn(), // Deprecated
23+
})),
24+
writable: true,
25+
});
26+
1327
const AppFooterComponent = () => (
1428
<BrowserRouter>
1529
<QueryParamProvider adapter={ReactRouter5Adapter}>

src/components/AppFooter/__tests__/ServerTime.spec.tsx

+14
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,20 @@ jest.mock('@/utils', () => ({
1313
epochToUTC: jest.fn(),
1414
}));
1515

16+
Object.defineProperty(window, 'matchMedia', {
17+
value: jest.fn().mockImplementation(query => ({
18+
addEventListener: jest.fn(),
19+
addListener: jest.fn(), // Deprecated
20+
dispatchEvent: jest.fn(),
21+
matches: false,
22+
media: query,
23+
onchange: null,
24+
removeEventListener: jest.fn(),
25+
removeListener: jest.fn(), // Deprecated
26+
})),
27+
writable: true,
28+
});
29+
1630
describe('ServerTime component', () => {
1731
const mockTime = 1625074800; // Example epoch time
1832
const mockUTCFormat = '2021-06-30 14:00 GMT';

src/components/AppHeader/__tests__/AppHeader.spec.tsx

+17-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
import { ReactNode } from 'react';
2+
import { BrowserRouter } from 'react-router-dom';
3+
import { QueryParamProvider } from 'use-query-params';
4+
import { ReactRouter5Adapter } from 'use-query-params/adapters/react-router-5';
25
import { useAuthData } from '@deriv-com/api-hooks';
36
import { render, screen } from '@testing-library/react';
47
import userEvent from '@testing-library/user-event';
@@ -81,7 +84,13 @@ describe('<AppHeader/>', () => {
8184
});
8285

8386
it('should render the header and handle login when there are no P2P accounts', async () => {
84-
render(<AppHeader />);
87+
render(
88+
<BrowserRouter>
89+
<QueryParamProvider adapter={ReactRouter5Adapter}>
90+
<AppHeader />
91+
</QueryParamProvider>
92+
</BrowserRouter>
93+
);
8594
await userEvent.click(screen.getByRole('button', { name: 'Log in' }));
8695

8796
expect(window.open).toHaveBeenCalledWith(expect.any(String), '_self');
@@ -104,7 +113,13 @@ describe('<AppHeader/>', () => {
104113
writable: true,
105114
});
106115

107-
render(<AppHeader />);
116+
render(
117+
<BrowserRouter>
118+
<QueryParamProvider adapter={ReactRouter5Adapter}>
119+
<AppHeader />
120+
</QueryParamProvider>
121+
</BrowserRouter>
122+
);
108123
const logoutButton = screen.getByRole('button', { name: 'Logout' });
109124
const { logout } = mockUseAuthData();
110125
expect(logoutButton).toBeInTheDocument();

src/components/DerivIframe/DerivIframe.tsx

+1-13
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
1-
import { URLConstants } from '@deriv-com/utils';
2-
31
const DerivIframe = () => {
4-
const getAllowedLocalStorageOrigin = () => {
5-
const hostName = window.location.hostname;
6-
if (/^staging-p2p\.deriv\.com$/i.test(hostName)) {
7-
return URLConstants.derivP2pStaging;
8-
} else if (/^localhost$/i.test(hostName)) {
9-
return window.location.origin;
10-
}
11-
return URLConstants.derivP2pProduction;
12-
};
13-
14-
const origin = getAllowedLocalStorageOrigin();
2+
const origin = window.location.origin;
153

164
return (
175
<iframe

0 commit comments

Comments
 (0)