Skip to content
New issue

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

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

Already on GitHub? # to your account

Add Modes Suffix to CLI Progress Indicator #803

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions node-src/main.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ jest.mock('node-fetch', () =>
{
spec: { name: 'name', component: { displayName: 'component' } },
parameters: { viewport: 320, viewportIsDefault: false },
mode: { name: '320px' },
},
],
startedAt: Date.now(),
Expand Down
13 changes: 10 additions & 3 deletions node-src/tasks/report.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ const ReportQuery = `
viewport
viewportIsDefault
}
mode {
name
}
}
}
}
Expand Down Expand Up @@ -59,6 +62,9 @@ interface ReportQueryResult {
viewport: number;
viewportIsDefault: boolean;
};
mode: {
name: string;
};
}[];
};
};
Expand Down Expand Up @@ -91,12 +97,13 @@ export const generateReport = async (ctx: Context) => {
.property('buildUrl', build.webUrl)
.property('storybookUrl', baseStorybookUrl(build.cachedUrl));

build.tests.forEach(({ status, result, spec, parameters }) => {
const suffix = parameters.viewportIsDefault ? '' : ` [${parameters.viewport}px]`;
build.tests.forEach(({ status, result, spec, parameters, mode }) => {
const testSuffixName = mode.name || `[${parameters.viewport}px]`;
const suffix = parameters.viewportIsDefault ? '' : testSuffixName;
const testCase = suite
.testCase()
.className(spec.component.name.replace(/[|/]/g, '.')) // transform story path to class path
.name(`${spec.name}${suffix}`);
.name(`${spec.name} ${suffix}`);

switch (status) {
case 'FAILED':
Expand Down
7 changes: 4 additions & 3 deletions node-src/tasks/snapshot.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,10 @@ export const takeSnapshots = async (ctx: Context, task: Task) => {
const testLabels =
ctx.options.interactive &&
testCount === actualTestCount &&
tests.map(({ spec, parameters }) => {
const suffix = parameters.viewportIsDefault ? '' : ` [${parameters.viewport}px]`;
return `${spec.component.displayName} › ${spec.name}${suffix}`;
tests.map(({ spec, parameters, mode }) => {
const testSuffixName = mode.name || `[${parameters.viewport}px]`;
const suffix = parameters.viewportIsDefault ? '' : testSuffixName;
return `${spec.component.displayName} › ${spec.name} ${suffix}`;
});

const updateProgress = throttle(
Expand Down
3 changes: 3 additions & 0 deletions node-src/tasks/verify.ts
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,9 @@ const VerifyBuildQuery = `
viewport
viewportIsDefault
}
mode {
name
}
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions node-src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,10 @@ export interface Context {
viewport: number;
viewportIsDefault: boolean;
};
mode: {
id: string;
name: string;
};
}[];
};
sourceDir: string;
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "chromatic",
"version": "6.24.0",
"version": "6.24.1-next.1",
"description": "Automate visual testing across browsers. Gather UI feedback. Versioned documentation.",
"keywords": [
"storybook-addon",
Expand Down