Skip to content

Commit

Permalink
Using the same snapshots for both render mode
Browse files Browse the repository at this point in the history
  • Loading branch information
@trungleduc @martinRenou
trungleduc authored and martinRenou committed Oct 9, 2024
1 parent e46ab9f commit 5855d0a
Show file tree
Hide file tree
Showing 20 changed files with 21 additions and 20 deletions.
4 changes: 3 additions & 1 deletion packages/voila/src/plugins/widget/tools.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ export function handleExecutionResult({
element.removeChild(skeleton);
}
const model = createOutputArea({ rendermime, parent: element });

if (!output_cell.outputs) {
return;
}
if (output_cell.outputs.length > 0) {
element.lastElementChild?.classList.remove(
'jp-mod-noOutputs',
Expand Down
37 changes: 18 additions & 19 deletions ui-tests/tests/voila.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { expect, test } from '@playwright/test';
import { addBenchmarkToTest } from './utils';

const PROGRESSIVE_RENDERING = process.env.PROGRESSIVE_RENDERING === 'true';
const PREFIX = PROGRESSIVE_RENDERING ? '' : '';
test.describe('Voila performance Tests', () => {
test.beforeEach(({ page }) => {
page.setDefaultTimeout(120000);
Expand All @@ -27,7 +26,7 @@ test.describe('Voila performance Tests', () => {
);

// await expect(page).toHaveScreenshot('voila-tree-classic.png');
await expect(page).toHaveScreenshot(`${PREFIX}voila-tree-classic.png`);
await expect(page).toHaveScreenshot('voila-tree-classic.png');
});

test('Render tree light theme', async ({ page, browserName }, testInfo) => {
Expand All @@ -43,7 +42,7 @@ test.describe('Voila performance Tests', () => {
browserName
);

await expect(page).toHaveScreenshot(`${PREFIX}voila-tree-light.png`);
await expect(page).toHaveScreenshot('voila-tree-light.png');
});

test('Render tree dark theme', async ({ page, browserName }, testInfo) => {
Expand All @@ -59,7 +58,7 @@ test.describe('Voila performance Tests', () => {
browserName
);

await expect(page).toHaveScreenshot(`${PREFIX}voila-tree-dark.png`);
await expect(page).toHaveScreenshot('voila-tree-dark.png');
});

test('Render tree miami theme', async ({ page, browserName }, testInfo) => {
Expand All @@ -75,7 +74,7 @@ test.describe('Voila performance Tests', () => {
browserName
);

await expect(page).toHaveScreenshot(`${PREFIX}voila-tree-miami.png`);
await expect(page).toHaveScreenshot('voila-tree-miami.png');
});

test('Render and benchmark basics.ipynb with classic template', async ({
Expand All @@ -93,7 +92,7 @@ test.describe('Voila performance Tests', () => {
// wait for the final MathJax message to be hidden
await page.$('text=Typesetting math: 100%');
await page.waitForSelector('#MathJax_Message', { state: 'hidden' });
await expect(page).toHaveScreenshot(`${PREFIX}${notebookName}-classic.png`);
await expect(page).toHaveScreenshot(`${notebookName}-classic.png`);
});

test('Render and benchmark basics.ipynb', async ({
Expand All @@ -118,7 +117,7 @@ test.describe('Voila performance Tests', () => {
// wait for the final MathJax message to be hidden
await page.$('text=Typesetting math: 100%');
await page.waitForSelector('#MathJax_Message', { state: 'hidden' });
await expect(page).toHaveScreenshot(`${PREFIX}${notebookName}.png`);
await expect(page).toHaveScreenshot(`${notebookName}.png`);
});

test('Render basics.ipynb with dark theme', async ({
Expand All @@ -136,7 +135,7 @@ test.describe('Voila performance Tests', () => {
// wait for the final MathJax message to be hidden
await page.$('text=Typesetting math: 100%');
await page.waitForSelector('#MathJax_Message', { state: 'hidden' });
await expect(page).toHaveScreenshot(`${PREFIX}${notebookName}-dark.png`);
await expect(page).toHaveScreenshot(`${notebookName}-dark.png`);
});

test('Render basics.ipynb with miami theme', async ({
Expand All @@ -156,7 +155,7 @@ test.describe('Voila performance Tests', () => {
// wait for the final MathJax message to be hidden
await page.$('text=Typesetting math: 100%');
await page.waitForSelector('#MathJax_Message', { state: 'hidden' });
await expect(page).toHaveScreenshot(`${PREFIX}${notebookName}-miami.png`);
await expect(page).toHaveScreenshot(`${notebookName}-miami.png`);
});

test('Render 404 error', async ({ page }) => {
Expand Down Expand Up @@ -190,7 +189,7 @@ test.describe('Voila performance Tests', () => {
await page.waitForSelector('svg.svg-figure');
};
await addBenchmarkToTest(notebookName, testFunction, testInfo, browserName);
await expect(page).toHaveScreenshot(`${PREFIX}${notebookName}.png`);
await expect(page).toHaveScreenshot(`${notebookName}.png`);
});

test('Render and benchmark dashboard.ipynb', async ({
Expand Down Expand Up @@ -221,7 +220,7 @@ test.describe('Voila performance Tests', () => {
);
};
await addBenchmarkToTest(notebookName, testFunction, testInfo, browserName);
await expect(page).toHaveScreenshot(`${PREFIX}${notebookName}.png`);
await expect(page).toHaveScreenshot(`${notebookName}.png`);
});

test('Render and benchmark interactive.ipynb', async ({
Expand All @@ -239,7 +238,7 @@ test.describe('Voila performance Tests', () => {
await page.mouse.click(0, 0);
};
await addBenchmarkToTest(notebookName, testFunction, testInfo, browserName);
await expect(page).toHaveScreenshot(`${PREFIX}${notebookName}.png`);
await expect(page).toHaveScreenshot(`${notebookName}.png`);
});

test('Render and benchmark ipympl.ipynb', async ({
Expand All @@ -252,7 +251,7 @@ test.describe('Voila performance Tests', () => {
await page.waitForSelector('div.jupyter-matplotlib-figure');
};
await addBenchmarkToTest(notebookName, testFunction, testInfo, browserName);
await expect(page).toHaveScreenshot(`${PREFIX}${notebookName}.png`);
await expect(page).toHaveScreenshot(`${notebookName}.png`);
});

test('Render and benchmark mimerenderers.ipynb', async ({
Expand All @@ -267,7 +266,7 @@ test.describe('Voila performance Tests', () => {
await page.waitForTimeout(2000);
};
await addBenchmarkToTest(notebookName, testFunction, testInfo, browserName);
await expect(page).toHaveScreenshot(`${PREFIX}${notebookName}.png`);
await expect(page).toHaveScreenshot(`${notebookName}.png`);
});

test('Render and benchmark bokeh.ipynb', async ({
Expand All @@ -280,7 +279,7 @@ test.describe('Voila performance Tests', () => {
await page.waitForSelector('.bk-Canvas');
};
await addBenchmarkToTest(notebookName, testFunction, testInfo, browserName);
await expect(page).toHaveScreenshot(`${PREFIX}${notebookName}.png`);
await expect(page).toHaveScreenshot(`${notebookName}.png`);
});

test('Benchmark the multiple widgets notebook', async ({
Expand All @@ -300,7 +299,7 @@ test.describe('Voila performance Tests', () => {
testInfo,
browserName
);
await expect(page).toHaveScreenshot(`${PREFIX}${notebookName}.png`);
await expect(page).toHaveScreenshot(`${notebookName}.png`);
});

test('Render and benchmark query-strings.ipynb', async ({
Expand Down Expand Up @@ -341,7 +340,7 @@ test.describe('Voila performance Tests', () => {
expect(await userName[1].innerHTML()).toContain('Hi Riley');
await page.$('text=Typesetting math: 100%');
await page.waitForSelector('#MathJax_Message', { state: 'hidden' });
await expect(page).toHaveScreenshot(`${PREFIX}${notebookName}.png`);
await expect(page).toHaveScreenshot(`${notebookName}.png`);
});

test('Render and benchmark reveal.ipynb', async ({
Expand All @@ -354,13 +353,13 @@ test.describe('Voila performance Tests', () => {
await page.waitForSelector('.slider-container');
};
await addBenchmarkToTest(notebookName, testFunction, testInfo, browserName);
await expect(page).toHaveScreenshot(`${PREFIX}${notebookName}.png`);
await expect(page).toHaveScreenshot(`${notebookName}.png`);
});

test('Render yaml.ipynb', async ({ page, browserName }, testInfo) => {
const notebookName = 'yaml';
await page.goto(`/voila/render/${notebookName}.ipynb`);
await page.waitForSelector('span >> text=hey');
await expect(page).toHaveScreenshot(`${PREFIX}${notebookName}.png`);
await expect(page).toHaveScreenshot(`${notebookName}.png`);
});
});
Binary file removed ...ts/tests/voila.test.ts-snapshots/progressive-rendering-basics-classic-linux.png
View file
Binary file not shown.
Binary file removed ui-tests/tests/voila.test.ts-snapshots/progressive-rendering-basics-dark-linux.png
View file
Binary file not shown.
Binary file removed ui-tests/tests/voila.test.ts-snapshots/progressive-rendering-basics-linux.png
View file
Binary file not shown.
Binary file removed ...ests/tests/voila.test.ts-snapshots/progressive-rendering-basics-miami-linux.png
View file
Binary file not shown.
Binary file removed ui-tests/tests/voila.test.ts-snapshots/progressive-rendering-bokeh-linux.png
View file
Binary file not shown.
Binary file removed ui-tests/tests/voila.test.ts-snapshots/progressive-rendering-bqplot-linux.png
View file
Binary file not shown.
Binary file removed ...ts/tests/voila.test.ts-snapshots/progressive-rendering-gridspecLayout-linux.png
View file
Binary file not shown.
Binary file removed ui-tests/tests/voila.test.ts-snapshots/progressive-rendering-interactive-linux.png
View file
Binary file not shown.
Binary file removed ui-tests/tests/voila.test.ts-snapshots/progressive-rendering-ipympl-linux.png
View file
Binary file not shown.
Binary file removed ...sts/tests/voila.test.ts-snapshots/progressive-rendering-mimerenderers-linux.png
View file
Binary file not shown.
Binary file removed .../tests/voila.test.ts-snapshots/progressive-rendering-multiple-widgets-linux.png
View file
Binary file not shown.
Binary file removed ...sts/tests/voila.test.ts-snapshots/progressive-rendering-query-strings-linux.png
View file
Binary file not shown.
Binary file removed ui-tests/tests/voila.test.ts-snapshots/progressive-rendering-reveal-linux.png
View file
Binary file not shown.
Binary file removed ...ests/voila.test.ts-snapshots/progressive-rendering-voila-tree-classic-linux.png
View file
Binary file not shown.
Binary file removed ...s/tests/voila.test.ts-snapshots/progressive-rendering-voila-tree-dark-linux.png
View file
Binary file not shown.
Binary file removed .../tests/voila.test.ts-snapshots/progressive-rendering-voila-tree-light-linux.png
View file
Binary file not shown.
Binary file removed .../tests/voila.test.ts-snapshots/progressive-rendering-voila-tree-miami-linux.png
View file
Binary file not shown.
Binary file removed ui-tests/tests/voila.test.ts-snapshots/progressive-rendering-yaml-linux.png
View file
Binary file not shown.

0 comments on commit 5855d0a

Please sign in to comment.