Skip to content
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

Jump to bottom

tests(topbar): replace module mock with dependency injection #14057

Merged
merged 3 commits into from
May 31, 2022
Merged

tests(topbar): replace module mock with dependency injection #14057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03f5171
tests(topbar): remove testdouble
adamraine May 26, 2022
7f135f9
afterEach
adamraine May 26, 2022
76abee0
Merge branch 'master' into topbar-rm-mock
adamraine May 31, 2022
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
12 changes: 10 additions & 2 deletions flow-report/src/topbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,12 @@ import {saveFile} from '../../report/renderer/api';
function saveHtml(flowResult: LH.FlowResult, htmlStr: string) {
const blob = new Blob([htmlStr], {type: 'text/html'});
const filename = getFlowResultFilenamePrefix(flowResult) + '.html';
saveFile(blob, filename);
saveHtml.saveFile(blob, filename);
}

// Store `saveFile` here so we can do dependency injection.
saveHtml.saveFile = saveFile;

/* eslint-disable max-len */
const Logo: FunctionComponent = () => {
return (
Expand Down Expand Up @@ -68,7 +71,7 @@ const TopbarButton: FunctionComponent<{
);
};

export const Topbar: FunctionComponent<{onMenuClick: JSX.MouseEventHandler<HTMLButtonElement>}> =
const Topbar: FunctionComponent<{onMenuClick: JSX.MouseEventHandler<HTMLButtonElement>}> =
({onMenuClick}) => {
const flowResult = useFlowResult();
const strings = useLocalizedStrings();
Expand Down Expand Up @@ -118,3 +121,8 @@ export const Topbar: FunctionComponent<{onMenuClick: JSX.MouseEventHandler<HTMLB
</div>
);
};

export {
Topbar,
saveHtml,
};
15 changes: 7 additions & 8 deletions flow-report/test/topbar-test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,10 @@ import {act, render} from '@testing-library/preact';

import {FlowResultContext, OptionsContext} from '../src/util';
import {I18nProvider} from '../src/i18n/i18n';
import {Topbar, saveHtml} from '../src/topbar';

const mockSaveFile = jest.fn();
jest.unstable_mockModule('../../../report/renderer/api.js', () => ({
saveFile: mockSaveFile,
}));

let Topbar: typeof import('../src/topbar').Topbar;
beforeAll(async () => {
Topbar = (await import('../src/topbar')).Topbar;
});
const defaultSaveFile = saveHtml.saveFile;

const flowResult = {
name: 'User flow',
Expand Down Expand Up @@ -47,7 +41,12 @@ beforeEach(() => {
);
});

afterEach(() => {
saveHtml.saveFile = defaultSaveFile;
});

it('save button opens save dialog for HTML file', async () => {
saveHtml.saveFile = mockSaveFile;
options = {getReportHtml: () => '<html></html>'};
const root = render(<Topbar onMenuClick={() => {}}/>, {wrapper});

Expand Down