From 02e78b9d4d7b9356ced7c3fa9218a1cfd4122d96 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Fri, 20 Dec 2024 16:36:11 +0100 Subject: [PATCH 1/2] Add skiko with version No special error for compose wasm, because we have only one compose server --- src/config.js | 8 ++++---- src/webdemo-api.js | 17 ----------------- 2 files changed, 4 insertions(+), 21 deletions(-) diff --git a/src/config.js b/src/config.js index 47cf90a..3e87205 100644 --- a/src/config.js +++ b/src/config.js @@ -62,11 +62,11 @@ export const API_URLS = { get VERSIONS() { return `${this.server}/versions`; }, - SKIKO_MJS() { - return `${this.composeServer}/api/resource/skiko.mjs`; + SKIKO_MJS(version) { + return `${this.composeServer}/api/resource/skiko-${version}.mjs`; }, - SKIKO_WASM() { - return `${this.composeServer}/api/resource/skiko.wasm`; + SKIKO_WASM(version) { + return `${this.composeServer}/api/resource/skiko-${version}.wasm`; }, get JQUERY() { return `https://cdn.jsdelivr.net/npm/jquery@1/dist/jquery.min.js`; diff --git a/src/webdemo-api.js b/src/webdemo-api.js index 3b7514b..64bade9 100644 --- a/src/webdemo-api.js +++ b/src/webdemo-api.js @@ -59,7 +59,6 @@ export default class WebDemoApi { const MINIMAL_VERSION_IR = '1.5.0'; const MINIMAL_VERSION_WASM = '1.9.0'; const MINIMAL_VERSION_SWIFT_EXPORT = '2.0.0'; - const MAX_VERSION_COMPOSE_EXPORT = '2.0.0'; if ( platform === TargetPlatforms.JS_IR && @@ -90,22 +89,6 @@ export default class WebDemoApi { }); } - if ( - platform === TargetPlatforms.COMPOSE_WASM && - compilerVersion >= MAX_VERSION_COMPOSE_EXPORT - ) { - return Promise.resolve({ - output: '', - errors: [ - { - severity: 'ERROR', - message: `${TargetPlatforms.COMPOSE_WASM.printableName} compiler backend accessible only less ${MAX_VERSION_COMPOSE_EXPORT} version`, - }, - ], - jsCode: '', - }); - } - if ( platform === TargetPlatforms.SWIFT_EXPORT && compilerVersion < MINIMAL_VERSION_SWIFT_EXPORT From d69d3b29ddc1c226ec0001dee2d5de425d343cd8 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Fri, 20 Dec 2024 17:10:42 +0100 Subject: [PATCH 2/2] Add diff pixel ratio for screenshot comparison --- tests/utils/screenshots.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tests/utils/screenshots.ts b/tests/utils/screenshots.ts index e4de2c1..2bf3cf9 100644 --- a/tests/utils/screenshots.ts +++ b/tests/utils/screenshots.ts @@ -9,8 +9,14 @@ export async function hideCursor(node: Locator, callback: () => Promise) { await cursor.evaluate((element) => (element.style.display = null)); } +const MAX_DIFF_PIXEL_RATIO = 0.01; + export function checkScreenshot(node: Locator, message: string) { - return hideCursor(node, () => expect(node, message).toHaveScreenshot()); + return hideCursor(node, () => + expect(node, message).toHaveScreenshot({ + maxDiffPixelRatio: MAX_DIFF_PIXEL_RATIO, + }), + ); } export function checkEditorView(editor: Locator, message: string) { @@ -34,6 +40,9 @@ export function checkEditorView(editor: Locator, message: string) { height: boundingBox.height + margins.bottom, }; - await expect(editor.page(), message).toHaveScreenshot({ clip }); + await expect(editor.page(), message).toHaveScreenshot({ + clip, + maxDiffPixelRatio: MAX_DIFF_PIXEL_RATIO, + }); }); }