From 247e31add40c38f58bda87ee8a82c41f2c2a5d85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Wed, 17 Jun 2020 12:08:33 +0200 Subject: [PATCH 1/2] MOBILE-3401 travis: Fix telegram e2e notifications --- scripts/test_e2e.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/test_e2e.sh b/scripts/test_e2e.sh index fc1c36291..22edff551 100755 --- a/scripts/test_e2e.sh +++ b/scripts/test_e2e.sh @@ -45,13 +45,13 @@ $dockerscripts/moodle-docker-wait-for-app $dockercompose exec -T webserver sh -c "php admin/tool/behat/cli/init.php" notify_on_error_exit "e2e failed initializing behat" +print_title "Running e2e tests" + # Run tests for tags in "$@" do - print_title "Running e2e tests ($tags)" - $dockercompose exec -T webserver sh -c "php admin/tool/behat/cli/run.php --tags=\"$tags\"" - notify_on_error_exit "e2e failed on $tags" + notify_on_error_exit "Some e2e tests are failing, please review" done # Clean up From f6a63d53e52ece1132dd13d1df7b7744492b2086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Fri, 19 Jun 2020 12:31:40 +0200 Subject: [PATCH 2/2] MOBILE-3401 login: Do not unload site if view not destroyed --- src/core/login/pages/credentials/credentials.ts | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/core/login/pages/credentials/credentials.ts b/src/core/login/pages/credentials/credentials.ts index 2702200bd..e614d1b8b 100644 --- a/src/core/login/pages/credentials/credentials.ts +++ b/src/core/login/pages/credentials/credentials.ts @@ -93,16 +93,9 @@ export class CoreLoginCredentialsPage { } /** - * View enter. + * View destroyed. */ - ionViewDidEnter(): void { - this.viewLeft = false; - } - - /** - * View left. - */ - ionViewDidLeave(): void { + ionViewWillUnload(): void { this.viewLeft = true; this.eventsProvider.trigger(CoreEventsProvider.LOGIN_SITE_UNCHECKED, { config: this.siteConfig }, this.siteId); }