From 53067785dd26492dde7da47e7f40573983fa6ab4 Mon Sep 17 00:00:00 2001 From: briskt <3172830+briskt@users.noreply.github.com> Date: Fri, 10 May 2024 15:46:54 +0800 Subject: [PATCH] fixed profilereview.feature:24 test scenario using pwmanager service --- actions-services.yml | 6 +++--- docker-compose.yml | 6 +++--- dockerbuild/run-integration-tests.sh | 6 +++--- features/profilereview.feature | 3 --- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/actions-services.yml b/actions-services.yml index f8a8d562..85f6bae3 100644 --- a/actions-services.yml +++ b/actions-services.yml @@ -10,7 +10,7 @@ services: - pwmanager.local - test-browser environment: - - PROFILE_URL_FOR_TESTS=http://ssp-sp1.local/module.php/core/authenticate.php?as=ssp-hub + - PROFILE_URL_FOR_TESTS=http://pwmanager.local/module.php/core/authenticate.php?as=ssp-hub - MFA_SETUP_URL_FOR_TESTS=http://pwmanager.local/module.php/core/authenticate.php?as=ssp-hub - ADMIN_EMAIL=john_doe@there.com - ADMIN_PASS=b @@ -98,8 +98,8 @@ services: MFA_SETUP_URL: "http://pwmanager.local:8083/module.php/core/authenticate.php?as=ssp-hub-custom-port" MFA_SETUP_URL_FOR_TESTS: "http://pwmanager.local/module.php/core/authenticate.php?as=ssp-hub" REMEMBER_ME_SECRET: "12345" - PROFILE_URL: "http://ssp-hub-sp1:8083/module.php/core/authenticate.php?as=ssp-hub-custom-port" - PROFILE_URL_FOR_TESTS: "http://ssp-sp1.local/module.php/core/authenticate.php?as=ssp-hub" + PROFILE_URL: "http://pwmanager:8083/module.php/core/authenticate.php?as=ssp-hub-custom-port" + PROFILE_URL_FOR_TESTS: "http://pwmanager.local/module.php/core/authenticate.php?as=ssp-hub" SECURE_COOKIE: "false" SHOW_SAML_ERRORS: "true" THEME_USE: "default" diff --git a/docker-compose.yml b/docker-compose.yml index af547cf8..32727eee 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -44,7 +44,7 @@ services: - test-browser environment: - COMPOSER_CACHE_DIR=/composer - - PROFILE_URL_FOR_TESTS=http://ssp-sp1.local/module.php/core/authenticate.php?as=ssp-hub + - PROFILE_URL_FOR_TESTS=http://pwmanager.local/module.php/core/authenticate.php?as=ssp-hub - MFA_SETUP_URL_FOR_TESTS=http://pwmanager.local/module.php/core/authenticate.php?as=ssp-hub - ADMIN_EMAIL=john_doe@there.com - ADMIN_PASS=b @@ -175,8 +175,8 @@ services: MFA_SETUP_URL: "http://pwmanager.local:8083/module.php/core/authenticate.php?as=ssp-hub-custom-port" MFA_SETUP_URL_FOR_TESTS: "http://pwmanager.local/module.php/core/authenticate.php?as=ssp-hub" REMEMBER_ME_SECRET: "12345" - PROFILE_URL: "http://ssp-hub-sp1:8083/module.php/core/authenticate.php?as=ssp-hub-custom-port" - PROFILE_URL_FOR_TESTS: "http://ssp-sp1.local/module.php/core/authenticate.php?as=ssp-hub" + PROFILE_URL: "http://pwmanager:8083/module.php/core/authenticate.php?as=ssp-hub-custom-port" + PROFILE_URL_FOR_TESTS: "http://pwmanager.local/module.php/core/authenticate.php?as=ssp-hub" SECURE_COOKIE: "false" SHOW_SAML_ERRORS: "true" THEME_USE: "default" diff --git a/dockerbuild/run-integration-tests.sh b/dockerbuild/run-integration-tests.sh index c46b02c5..71d8c006 100755 --- a/dockerbuild/run-integration-tests.sh +++ b/dockerbuild/run-integration-tests.sh @@ -6,9 +6,9 @@ set -x cd /data export COMPOSER_ALLOW_SUPERUSER=1; composer install -whenavail "ssp-hub.local" 80 10 echo Hub ready -whenavail "ssp-idp1.local" 80 10 echo IDP 1 ready -whenavail "ssp-sp1.local" 80 10 echo SP 1 ready +whenavail "ssp-hub.local" 80 15 echo Hub ready +whenavail "ssp-idp1.local" 80 5 echo IDP 1 ready +whenavail "ssp-sp1.local" 80 5 echo SP 1 ready ./vendor/bin/behat \ --no-interaction \ diff --git a/features/profilereview.feature b/features/profilereview.feature index 56643e9d..b378e712 100644 --- a/features/profilereview.feature +++ b/features/profilereview.feature @@ -25,9 +25,6 @@ Feature: Prompt to review profile information Given I provide credentials that are due for a reminder And I have logged in When I click the update profile button - # FIXME: It is currently required to login again, but it shouldn't be necessary. - And I click on the "IDP 1" tile - And I login Then I should end up at the update profile URL Examples: