From dbd96d718128badafa9027cd2ebfb1dc1371497e Mon Sep 17 00:00:00 2001 From: Noel De Martin Date: Thu, 11 May 2023 09:46:42 +0200 Subject: [PATCH 1/3] MOBILE-4270 behat: Fix default window size Tests were already running with these dimensions, but we hadn't noticed because unless the tests are run in headless mode, the minimum width is 500px. --- local_moodleappbehat/tests/behat/behat_app.php | 1 - .../tests/behat/behat_app_helper.php | 16 +++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/local_moodleappbehat/tests/behat/behat_app.php b/local_moodleappbehat/tests/behat/behat_app.php index 67776a49f..d14b2391d 100644 --- a/local_moodleappbehat/tests/behat/behat_app.php +++ b/local_moodleappbehat/tests/behat/behat_app.php @@ -45,7 +45,6 @@ class behat_app extends behat_app_helper { ]; protected $featurepath = ''; - protected $windowsize = '360x720'; /** * @BeforeScenario diff --git a/local_moodleappbehat/tests/behat/behat_app_helper.php b/local_moodleappbehat/tests/behat/behat_app_helper.php index 6c4b38c0d..f30572b01 100644 --- a/local_moodleappbehat/tests/behat/behat_app_helper.php +++ b/local_moodleappbehat/tests/behat/behat_app_helper.php @@ -201,7 +201,7 @@ class behat_app_helper extends behat_base { $restart = true; // Reset its size. - $this->resize_window($this->windowsize, true); + $this->resize_app_window(); // Visit the Ionic URL. $this->getSession()->visit($this->get_app_url()); @@ -596,4 +596,18 @@ EOF; return null; } + + /** + * Resize window to have app dimensions. + */ + protected function resize_app_window() { + $width = 500; + $height = 720; + $offset = $this->evaluate_script("{ + x: window.outerWidth - document.body.offsetWidth, + y: window.outerHeight - window.innerHeight, + }"); + + $this->getSession()->getDriver()->resizeWindow($width + $offset['x'], $height + $offset['y']); + } } From 8d4b30fea897f005e7c2d8a6c5790d44b472156b Mon Sep 17 00:00:00 2001 From: Noel De Martin Date: Thu, 11 May 2023 10:09:53 +0200 Subject: [PATCH 2/3] MOBILE-4270 wiki: Fix groups navigation --- src/addons/mod/wiki/components/index/index.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/addons/mod/wiki/components/index/index.ts b/src/addons/mod/wiki/components/index/index.ts index 38780e1bb..0f1553ac3 100644 --- a/src/addons/mod/wiki/components/index/index.ts +++ b/src/addons/mod/wiki/components/index/index.ts @@ -601,6 +601,8 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp module: this.module, ...options, }, + animated: !options.replace, + replace: options.replace, }, ); } @@ -649,6 +651,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp subwikiId: subwikiId, userId: userId, groupId: groupId, + replace: true, }); } } @@ -1089,4 +1092,5 @@ type AddonModWikiOpenPageOptions = { pageId?: number; userId?: number; groupId?: number; + replace?: boolean; }; From 11088abdf583d26ca040353c42c8dc68e117015c Mon Sep 17 00:00:00 2001 From: Noel De Martin Date: Thu, 11 May 2023 10:28:32 +0200 Subject: [PATCH 3/3] MOBILE-4270 messages: Prevent actions shrinking --- src/core/components/message/message.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/components/message/message.scss b/src/core/components/message/message.scss index d862805a5..70e80d774 100644 --- a/src/core/components/message/message.scss +++ b/src/core/components/message/message.scss @@ -83,7 +83,7 @@ } .extra { - flex-shrink: 1; + flex-shrink: 0; display: flex; flex-direction: row; padding-left: 8px;