Revert "chore: move attachments link to step body (#34196)"
This reverts commit a33659f2a8.
This commit is contained in:
parent
00bb17751b
commit
2162adedc9
|
|
@ -60,11 +60,6 @@
|
||||||
color: var(--color-scale-orange-6);
|
color: var(--color-scale-orange-6);
|
||||||
border: 1px solid var(--color-scale-orange-4);
|
border: 1px solid var(--color-scale-orange-4);
|
||||||
}
|
}
|
||||||
.label-color-gray {
|
|
||||||
background-color: var(--color-scale-gray-0);
|
|
||||||
color: var(--color-scale-gray-6);
|
|
||||||
border: 1px solid var(--color-scale-gray-4);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@media(prefers-color-scheme: dark) {
|
@media(prefers-color-scheme: dark) {
|
||||||
|
|
@ -98,11 +93,6 @@
|
||||||
color: var(--color-scale-orange-2);
|
color: var(--color-scale-orange-2);
|
||||||
border: 1px solid var(--color-scale-orange-4);
|
border: 1px solid var(--color-scale-orange-4);
|
||||||
}
|
}
|
||||||
.label-color-gray {
|
|
||||||
background-color: var(--color-scale-gray-9);
|
|
||||||
color: var(--color-scale-gray-2);
|
|
||||||
border: 1px solid var(--color-scale-gray-4);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.attachment-body {
|
.attachment-body {
|
||||||
|
|
|
||||||
|
|
@ -176,6 +176,7 @@ const StepTreeItem: React.FC<{
|
||||||
}> = ({ test, step, result, depth }) => {
|
}> = ({ test, step, result, depth }) => {
|
||||||
return <TreeItem title={<span aria-label={step.title}>
|
return <TreeItem title={<span aria-label={step.title}>
|
||||||
<span style={{ float: 'right' }}>{msToString(step.duration)}</span>
|
<span style={{ float: 'right' }}>{msToString(step.duration)}</span>
|
||||||
|
{step.attachments.length > 0 && <a style={{ float: 'right' }} title='link to attachment' href={testResultHref({ test, result, anchor: `attachment-${step.attachments[0]}` })} onClick={evt => { evt.stopPropagation(); }}>{icons.attachment()}</a>}
|
||||||
{statusIcon(step.error || step.duration === -1 ? 'failed' : (step.skipped ? 'skipped' : 'passed'))}
|
{statusIcon(step.error || step.duration === -1 ? 'failed' : (step.skipped ? 'skipped' : 'passed'))}
|
||||||
<span>{step.title}</span>
|
<span>{step.title}</span>
|
||||||
{step.count > 1 && <> ✕ <span className='test-result-counter'>{step.count}</span></>}
|
{step.count > 1 && <> ✕ <span className='test-result-counter'>{step.count}</span></>}
|
||||||
|
|
@ -183,20 +184,6 @@ const StepTreeItem: React.FC<{
|
||||||
</span>} loadChildren={step.steps.length || step.snippet ? () => {
|
</span>} loadChildren={step.steps.length || step.snippet ? () => {
|
||||||
const snippet = step.snippet ? [<TestErrorView testId='test-snippet' key='line' error={step.snippet}/>] : [];
|
const snippet = step.snippet ? [<TestErrorView testId='test-snippet' key='line' error={step.snippet}/>] : [];
|
||||||
const steps = step.steps.map((s, i) => <StepTreeItem key={i} step={s} depth={depth + 1} result={result} test={test} />);
|
const steps = step.steps.map((s, i) => <StepTreeItem key={i} step={s} depth={depth + 1} result={result} test={test} />);
|
||||||
const attachments = step.attachments.map(attachmentIndex => (
|
return snippet.concat(steps);
|
||||||
<a key={'' + attachmentIndex}
|
|
||||||
href={testResultHref({ test, result, anchor: `attachment-${attachmentIndex}` })}
|
|
||||||
style={{ paddingLeft: depth * 22 + 4, textDecoration: 'none' }}
|
|
||||||
>
|
|
||||||
<span
|
|
||||||
style={{ margin: '8px 0 0 8px', padding: '2px 10px', cursor: 'pointer' }}
|
|
||||||
className='label label-color-gray'
|
|
||||||
title={`see "${result.attachments[attachmentIndex].name}"`}
|
|
||||||
>
|
|
||||||
{icons.attachment()}{result.attachments[attachmentIndex].name}
|
|
||||||
</span>
|
|
||||||
</a>
|
|
||||||
));
|
|
||||||
return snippet.concat(steps, attachments);
|
|
||||||
} : undefined} depth={depth}/>;
|
} : undefined} depth={depth}/>;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -959,10 +959,9 @@ for (const useIntermediateMergeReport of [true, false] as const) {
|
||||||
await showReport();
|
await showReport();
|
||||||
await page.getByRole('link', { name: 'passing' }).click();
|
await page.getByRole('link', { name: 'passing' }).click();
|
||||||
|
|
||||||
const attachment = page.getByTestId('attachments').getByText('foo-2', { exact: true });
|
const attachment = page.getByText('foo-2', { exact: true });
|
||||||
await expect(attachment).not.toBeInViewport();
|
await expect(attachment).not.toBeInViewport();
|
||||||
await page.getByLabel('attach "foo-2"').click();
|
await page.getByLabel('attach "foo-2"').getByTitle('link to attachment').click();
|
||||||
await page.getByTitle('see "foo-2"').click();
|
|
||||||
await expect(attachment).toBeInViewport();
|
await expect(attachment).toBeInViewport();
|
||||||
|
|
||||||
await page.reload();
|
await page.reload();
|
||||||
|
|
@ -989,10 +988,9 @@ for (const useIntermediateMergeReport of [true, false] as const) {
|
||||||
await showReport();
|
await showReport();
|
||||||
await page.getByRole('link', { name: 'passing' }).click();
|
await page.getByRole('link', { name: 'passing' }).click();
|
||||||
|
|
||||||
const attachment = page.getByTestId('attachments').getByText('attachment', { exact: true });
|
const attachment = page.getByText('attachment', { exact: true });
|
||||||
await expect(attachment).not.toBeInViewport();
|
await expect(attachment).not.toBeInViewport();
|
||||||
await page.getByLabel('step').click();
|
await page.getByLabel('step').getByTitle('link to attachment').click();
|
||||||
await page.getByTitle('see "attachment"').click();
|
|
||||||
await expect(attachment).toBeInViewport();
|
await expect(attachment).toBeInViewport();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue