diff --git a/tests/playwright-test/golden.spec.ts b/tests/playwright-test/golden.spec.ts index e768e1cf60..41cdb9da5a 100644 --- a/tests/playwright-test/golden.spec.ts +++ b/tests/playwright-test/golden.spec.ts @@ -113,49 +113,49 @@ test('should generate separate actual results for repeating names', async ({ run const outputText = result.output; const attachments = outputText.split('\n').filter(l => l.startsWith('## ')).map(l => l.substring(3)).map(l => JSON.parse(l))[0]; for (const attachment of attachments) { - attachment.path = attachment.path.replace(/\\/g, '/').replace(/.*test-results\//, ''); + attachment.path = attachment.path.replace(testInfo.outputDir, '').substring(1).replace(/\\/g, '/'); attachment.name = attachment.name.replace(/\\/g, '/'); } expect(attachments).toEqual([ { 'name': 'foo-expected.txt', 'contentType': 'text/plain', - 'path': 'golden-should-generate-separate-actual-results-for-repeating-names-playwright-test/a.spec.js-snapshots/foo.txt' + 'path': 'a.spec.js-snapshots/foo.txt' }, { 'name': 'foo-actual.txt', 'contentType': 'text/plain', - 'path': 'a-is-a-test/foo-actual.txt' + 'path': 'test-results/a-is-a-test/foo-actual.txt' }, { 'name': 'foo-1-expected.txt', 'contentType': 'text/plain', - 'path': 'golden-should-generate-separate-actual-results-for-repeating-names-playwright-test/a.spec.js-snapshots/foo.txt' + 'path': 'a.spec.js-snapshots/foo.txt' }, { 'name': 'foo-1-actual.txt', 'contentType': 'text/plain', - 'path': 'a-is-a-test/foo-1-actual.txt' + 'path': 'test-results/a-is-a-test/foo-1-actual.txt' }, { 'name': 'bar/baz-expected.txt', 'contentType': 'text/plain', - 'path': 'golden-should-generate-separate-actual-results-for-repeating-names-playwright-test/a.spec.js-snapshots/bar/baz.txt' + 'path': 'a.spec.js-snapshots/bar/baz.txt' }, { 'name': 'bar/baz-actual.txt', 'contentType': 'text/plain', - 'path': 'a-is-a-test/bar-baz-actual.txt' + 'path': 'test-results/a-is-a-test/bar-baz-actual.txt' }, { 'name': 'bar/baz-1-expected.txt', 'contentType': 'text/plain', - 'path': 'golden-should-generate-separate-actual-results-for-repeating-names-playwright-test/a.spec.js-snapshots/bar/baz.txt' + 'path': 'a.spec.js-snapshots/bar/baz.txt' }, { 'name': 'bar/baz-1-actual.txt', 'contentType': 'text/plain', - 'path': 'a-is-a-test/bar-baz-1-actual.txt' + 'path': 'test-results/a-is-a-test/bar-baz-1-actual.txt' } ]); }); @@ -1047,22 +1047,22 @@ test('should attach expected/actual/diff for different sizes', async ({ runInlin expect(outputText).toContain('4 pixels (ratio 1.00 of all image pixels) are different.'); const attachments = outputText.split('\n').filter(l => l.startsWith('## ')).map(l => l.substring(3)).map(l => JSON.parse(l))[0]; for (const attachment of attachments) - attachment.path = attachment.path.replace(/\\/g, '/').replace(/.*test-results\//, ''); + attachment.path = attachment.path.replace(testInfo.outputDir, '').substring(1).replace(/\\/g, '/'); expect(attachments).toEqual([ { name: 'snapshot-expected.png', contentType: 'image/png', - path: 'golden-should-attach-expected-actual-diff-for-different-sizes-playwright-test/a.spec.js-snapshots/snapshot.png' + path: 'a.spec.js-snapshots/snapshot.png' }, { name: 'snapshot-actual.png', contentType: 'image/png', - path: 'a-is-a-test/snapshot-actual.png' + path: 'test-results/a-is-a-test/snapshot-actual.png' }, { name: 'snapshot-diff.png', contentType: 'image/png', - path: 'a-is-a-test/snapshot-diff.png' + path: 'test-results/a-is-a-test/snapshot-diff.png' }, ]); }); diff --git a/tests/playwright-test/stable-test-runner/package-lock.json b/tests/playwright-test/stable-test-runner/package-lock.json index d19c693595..b601bdb93c 100644 --- a/tests/playwright-test/stable-test-runner/package-lock.json +++ b/tests/playwright-test/stable-test-runner/package-lock.json @@ -5,15 +5,15 @@ "packages": { "": { "dependencies": { - "@playwright/test": "1.42.0-beta-1708998235000" + "@playwright/test": "1.43.0-beta-1712217576000" } }, "node_modules/@playwright/test": { - "version": "1.42.0-beta-1708998235000", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.42.0-beta-1708998235000.tgz", - "integrity": "sha512-tPONSh/yGC9dApTJ/aSQ83lqqk0kV6mdlIpJYpmh5LWHyZnl2EcwAqLeNF6GxU2r4aIOMaZPzkEE+WPw/isxWw==", + "version": "1.43.0-beta-1712217576000", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.43.0-beta-1712217576000.tgz", + "integrity": "sha512-Wyuphrx65J+kB5Rb8AbuieFCW0VC0pCPkti/7czZpPV9zNFWS19lqBaWMuxJ7ce2KktozdS+KsUiRoLreu9thQ==", "dependencies": { - "playwright": "1.42.0-beta-1708998235000" + "playwright": "1.43.0-beta-1712217576000" }, "bin": { "playwright": "cli.js" @@ -36,11 +36,11 @@ } }, "node_modules/playwright": { - "version": "1.42.0-beta-1708998235000", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.42.0-beta-1708998235000.tgz", - "integrity": "sha512-Iq85EGhAz0URDVtl9vKDVE0FjvEvPVs/46C/jWR5JpaI9tEsuXYoA1i1f5xA74ZhatskHigpuJYbm2YpwO3mIw==", + "version": "1.43.0-beta-1712217576000", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.43.0-beta-1712217576000.tgz", + "integrity": "sha512-h+qlR5tSmxiEGS9PosulDB99IwTj2v/PEIk07Bb3m685I53YdcTNh/mBebgIgl7IIGU0gMUfH5WdQtCroCUAVA==", "dependencies": { - "playwright-core": "1.42.0-beta-1708998235000" + "playwright-core": "1.43.0-beta-1712217576000" }, "bin": { "playwright": "cli.js" @@ -53,9 +53,9 @@ } }, "node_modules/playwright-core": { - "version": "1.42.0-beta-1708998235000", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.42.0-beta-1708998235000.tgz", - "integrity": "sha512-kgr9rFXjX1pakRqXWwUIPlPMOdaUVHDu7vuGSryQOfoIld6CQI39vGkpb6rFiRwU3gpK4nL/UtXTqoxcMff3DA==", + "version": "1.43.0-beta-1712217576000", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.43.0-beta-1712217576000.tgz", + "integrity": "sha512-SP/cfE8MyAS8sZih/MDeOoCYbWiIcB/rXH0urzWx1tMXJK/YQeH/s9CKmMpoT5TK0oXtDlq6CBpxwOEn2t+tXw==", "bin": { "playwright-core": "cli.js" }, @@ -66,11 +66,11 @@ }, "dependencies": { "@playwright/test": { - "version": "1.42.0-beta-1708998235000", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.42.0-beta-1708998235000.tgz", - "integrity": "sha512-tPONSh/yGC9dApTJ/aSQ83lqqk0kV6mdlIpJYpmh5LWHyZnl2EcwAqLeNF6GxU2r4aIOMaZPzkEE+WPw/isxWw==", + "version": "1.43.0-beta-1712217576000", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.43.0-beta-1712217576000.tgz", + "integrity": "sha512-Wyuphrx65J+kB5Rb8AbuieFCW0VC0pCPkti/7czZpPV9zNFWS19lqBaWMuxJ7ce2KktozdS+KsUiRoLreu9thQ==", "requires": { - "playwright": "1.42.0-beta-1708998235000" + "playwright": "1.43.0-beta-1712217576000" } }, "fsevents": { @@ -80,18 +80,18 @@ "optional": true }, "playwright": { - "version": "1.42.0-beta-1708998235000", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.42.0-beta-1708998235000.tgz", - "integrity": "sha512-Iq85EGhAz0URDVtl9vKDVE0FjvEvPVs/46C/jWR5JpaI9tEsuXYoA1i1f5xA74ZhatskHigpuJYbm2YpwO3mIw==", + "version": "1.43.0-beta-1712217576000", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.43.0-beta-1712217576000.tgz", + "integrity": "sha512-h+qlR5tSmxiEGS9PosulDB99IwTj2v/PEIk07Bb3m685I53YdcTNh/mBebgIgl7IIGU0gMUfH5WdQtCroCUAVA==", "requires": { "fsevents": "2.3.2", - "playwright-core": "1.42.0-beta-1708998235000" + "playwright-core": "1.43.0-beta-1712217576000" } }, "playwright-core": { - "version": "1.42.0-beta-1708998235000", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.42.0-beta-1708998235000.tgz", - "integrity": "sha512-kgr9rFXjX1pakRqXWwUIPlPMOdaUVHDu7vuGSryQOfoIld6CQI39vGkpb6rFiRwU3gpK4nL/UtXTqoxcMff3DA==" + "version": "1.43.0-beta-1712217576000", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.43.0-beta-1712217576000.tgz", + "integrity": "sha512-SP/cfE8MyAS8sZih/MDeOoCYbWiIcB/rXH0urzWx1tMXJK/YQeH/s9CKmMpoT5TK0oXtDlq6CBpxwOEn2t+tXw==" } } } diff --git a/tests/playwright-test/stable-test-runner/package.json b/tests/playwright-test/stable-test-runner/package.json index bb305f7aa5..c9add6b3e2 100644 --- a/tests/playwright-test/stable-test-runner/package.json +++ b/tests/playwright-test/stable-test-runner/package.json @@ -1,6 +1,6 @@ { "private": true, "dependencies": { - "@playwright/test": "1.42.0-beta-1708998235000" + "@playwright/test": "1.43.0-beta-1712217576000" } } diff --git a/tests/playwright-test/to-have-screenshot.spec.ts b/tests/playwright-test/to-have-screenshot.spec.ts index 95a95e4cb1..07fb590375 100644 --- a/tests/playwright-test/to-have-screenshot.spec.ts +++ b/tests/playwright-test/to-have-screenshot.spec.ts @@ -1086,22 +1086,22 @@ test('should attach expected/actual/diff when sizes are different', async ({ run expect(outputText).toContain('4 pixels (ratio 0.01 of all image pixels) are different.'); const attachments = outputText.split('\n').filter(l => l.startsWith('## ')).map(l => l.substring(3)).map(l => JSON.parse(l))[0]; for (const attachment of attachments) - attachment.path = attachment.path.replace(/\\/g, '/').replace(/.*test-results\//, ''); + attachment.path = attachment.path.replace(testInfo.outputDir, '').substring(1).replace(/\\/g, '/'); expect(attachments).toEqual([ { name: 'snapshot-expected.png', contentType: 'image/png', - path: 'to-have-screenshot-should-attach-expected-actual-diff-when-sizes-are-different-playwright-test/__screenshots__/a.spec.js/snapshot.png', + path: '__screenshots__/a.spec.js/snapshot.png', }, { name: 'snapshot-actual.png', contentType: 'image/png', - path: 'a-is-a-test/snapshot-actual.png' + path: 'test-results/a-is-a-test/snapshot-actual.png' }, { name: 'snapshot-diff.png', contentType: 'image/png', - path: 'a-is-a-test/snapshot-diff.png' + path: 'test-results/a-is-a-test/snapshot-diff.png' }, ]); });