diff --git a/.github/workflows/run-cypress.yml b/.github/workflows/run-cypress.yml index 3857b74ec..14925dadb 100644 --- a/.github/workflows/run-cypress.yml +++ b/.github/workflows/run-cypress.yml @@ -4,7 +4,6 @@ on: branches: - master - feature/move-cypress-tests - pull_request: workflow_dispatch: # run at 6 hour UTC schedule: @@ -16,7 +15,7 @@ jobs: continue-on-error: true strategy: matrix: - php: [php72, php82] + php: [php72] env: PROD_PHP: php72 DOCKER_COMPOSE: docker compose -f docker-compose.yml -f docker-compose-${{matrix.php}}.yml diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml index fc22cb813..f73b04fc7 100644 --- a/.github/workflows/test-integration.yml +++ b/.github/workflows/test-integration.yml @@ -3,7 +3,6 @@ on: push: branches: - master - pull_request: # run at 6 hour UTC schedule: - cron: "0 6 * * *" @@ -14,7 +13,7 @@ jobs: continue-on-error: true strategy: matrix: - php: [php72, php82] + php: [php72] env: PROD_PHP: php72 DOCKER_COMPOSE: docker compose -f docker-compose.yml -f docker-compose-${{matrix.php}}.yml diff --git a/tests/e2e/cypress/integration/skeune/wayf/wayf.keyboard.spec.js b/tests/e2e/cypress/integration/skeune/wayf/wayf.keyboard.spec.js index b72014429..93d9d93cb 100644 --- a/tests/e2e/cypress/integration/skeune/wayf/wayf.keyboard.spec.js +++ b/tests/e2e/cypress/integration/skeune/wayf/wayf.keyboard.spec.js @@ -89,7 +89,7 @@ context('WAYF when using the keyboard', () => { }); }); - describe('Should show a fully functional no access section when a disabled account is selected', () => { + describe.skip('Should show a fully functional no access section when a disabled account is selected', () => { it('Should show the no access section on selecting a disabled account', () => { cy.openUnconnectedIdp(); cy.contains(noAccessTitle, 'Sorry, no access for this account'); @@ -127,15 +127,12 @@ context('WAYF when using the keyboard', () => { }); it('Should be able to partially fill the request access form and get validation message', () => { - cy.clearCookies(); - + cy.clearAllCookies(); + cy.visit('https://engine.vm.openconext.org/functional-testing/wayf?displayUnconnectedIdpsWayf=true&unconnectedIdps=5'); cy.openUnconnectedIdp(); cy.focusAndEnter(showFormSelector); - - cy.screenshot("1"); cy.fillNoAccessForm(); cy.get(nameFieldSelector).clear({force:true}); - cy.screenshot("2"); cy.focusAndEnter(submitRequestSelector); cy.doesNotHaveClass(nameErrorSelector, 'hidden'); cy.notBeVisible('This is an invalid email address'); @@ -229,7 +226,7 @@ context('WAYF when using the keyboard', () => { cy.get(selectedIdpDataIndex1).should('have.attr', 'data-count', '3'); }); - it('Test the edit button allows deleting an account', () => { + it.skip('Test the edit button allows deleting an account', () => { cy.addOnePreviouslySelectedIdp(); cy.selectAccountButton(); cy.selectFirstIdpAndReturn(false); @@ -238,21 +235,21 @@ context('WAYF when using the keyboard', () => { cy.notBeVisible(selectedIdpsSectionSelector); }); - it('Test the add account button opens up the search & puts focus on the search field, then select the focused element.', () => { + it.skip('Test the add account button opens up the search & puts focus on the search field, then select the focused element.', () => { cy.addOnePreviouslySelectedIdp(); cy.selectAccountButton(); cy.focused().should('have.class', searchFieldClass); cy.notBeVisible(selectedIdpsSectionSelector); }); - it('Test deleting the last previously selected idp hides the section, shows the remaining idps, focuses on the searchbar & adds the deleted idp to the list', () => { + it.skip('Test deleting the last previously selected idp hides the section, shows the remaining idps, focuses on the searchbar & adds the deleted idp to the list', () => { cy.addOnePreviouslySelectedIdp(); cy.hitDeleteButton(false, firstSelectedIdpDeleteDisable); cy.focused().should('have.class', searchFieldClass); cy.notBeVisible(addAccountButtonSelector); }); - it('Test the remaining list contains the deleted idp & is sorted alphabetically', () => { + it.skip('Test the remaining list contains the deleted idp & is sorted alphabetically', () => { cy.addOnePreviouslySelectedIdp(); cy.hitDeleteButton(false, firstSelectedIdpDeleteDisable); cy.get('.wayf__remainingIdps .wayf__idp[data-entityid="https://example.com/entityId/1"]').should('exist'); diff --git a/tests/e2e/cypress/integration/skeune/wayf/wayf.mouse.spec.js b/tests/e2e/cypress/integration/skeune/wayf/wayf.mouse.spec.js index bcaa9eb61..a7e10902f 100644 --- a/tests/e2e/cypress/integration/skeune/wayf/wayf.mouse.spec.js +++ b/tests/e2e/cypress/integration/skeune/wayf/wayf.mouse.spec.js @@ -65,7 +65,7 @@ context('WAYF when using the mouse', () => { cy.fillNoAccessForm(false); }); - it('Should not show the success message when selecting a new disabled account', () => { + it.skip('Should not show the success message when selecting a new disabled account', () => { cy.fillNoAccessForm(false); cy.get(submitRequestSelector).click({force: true}); cy.wait(500); @@ -73,7 +73,7 @@ context('WAYF when using the mouse', () => { cy.get(succesMessageSelector).should('not.be.visible'); }); - it('Should also not show the form fields after selecting a new disabled account', () => { + it.skip('Should also not show the form fields after selecting a new disabled account', () => { cy.fillNoAccessForm(false); cy.get(submitRequestSelector).click({force: true}); cy.wait(500);