From 69134afe722b5b2e0b75255cc4a58b60680978d2 Mon Sep 17 00:00:00 2001 From: Ronald Langeveld Date: Thu, 28 Nov 2024 17:26:02 +0800 Subject: [PATCH] Revert "Removed blocking tests (#21747)" This reverts commit 72125f352b9603fd39ce9c709350d4abada951ef. --- .../test/acceptance/advanced/labs.test.ts | 90 +++++++++---------- .../advanced/migrationTools.test.ts | 40 ++++----- 2 files changed, 65 insertions(+), 65 deletions(-) diff --git a/apps/admin-x-settings/test/acceptance/advanced/labs.test.ts b/apps/admin-x-settings/test/acceptance/advanced/labs.test.ts index b19ac4d50b..f7641d9560 100644 --- a/apps/admin-x-settings/test/acceptance/advanced/labs.test.ts +++ b/apps/admin-x-settings/test/acceptance/advanced/labs.test.ts @@ -1,69 +1,69 @@ -// import {expect, test} from '@playwright/test'; -// import {globalDataRequests} from '../../utils/acceptance'; -// import {mockApi} from '@tryghost/admin-x-framework/test/acceptance'; +import {expect, test} from '@playwright/test'; +import {globalDataRequests} from '../../utils/acceptance'; +import {mockApi} from '@tryghost/admin-x-framework/test/acceptance'; -// test.describe('Labs', async () => { -// test('Uploading/downloading redirects', async ({page}) => { -// const {lastApiRequests} = await mockApi({page, requests: { -// ...globalDataRequests, -// uploadRedirects: {method: 'POST', path: '/redirects/upload/', response: {}}, -// downloadRedirects: {method: 'GET', path: '/redirects/download/', response: 'redirects'} -// }}); +test.describe('Labs', async () => { + test('Uploading/downloading redirects', async ({page}) => { + const {lastApiRequests} = await mockApi({page, requests: { + ...globalDataRequests, + uploadRedirects: {method: 'POST', path: '/redirects/upload/', response: {}}, + downloadRedirects: {method: 'GET', path: '/redirects/download/', response: 'redirects'} + }}); -// await page.goto('/'); + await page.goto('/'); -// const labsSection = page.getByTestId('labs'); + const labsSection = page.getByTestId('labs'); -// await labsSection.getByRole('button', {name: 'Open'}).click(); -// await labsSection.getByRole('tab', {name: 'Beta features'}).click(); + await labsSection.getByRole('button', {name: 'Open'}).click(); + await labsSection.getByRole('tab', {name: 'Beta features'}).click(); -// const fileChooserPromise = page.waitForEvent('filechooser'); + const fileChooserPromise = page.waitForEvent('filechooser'); -// await labsSection.getByText('Upload redirects file').click(); + await labsSection.getByText('Upload redirects file').click(); -// const fileChooser = await fileChooserPromise; -// await fileChooser.setFiles(`${__dirname}/../../utils/files/redirects.yml`); + const fileChooser = await fileChooserPromise; + await fileChooser.setFiles(`${__dirname}/../../utils/files/redirects.yml`); -// await expect(page.getByTestId('toast-success')).toContainText('Redirects uploaded'); + await expect(page.getByTestId('toast-success')).toContainText('Redirects uploaded'); -// expect(lastApiRequests.uploadRedirects).toBeTruthy(); + expect(lastApiRequests.uploadRedirects).toBeTruthy(); -// await labsSection.getByRole('button', {name: 'Download current redirects'}).click(); + await labsSection.getByRole('button', {name: 'Download current redirects'}).click(); -// await expect(page.locator('iframe#iframeDownload')).toHaveAttribute('src', /\/redirects\/download\//); + await expect(page.locator('iframe#iframeDownload')).toHaveAttribute('src', /\/redirects\/download\//); -// expect(lastApiRequests.downloadRedirects).toBeTruthy(); -// }); + expect(lastApiRequests.downloadRedirects).toBeTruthy(); + }); -// test('Uploading/downloading routes', async ({page}) => { -// const {lastApiRequests} = await mockApi({page, requests: { -// ...globalDataRequests, -// uploadRoutes: {method: 'POST', path: '/settings/routes/yaml/', response: {}}, -// downloadRoutes: {method: 'GET', path: '/settings/routes/yaml/', response: 'routes'} -// }}); + test('Uploading/downloading routes', async ({page}) => { + const {lastApiRequests} = await mockApi({page, requests: { + ...globalDataRequests, + uploadRoutes: {method: 'POST', path: '/settings/routes/yaml/', response: {}}, + downloadRoutes: {method: 'GET', path: '/settings/routes/yaml/', response: 'routes'} + }}); -// await page.goto('/'); + await page.goto('/'); -// const labsSection = page.getByTestId('labs'); + const labsSection = page.getByTestId('labs'); -// await labsSection.getByRole('button', {name: 'Open'}).click(); -// await labsSection.getByRole('tab', {name: 'Beta features'}).click(); + await labsSection.getByRole('button', {name: 'Open'}).click(); + await labsSection.getByRole('tab', {name: 'Beta features'}).click(); -// const fileChooserPromise = page.waitForEvent('filechooser'); + const fileChooserPromise = page.waitForEvent('filechooser'); -// await labsSection.getByText('Upload routes file').click(); + await labsSection.getByText('Upload routes file').click(); -// const fileChooser = await fileChooserPromise; -// await fileChooser.setFiles(`${__dirname}/../../utils/files/routes.yml`); + const fileChooser = await fileChooserPromise; + await fileChooser.setFiles(`${__dirname}/../../utils/files/routes.yml`); -// await expect(page.getByTestId('toast-success')).toContainText('Routes uploaded'); + await expect(page.getByTestId('toast-success')).toContainText('Routes uploaded'); -// expect(lastApiRequests.uploadRoutes).toBeTruthy(); + expect(lastApiRequests.uploadRoutes).toBeTruthy(); -// await labsSection.getByRole('button', {name: 'Download current routes'}).click(); + await labsSection.getByRole('button', {name: 'Download current routes'}).click(); -// await expect(page.locator('iframe#iframeDownload')).toHaveAttribute('src', /\/settings\/routes\/yaml\//); + await expect(page.locator('iframe#iframeDownload')).toHaveAttribute('src', /\/settings\/routes\/yaml\//); -// expect(lastApiRequests.downloadRoutes).toBeTruthy(); -// }); -// }); + expect(lastApiRequests.downloadRoutes).toBeTruthy(); + }); +}); diff --git a/apps/admin-x-settings/test/acceptance/advanced/migrationTools.test.ts b/apps/admin-x-settings/test/acceptance/advanced/migrationTools.test.ts index 02048db933..2601214fdd 100644 --- a/apps/admin-x-settings/test/acceptance/advanced/migrationTools.test.ts +++ b/apps/admin-x-settings/test/acceptance/advanced/migrationTools.test.ts @@ -26,38 +26,38 @@ test.describe('Migration tools', async () => { await expectExternalNavigate(page, {route: '/migrate/mailchimp'}); }); - // test('Universal import', async ({page}) => { - // const {lastApiRequests} = await mockApi({page, requests: { - // ...globalDataRequests, - // importContent: {path: '/db/', method: 'POST', response: {}} - // }}); + test('Universal import', async ({page}) => { + const {lastApiRequests} = await mockApi({page, requests: { + ...globalDataRequests, + importContent: {path: '/db/', method: 'POST', response: {}} + }}); - // await page.goto('/'); + await page.goto('/'); - // const migrationSection = page.getByTestId('migrationtools'); + const migrationSection = page.getByTestId('migrationtools'); - // await migrationSection.getByRole('button', {name: 'Universal import'}).click(); + await migrationSection.getByRole('button', {name: 'Universal import'}).click(); - // const universalImportModal = page.getByTestId('universal-import-modal'); + const universalImportModal = page.getByTestId('universal-import-modal'); - // const fileChooserPromise = page.waitForEvent('filechooser'); + const fileChooserPromise = page.waitForEvent('filechooser'); - // universalImportModal.getByText(/JSON or zip file/).click(); + universalImportModal.getByText(/JSON or zip file/).click(); - // const fileChooser = await fileChooserPromise; - // await fileChooser.setFiles(`${__dirname}/../../utils/files/upload.zip`); + const fileChooser = await fileChooserPromise; + await fileChooser.setFiles(`${__dirname}/../../utils/files/upload.zip`); - // const confirmationModal = page.getByTestId('confirmation-modal'); + const confirmationModal = page.getByTestId('confirmation-modal'); - // await expect(confirmationModal).toContainText('Import in progress'); + await expect(confirmationModal).toContainText('Import in progress'); - // await confirmationModal.getByRole('button', {name: 'Got it'}).click(); + await confirmationModal.getByRole('button', {name: 'Got it'}).click(); - // await expect(universalImportModal).not.toBeVisible(); - // await expect(confirmationModal).not.toBeVisible(); + await expect(universalImportModal).not.toBeVisible(); + await expect(confirmationModal).not.toBeVisible(); - // expect(lastApiRequests.importContent).toBeTruthy(); - // }); + expect(lastApiRequests.importContent).toBeTruthy(); + }); test('Content export', async ({page}) => { const {lastApiRequests} = await mockApi({page, requests: {