Skip to content

Commit 2a2e3af

Browse files
authored
Merge pull request #2418 from crazyserver/MOBILE-3401
Mobile 3401
2 parents 784ba9c + f6a63d5 commit 2a2e3af

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

scripts/test_e2e.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ $dockerscripts/moodle-docker-wait-for-app
4545
$dockercompose exec -T webserver sh -c "php admin/tool/behat/cli/init.php"
4646
notify_on_error_exit "e2e failed initializing behat"
4747

48+
print_title "Running e2e tests"
49+
4850
# Run tests
4951
for tags in "$@"
5052
do
51-
print_title "Running e2e tests ($tags)"
52-
5353
$dockercompose exec -T webserver sh -c "php admin/tool/behat/cli/run.php --tags=\"$tags\""
5454
notify_on_error_exit "Some e2e tests are failing, please review"
5555
done

src/core/login/pages/credentials/credentials.ts

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,16 +93,9 @@ export class CoreLoginCredentialsPage {
9393
}
9494

9595
/**
96-
* View enter.
96+
* View destroyed.
9797
*/
98-
ionViewDidEnter(): void {
99-
this.viewLeft = false;
100-
}
101-
102-
/**
103-
* View left.
104-
*/
105-
ionViewDidLeave(): void {
98+
ionViewWillUnload(): void {
10699
this.viewLeft = true;
107100
this.eventsProvider.trigger(CoreEventsProvider.LOGIN_SITE_UNCHECKED, { config: this.siteConfig }, this.siteId);
108101
}

0 commit comments

Comments
 (0)