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

Refactor cypress/helpers/util.ts #4340

Merged
merged 7 commits into from
Sep 6, 2023
Merged

Refactor cypress/helpers/util.ts #4340

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3f7bafb
I refactored the code to improve its time complexity by removing unne…
RohanHandore Apr 24, 2023
fd39ea8
Update cypress/helpers/util.js
sidharthv96 Sep 6, 2023
bf18f25
Merge branch 'develop' into pr/RohanHandore/4340
sidharthv96 Sep 6, 2023
8662b33
core: Adapt changes from 3f7bafb2d7
sidharthv96 Sep 6, 2023
7d2b39f
refactor: Use `||` instead of `??`
sidharthv96 Sep 6, 2023
f0d3888
Merge branch 'develop' into pr/RohanHandore/4340
sidharthv96 Sep 6, 2023
4e142c4
Merge branch 'develop' into pr/RohanHandore/4340
sidharthv96 Sep 6, 2023
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
38 changes: 13 additions & 25 deletions cypress/helpers/util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,41 +52,29 @@ export const imgSnapshotTest = (
api = false,
validation?: any
): void => {
cy.log(JSON.stringify(_options));
const options: CypressMermaidConfig = Object.assign(_options);
if (!options.fontFamily) {
options.fontFamily = 'courier';
}
if (!options.sequence) {
options.sequence = {};
}
if (!options.sequence || (options.sequence && !options.sequence.actorFontFamily)) {
options.sequence.actorFontFamily = 'courier';
}
if (options.sequence && !options.sequence.noteFontFamily) {
options.sequence.noteFontFamily = 'courier';
}
options.sequence.actorFontFamily = 'courier';
options.sequence.noteFontFamily = 'courier';
options.sequence.messageFontFamily = 'courier';
if (options.sequence && !options.sequence.actorFontFamily) {
options.sequence.actorFontFamily = 'courier';
}
if (!options.fontSize) {
options.fontSize = 16;
}
const options: CypressMermaidConfig = {
..._options,
fontFamily: _options.fontFamily || 'courier',
// @ts-ignore TODO: Fix type of fontSize
fontSize: _options.fontSize || '16px',
sequence: {
...(_options.sequence || {}),
actorFontFamily: 'courier',
noteFontFamily: _options.sequence?.noteFontFamily || 'courier',
messageFontFamily: 'courier',
},
};

const url: string = mermaidUrl(graphStr, options, api);
openURLAndVerifyRendering(url, options, validation);
};

export const urlSnapshotTest = (
url: string,
_options: CypressMermaidConfig,
options: CypressMermaidConfig,
_api = false,
validation?: any
): void => {
const options: CypressMermaidConfig = Object.assign(_options);
openURLAndVerifyRendering(url, options, validation);
};

Expand Down
Loading