diff --git a/integrationTests/cypress/e2e/dogu_integration_test_lib/cas_browser.feature b/integrationTests/cypress/e2e/dogu_integration_test_lib/cas_browser.feature index 3a6cce93..a5396a2f 100644 --- a/integrationTests/cypress/e2e/dogu_integration_test_lib/cas_browser.feature +++ b/integrationTests/cypress/e2e/dogu_integration_test_lib/cas_browser.feature @@ -12,6 +12,7 @@ Feature: Browser-based CAS login and logout functionality Given the user is logged out of the CES When the user opens the dogu start page And the test user logs in with correct credentials + And the user waits until the page is fully loaded Then the user is logged in to the dogu @requires_testuser @@ -25,11 +26,13 @@ Feature: Browser-based CAS login and logout functionality Scenario: logged in user can log out via logout button (front-channel) Given the user is logged into the CES When the user opens the dogu start page + And the user waits until the page is fully loaded And the user clicks the dogu logout button Then the user is logged out of the dogu @requires_testuser Scenario: logged in user can log out via cas logout page (back-channel) Given the user is logged into the CES - When the user logs out by visiting the cas logout page + When the user waits until the page is fully loaded + And the user logs out by visiting the cas logout page Then the user is logged out of the dogu \ No newline at end of file diff --git a/integrationTests/cypress/e2e/dogu_integration_test_lib/privileges.feature b/integrationTests/cypress/e2e/dogu_integration_test_lib/privileges.feature index 26a53732..187dcd6f 100644 --- a/integrationTests/cypress/e2e/dogu_integration_test_lib/privileges.feature +++ b/integrationTests/cypress/e2e/dogu_integration_test_lib/privileges.feature @@ -5,18 +5,21 @@ Feature: Automatic grant of privileges when logging into a dogu Scenario: ces user with default privileges has default privileges in the dogu Given the user is not member of the admin user group When the user logs into the CES + And the user waits until the page is fully loaded Then the user has no administrator privileges in the dogu @requires_testuser Scenario: ces user with admin privileges has admin privileges in the dogu Given the user is member of the admin user group When the user logs into the CES + And the user waits until the page is fully loaded Then the user has administrator privileges in the dogu @requires_testuser Scenario: ces user without admin privileges has no admin privileges in the dogu Given the user is not member of the admin user group When the user logs into the CES + And the user waits until the page is fully loaded Then the user has no administrator privileges in the dogu @requires_testuser @@ -24,6 +27,7 @@ Feature: Automatic grant of privileges when logging into a dogu Given the user has an internal default dogu account And the user is not member of the admin user group When the user logs into the CES + And the user waits until the page is fully loaded Then the user has no administrator privileges in the dogu @requires_testuser @@ -31,4 +35,5 @@ Feature: Automatic grant of privileges when logging into a dogu Given the user has an internal default dogu account And the user is member of the admin user group When the user logs into the CES + And the user waits until the page is fully loaded Then the user has administrator privileges in the dogu \ No newline at end of file diff --git a/integrationTests/cypress/e2e/scm_browser.feature b/integrationTests/cypress/e2e/scm_browser.feature index 7ec9fec3..18575ae4 100644 --- a/integrationTests/cypress/e2e/scm_browser.feature +++ b/integrationTests/cypress/e2e/scm_browser.feature @@ -4,4 +4,5 @@ Feature: SCM Browser Scenario: ces admin user can access index Given the user is member of the admin user group When the user logs into the CES + And the user waits until the page is fully loaded Then the user can access the index diff --git a/integrationTests/cypress/support/e2e.js b/integrationTests/cypress/support/e2e.js index 3921319c..33140b78 100644 --- a/integrationTests/cypress/support/e2e.js +++ b/integrationTests/cypress/support/e2e.js @@ -4,4 +4,4 @@ doguTestLibrary.registerCommands() // local commands import './commands/scm_api' -import './commands/scm_ui' +import './commands/scm_ui' \ No newline at end of file diff --git a/integrationTests/cypress/support/step_definitions/dogu_integration_test_library_steps.js b/integrationTests/cypress/support/step_definitions/dogu_integration_test_library_steps.js index c9727c83..f72a0555 100644 --- a/integrationTests/cypress/support/step_definitions/dogu_integration_test_library_steps.js +++ b/integrationTests/cypress/support/step_definitions/dogu_integration_test_library_steps.js @@ -20,6 +20,10 @@ When("the user clicks the dogu logout button", () => { cy.get('h2[class=banner-heading]').should('be.visible'); }); +When("the user waits until the page is fully loaded", () => { + cy.get('img[src="/scm/images/loading.svg"]').should('not.exist') +}); + Then("the user has administrator privileges in the dogu", () => { Cypress.on('uncaught:exception', () => { return false;