Skip to content
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
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
"author": "LambdaTest <keys@lambdatest.com>",
"license": "MIT",
"dependencies": {
"@playwright/browser-chromium": "^1.40.1",
"@playwright/browser-firefox": "^1.40.1",
"@playwright/browser-webkit": "^1.40.1",
"@playwright/test": "^1.40.1",
"@types/cross-spawn": "^6.0.4",
"@types/node": "^20.8.9",
"@types/which": "^3.0.2",
Expand All @@ -31,7 +35,6 @@
"fastify": "^4.24.3",
"form-data": "^4.0.0",
"listr2": "^7.0.1",
"playwright": "^1.39.0",
"tsup": "^7.2.0",
"which": "^4.0.0",
"winston": "^3.10.0"
Expand Down
57 changes: 49 additions & 8 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/lib/ctx.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default (options: Record<string, string>): Context => {
if (options.config) {
webConfig = JSON.parse(fs.readFileSync(options.config, 'utf-8'));
}
for (let viewport of webConfig.web.viewports) {
for (let viewport of webConfig.web.resolutions || webConfig.web.viewports) {
viewports.push({ width: viewport[0], height: viewport[1]})
}
} catch (error: any) {
Expand Down
4 changes: 3 additions & 1 deletion src/lib/screenshot.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { chromium, firefox, webkit, Browser } from "playwright"
import { chromium, firefox, webkit, Browser } from "@playwright/test"
import { Context, WebStaticConfigSchema } from "../types.js"
import { delDir } from "./utils.js"

Expand All @@ -7,6 +7,7 @@ const BROWSER_SAFARI = 'safari';
const BROWSER_FIREFOX = 'firefox';
const BROWSER_EDGE = 'edge';
const EDGE_CHANNEL = 'msedge';
const PW_WEBKIT = 'webkit';

export async function captureScreenshots(ctx: Context, screenshots: WebStaticConfigSchema): Promise<number> {
// Clean up directory to store screenshots
Expand Down Expand Up @@ -54,6 +55,7 @@ export async function captureScreenshots(ctx: Context, screenshots: WebStaticCon
await page.screenshot({ path: ssPath, fullPage: true });

let completed = (i == (totalBrowsers-1) && j == (totalScreenshots-1) && k == (totalViewports-1)) ? true : false;
browserName = browserName === BROWSER_SAFARI ? PW_WEBKIT : browserName;
ctx.client.uploadScreenshot(ctx.build, ssPath, screenshot.name, browserName, `${width}x${height}`, completed);
}

Expand Down
1 change: 1 addition & 0 deletions src/tasks/auth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export default (ctx: Context): ListrTask<Context, ListrRendererFactory, ListrRen
task.title = 'Authenticated with SmartUI';
} catch (error: any) {
ctx.log.debug(error.message);
task.output = chalk.gray(error.message);
throw new Error('Authentication failed');
}
},
Expand Down
3 changes: 2 additions & 1 deletion src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ export interface Build {
export interface WebConfigSchema {
web: {
browsers: Array<string>;
viewports: Array<Array<number>>;
viewports?: Array<Array<number>>;
resolutions?: Array<Array<number>>; // for backward compatibility
}
}

Expand Down