Merge pull request #4481 from dpalou/MOBILE-4653

Mobile 4653

Author: crazyserver

src/addons/mod/glossary/tests/behat/navigation.feature

@@ -146,11 +146,11 @@ Feature: Test glossary navigation
     When I go back in the app
     And I scroll to "Acerola" in the app
     And I press "Search" in the app
-    And I set the field "Search query" to "something" in the app
+    And I set the field "Enter your search query" to "something" in the app
     And I press enter
     Then I should find "No entries were found." in the app
 
-    When I set the field "Search query" to "melon" in the app
+    When I set the field "Enter your search query" to "melon" in the app
     And I press enter
     Then I should find "Honeydew Melon" in the app
     And I should find "Watermelon" in the app
@@ -265,11 +265,11 @@ Feature: Test glossary navigation
 
     # Search
     When I press "Search" in the app
-    And I set the field "Search query" to "something" in the app
+    And I set the field "Enter your search query" to "something" in the app
     And I press enter
     Then I should find "No entries were found." in the app
 
-    When I set the field "Search query" to "melon" in the app
+    When I set the field "Enter your search query" to "melon" in the app
     And I press enter
     Then I should find "Honeydew Melon" in the app
     And I should find "Watermelon" in the app

src/core/features/login/tests/behat/basic_usage.feature

@@ -185,3 +185,34 @@ Feature: Test basic usage of login in app
       | Password | student1 |
     And I press "Log in" near "Lost password?" in the app
     Then the header should be "Acceptance test site" in the app
+
+  Scenario: Exceeded login attempts
+    Given the following config values are set as admin:
+      | supportavailability | 2 |
+    When I launch the app
+    And I set the field "Your site" to "$WWWROOT" in the app
+    And I press "Connect to your site" in the app
+    And I set the following fields to these values in the app:
+      | Username | wrong       |
+      | Password | credentials |
+    And I press "Log in" near "Lost password?" in the app
+    Then I should find "Invalid login" in the app
+
+    When I press "OK" in the app
+    Then I should not find "Need help logging in?" in the app
+
+    When I press "Log in" near "Lost password?" in the app
+    And I press "OK" in the app
+    Then I should not find "Need help logging in?" in the app
+
+    When I press "Log in" near "Lost password?" in the app
+    And I press "OK" in the app
+    Then I should find "Need help logging in?" in the app
+
+    When I press "recovering your password" in the app
+    Then I should find "Forgotten password" in the app
+    And I should find "To reset your password" in the app
+
+    When I go back in the app
+    And I press "Contact support" in the app
+    Then the app should have opened a browser tab with url ".*\/user\/contactsitesupport\.php"

src/core/features/user/services/support.ts

@@ -25,6 +25,7 @@ import { AlertButton } from '@ionic/angular';
 import { CoreLang } from '@services/lang';
 import { CoreUserNullSupportConfig } from '@features/user/classes/support/null-support-config';
 import { CoreAlerts } from '@services/overlays/alerts';
+import { CoreOpener } from '@singletons/opener';
 
 /**
  * Handle site support.
@@ -40,7 +41,10 @@ export class CoreUserSupportService {
     async contact(options: CoreUserSupportContactOptions = {}): Promise<void> {
         const supportConfig = options.supportConfig ?? CoreUserAuthenticatedSupportConfig.forCurrentSite();
         const supportPageUrl = supportConfig.getSupportPageUrl();
-        const browser = await CoreSites.getCurrentSite()?.openInAppWithAutoLogin(supportPageUrl);
+        const currentSite = CoreSites.getCurrentSite();
+        const browser = await (currentSite ?
+            currentSite.openInAppWithAutoLogin(supportPageUrl) :
+            CoreOpener.openInApp(supportPageUrl));
 
         if (browser && supportPageUrl.endsWith('/user/contactsitesupport.php')) {
             this.populateSupportForm(browser, options.subject, options.message);