diff --git a/.github/workflows/e2e_tests.yml b/.github/workflows/e2e_tests.yml index 93f6c0b8d7..a8f946a437 100644 --- a/.github/workflows/e2e_tests.yml +++ b/.github/workflows/e2e_tests.yml @@ -116,7 +116,7 @@ jobs: - name: Run Playwright tests id: test-playwright - run: cd end2end && npx playwright test --project=chromium + run: cd end2end && npx playwright test --project=end2end - name: Notify in case of playwright failure, from mainstream branches only uses: peter-evans/commit-comment@v3 diff --git a/tests/end2end/cypress/integration/cors.js b/tests/end2end/cypress/integration/cors.js deleted file mode 100644 index 455d79ed48..0000000000 --- a/tests/end2end/cypress/integration/cors.js +++ /dev/null @@ -1,20 +0,0 @@ -// Disabled on CI for now, I can't make it work -describe('Cors', function() { - - it('send authorized request', function(){ - cy.visit('http://othersite.local:8130') - cy.get('#launch-request').click(); - cy.get('#status').should('have.text','200'); - cy.get('#response').invoke('val').should('not.be.empty') - - }) - - - it('send unauthorized request', function(){ - cy.visit('http://othersite.local:8130') - cy.get('#launch-request-bad').click(); - cy.get('#status_bad').should('be.empty'); - cy.get('#response_bad').invoke('val').should('be.empty') - }) - -}) diff --git a/tests/end2end/cypress/integration/projects_filename_dot_space-ghaction.js b/tests/end2end/cypress/integration/projects_filename_dot_space-ghaction.js deleted file mode 100644 index f2a456b5db..0000000000 --- a/tests/end2end/cypress/integration/projects_filename_dot_space-ghaction.js +++ /dev/null @@ -1,13 +0,0 @@ -describe('Filename with dot or space', () => { - - it('projet with dot or space can be loaded', () => { - // project file with dot - cy.visit('/index.php/view/map/?repository=testsrepository&project=base_layers.withdot') - cy.get('#node-quartiers').should('exist') - // project file with space - cy.visit('/index.php/view/map/?repository=testsrepository&project=base_layers+with+space') - - cy.get('#node-quartiers').should('exist') - }) - -}) diff --git a/tests/end2end/playwright.config.ts b/tests/end2end/playwright.config.ts index ea7e5f5b1a..bf4f05bd1a 100644 --- a/tests/end2end/playwright.config.ts +++ b/tests/end2end/playwright.config.ts @@ -68,6 +68,14 @@ export default defineConfig({ dependencies: ['setup'], }, + { + name: 'end2end', + use: { + browserName: 'chromium', + }, + dependencies: ['setup'], + testIgnore: '**/localonly/**', + }, /* Test against mobile viewports. */ // { // name: 'Mobile Chrome', diff --git a/tests/end2end/playwright/dot-or-space-in-project-filename.spec.js b/tests/end2end/playwright/dot-or-space-in-project-filename.spec.js new file mode 100644 index 0000000000..01eae58447 --- /dev/null +++ b/tests/end2end/playwright/dot-or-space-in-project-filename.spec.js @@ -0,0 +1,15 @@ +import { test, expect } from '@playwright/test'; + +test.describe('Filename with dot or space', () => { + + test('projet with dot or space can be loaded', async ({ page }) => { + // project file with dot + await page.goto('/index.php/view/map/?repository=testsrepository&project=base_layers.withdot');await expect(page.locator( + '#node-quartiers')).toBeVisible(); + // project file with space + await page.goto('/index.php/view/map/?repository=testsrepository&project=base_layers+with+space');await expect(page.locator( + + '#node-quartiers')).toBeVisible(); + }); + +}); diff --git a/tests/end2end/playwright/localonly/cors.spec.js b/tests/end2end/playwright/localonly/cors.spec.js new file mode 100644 index 0000000000..40f205429b --- /dev/null +++ b/tests/end2end/playwright/localonly/cors.spec.js @@ -0,0 +1,24 @@ +import { test, expect } from '@playwright/test'; + +test.describe('Cors', function () { + + test('send authorized request', async function ({ page }, testInfo) { + await page.goto('http://othersite.local:8130'); + await page.locator('#launch-request').click(); + await expect(page.locator('#status')).toHaveText('200'); + await expect(page.locator('#response')).not.toBeEmpty(); + expect(testInfo.stderr).toHaveLength(0); + + }); + + + test('send unauthorized request', async function ({ page }, testInfo) { + await page.goto( + 'http://othersite.local:8130'); + await page.locator('#launch-request-bad').click(); + await expect(page.locator('#status_bad')).toBeEmpty(); + await expect(page.locator('#response_bad')).toBeEmpty(); + expect(testInfo.stderr).not.toBe(''); + }); + +});