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.

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

#8990: fix non-awaited screenshot promise #9004

Merged
merged 4 commits into from
Aug 13, 2024
Merged
Show file tree
Hide file tree
Changes from 2 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
3 changes: 0 additions & 3 deletions end-to-end-tests/fixtures/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ export const launchPersistentContextWithExtension = async (
],
slowMo: SLOWMO ? 3000 : undefined,
permissions: ["clipboard-read", "clipboard-write", "accessibility-events"],
// Set the viewport to null because we rely on the real inner window width to detect when the sidepanel is open
// See: https://github.com/microsoft/playwright/issues/11465 and https://github.com/pixiebrix/pixiebrix-extension/blob/b4b0a2efde2c3ac5e634220b555532a2875fe5da/src/contentScript/sidebarController.tsx#L78
viewport: null,
Comment on lines -45 to -47
Copy link
Collaborator Author

@fungairino fungairino Aug 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should no longer need this work-around since we removed this bit of code that detects if the sidebar is open based on the window inner width.

});
};

Expand Down
47 changes: 47 additions & 0 deletions end-to-end-tests/tests/runtime/screenshotTab.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/*
* Copyright (C) 2024 PixieBrix, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

import { test, expect } from "../../fixtures/testBase";
import { ActivateModPage } from "../../pageObjects/extensionConsole/modsPage";
// @ts-expect-error -- https://youtrack.jetbrains.com/issue/AQUA-711/Provide-a-run-configuration-for-Playwright-tests-in-specs-with-fixture-imports-only
import { test as base } from "@playwright/test";
import { runModViaQuickBar } from "../../utils";

test("screenshot tab brick functionality", async ({ page, extensionId }) => {
const modId = "@e2e-testing/test-screenshot";

const modActivationPage = new ActivateModPage(page, extensionId, modId);
await modActivationPage.goto();

await modActivationPage.clickActivateAndWaitForModsPageRedirect();

await page.goto("/advanced-fields/");

await runModViaQuickBar(page, "Screenshot");

const screenshotModalFrame = page.frameLocator(
'iframe[title="Modal content"]',
);

await expect(
screenshotModalFrame.getByText("Screenshot modal"),
).toBeVisible();

await expect(screenshotModalFrame.getByRole("img")).toHaveScreenshot(
"screenshotTab.png",
);
});
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions playwright.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ export default defineConfig<{ chromiumChannel: string }>({
expect: {
/* Timeout for each assertion. If a particular interaction is timing out, adjust its specific timeout value rather than this global setting */
timeout: 5000,
toHaveScreenshot: {
maxDiffPixelRatio: 0.1,
},
},
reportSlowTests: null,
/* Reporter to use. See https://playwright.dev/docs/test-reporters */
Expand Down
6 changes: 3 additions & 3 deletions src/bricks/transformers/screenshotTab.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ export class ScreenshotTab extends TransformerABC {
override defaultOutputKey = "screenshot";

async transform(
args: BrickArgs,
_args: BrickArgs,
{ platform }: BrickOptions,
): Promise<unknown> {
): Promise<{ data: string }> {
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Side note: this should probably correspond to the output schema directly

try {
return {
data: platform.capture.captureScreenshot(),
data: await platform.capture.captureScreenshot(),
};
} catch (error) {
if (getErrorMessage(error).includes("activeTab")) {
Expand Down
Loading