From d8953ac76ce15682ed6734c0150a5f465c4b9100 Mon Sep 17 00:00:00 2001 From: Rene Date: Fri, 8 Jul 2022 13:13:01 +0200 Subject: [PATCH] improve test --- .../update/handleEnvironment.ts | 2 +- .../structureSetup/update/index.browser.ts | 25 +++-- .../setups/structureSetup/update/index.html | 1 + .../structureSetup/update/index.test.ts | 92 +++++++++++-------- 4 files changed, 74 insertions(+), 46 deletions(-) diff --git a/packages/overlayscrollbars/tests/playwright/setups/structureSetup/update/handleEnvironment.ts b/packages/overlayscrollbars/tests/playwright/setups/structureSetup/update/handleEnvironment.ts index 55731cc..17764ef 100644 --- a/packages/overlayscrollbars/tests/playwright/setups/structureSetup/update/handleEnvironment.ts +++ b/packages/overlayscrollbars/tests/playwright/setups/structureSetup/update/handleEnvironment.ts @@ -5,7 +5,7 @@ import { addClass } from 'support'; const url = new URL(window.location.toString()); const params = url.searchParams; - ['nss', 'fbg', 'ccp', 'po', 'fo'].forEach((param) => { + ['nss', 'fbg', 'ccp', 'po', 'fo', 'tvp'].forEach((param) => { const paramValue = Boolean(params.get(param)); if (paramValue) { diff --git a/packages/overlayscrollbars/tests/playwright/setups/structureSetup/update/index.browser.ts b/packages/overlayscrollbars/tests/playwright/setups/structureSetup/update/index.browser.ts index c56e5c3..62c94e3 100644 --- a/packages/overlayscrollbars/tests/playwright/setups/structureSetup/update/index.browser.ts +++ b/packages/overlayscrollbars/tests/playwright/setups/structureSetup/update/index.browser.ts @@ -16,6 +16,7 @@ import { contents, appendChildren, createDOM, + hasClass, } from 'support'; import { resize } from '@/testing-browser/Resize'; import { setTestResult, waitForOrFailTest } from '@/testing-browser/TestResult'; @@ -107,12 +108,20 @@ if (!useContentElement) { appendChildren(comparisonContentElm, elms); } +const initObj = hasClass(document.body, 'tvp') + ? { + target: target!, + viewport: target!, + content: useContentElement, + } + : { target: target!, content: useContentElement }; + let updateCount = 0; // @ts-ignore const osInstance = // @ts-ignore (window.os = OverlayScrollbars( - { target: target!, viewport: target!, content: useContentElement }, + initObj, { nativeScrollbarsOverlaid: { initialize: true } }, { updated() { @@ -284,7 +293,7 @@ const checkMetrics = async (checkComparison: CheckComparisonObj) => { // ==== check scroll values: - if (ff && isFractionalPixelRatio()) { + if (ff && isFractionalPixelRatio() && viewportIsTarget) { should.ok( Math.abs(targetMetrics.scroll.width - comparisonMetrics.scroll.width) <= 1, `Scroll width equality. +-1 (${osInstance.state().overflowAmount.x})` @@ -486,11 +495,13 @@ const checkMetrics = async (checkComparison: CheckComparisonObj) => { 'Host Overflow should be hidden without visible overflowing content.' ); } - should.equal( - paddingOverflowStyle, - hostOverflowStyle, - 'Padding Overflow should equal Host overflow.' - ); + if (targetPadding !== targetViewport) { + should.equal( + paddingOverflowStyle, + hostOverflowStyle, + 'Padding Overflow should equal Host overflow.' + ); + } await timeout(1); diff --git a/packages/overlayscrollbars/tests/playwright/setups/structureSetup/update/index.html b/packages/overlayscrollbars/tests/playwright/setups/structureSetup/update/index.html index 7f4078c..4a2dde0 100644 --- a/packages/overlayscrollbars/tests/playwright/setups/structureSetup/update/index.html +++ b/packages/overlayscrollbars/tests/playwright/setups/structureSetup/update/index.html @@ -4,6 +4,7 @@ +