From 4679926511c9e845a26eb4c9ab606ce889feea21 Mon Sep 17 00:00:00 2001 From: Julius Härtl Date: Fri, 24 Jul 2020 07:32:32 +0200 Subject: Redirect to files app after login in acceptance tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- tests/acceptance/features/bootstrap/LoginPageContext.php | 2 +- tests/acceptance/installAndConfigureServer.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/acceptance/features/bootstrap/LoginPageContext.php b/tests/acceptance/features/bootstrap/LoginPageContext.php index bf44d31fb03..08046c6e3a3 100644 --- a/tests/acceptance/features/bootstrap/LoginPageContext.php +++ b/tests/acceptance/features/bootstrap/LoginPageContext.php @@ -91,7 +91,7 @@ class LoginPageContext implements Context, ActorAwareInterface { */ public function iSeeThatTheCurrentPageIsTheLoginPage() { PHPUnit_Framework_Assert::assertStringStartsWith( - $this->actor->locatePath("/login"), + $this->actor->locatePath("/login?redirect_url=/index.php/apps/files"), $this->actor->getSession()->getCurrentUrl()); } diff --git a/tests/acceptance/installAndConfigureServer.sh b/tests/acceptance/installAndConfigureServer.sh index d24405fa448..99d51e951af 100755 --- a/tests/acceptance/installAndConfigureServer.sh +++ b/tests/acceptance/installAndConfigureServer.sh @@ -39,6 +39,8 @@ OC_PASS=123456acb php occ user:add --password-from-env user1 OC_PASS=123456acb php occ user:add --password-from-env disabledUser php occ user:disable disabledUser +php occ app:disable dashboard + if [ "$NEXTCLOUD_SERVER_DOMAIN" != "" ]; then # Default first trusted domain is "localhost"; replace it with given domain. php occ config:system:set trusted_domains 0 --value="$NEXTCLOUD_SERVER_DOMAIN" -- cgit v1.2.3 From 5a06e385644dc90e6ca949beac2c731a318d4f9b Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 5 Aug 2020 22:49:05 +0200 Subject: Dashboard app is disabled and there is no need to redirect to files app Signed-off-by: Morris Jobke --- tests/acceptance/features/bootstrap/LoginPageContext.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/acceptance/features/bootstrap/LoginPageContext.php b/tests/acceptance/features/bootstrap/LoginPageContext.php index 08046c6e3a3..bf44d31fb03 100644 --- a/tests/acceptance/features/bootstrap/LoginPageContext.php +++ b/tests/acceptance/features/bootstrap/LoginPageContext.php @@ -91,7 +91,7 @@ class LoginPageContext implements Context, ActorAwareInterface { */ public function iSeeThatTheCurrentPageIsTheLoginPage() { PHPUnit_Framework_Assert::assertStringStartsWith( - $this->actor->locatePath("/login?redirect_url=/index.php/apps/files"), + $this->actor->locatePath("/login"), $this->actor->getSession()->getCurrentUrl()); } -- cgit v1.2.3