MOBILE-4201 login: Fix tests

moodlehq · Sep 8, 2023 · 05a5472 · 05a5472
1 parent 9c2133b
commit 05a5472
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 1 deletion.
diff --git a/...-new-account-in-the-app--site-name-in-displayed-when-adding-a-new-account_9.png b/...-new-account-in-the-app--site-name-in-displayed-when-adding-a-new-account_9.png
diff --git a/src/core/features/login/tests/credentials.test.ts b/src/core/features/login/tests/credentials.test.ts
@@ -22,6 +22,7 @@ import { CoreSites } from '@services/sites';
 import { Http } from '@singletons';
 import { of } from 'rxjs';
 import { CoreLoginHelper } from '../services/login-helper';
+import { CoreConstants } from '@/core/constants';
 
 describe('Credentials page', () => {
 
@@ -54,6 +55,28 @@ describe('Credentials page', () => {
                 maintenancemessage: '',
                 typeoflogin: 1,
             }),
+            checkSite: async () => ({
+                code: 0,
+                siteUrl,
+                service: CoreConstants.CONFIG.wsservice,
+                config: ({
+                    wwwroot: siteUrl,
+                    httpswwwroot: siteUrl,
+                    sitename: 'Example Campus',
+                    guestlogin: 0,
+                    rememberusername: 0,
+                    authloginviaemail: 0,
+                    registerauth: '',
+                    forgottenpasswordurl: '',
+                    authinstructions: '',
+                    authnoneenabled: 0,
+                    enablewebservices: 1,
+                    enablemobilewebservice: 1,
+                    maintenanceenabled: 0,
+                    maintenancemessage: '',
+                    typeoflogin: 1,
+                }),
+            }),
         });
 
         mockSingleton(CoreLoginHelper, { getAvailableSites: async () => [{ url: siteUrl, name: 'Example Campus' }] });
@@ -72,6 +95,30 @@ describe('Credentials page', () => {
     });
 
     it('suggests contacting support after multiple failed attempts', async () => {
+
+        const siteCheck = {
+            code: 0,
+            siteUrl,
+            service: CoreConstants.CONFIG.wsservice,
+            config: ({
+                wwwroot: siteUrl,
+                httpswwwroot: siteUrl,
+                sitename: 'Example Campus',
+                guestlogin: 0,
+                rememberusername: 0,
+                authloginviaemail: 0,
+                registerauth: '',
+                forgottenpasswordurl: '',
+                authinstructions: '',
+                authnoneenabled: 0,
+                enablewebservices: 1,
+                enablemobilewebservice: 1,
+                maintenanceenabled: 0,
+                maintenancemessage: '',
+                typeoflogin: 1,
+                supportpage: '',
+            }),
+        };
         // Arrange.
         mockSingleton(CoreSites, {
             getUserToken: () => {
@@ -80,12 +127,13 @@ describe('Credentials page', () => {
                     errorcode: 'invalidlogin',
                 });
             },
+            checkSite: async () => (siteCheck),
         });
 
         mockSingleton(CoreLoginHelper, { getAvailableSites: async () => [] });
 
         const fixture = await renderPageComponent(CoreLoginCredentialsPage, {
-            routeParams: { siteUrl, siteConfig: { supportpage: '' } },
+            routeParams: { siteUrl, siteCheck },
             imports: [CoreSharedModule, CoreLoginComponentsModule],
         });
 

diff --git a/...ser/tests/behat/snapshots/test-basic-usage-of-user-features-view-profile_21.png b/...ser/tests/behat/snapshots/test-basic-usage-of-user-features-view-profile_21.png