Merge branch 'accessibility-settings-7.6' into accessibility-settings-8_x

# Conflicts:
#	src/app/accessibility/accessibility-settings.service.spec.ts
#	src/app/accessibility/accessibility-settings.service.ts
#	src/app/info/accessibility-settings/accessibility-settings.component.spec.ts
#	src/app/info/accessibility-settings/accessibility-settings.component.ts
#	src/app/shared/cookies/klaro-configuration.ts

Author: AAwouters

src/app/accessibility/accessibility-settings.service.spec.ts

@@ -4,10 +4,12 @@ import {
 } from '@angular/core/testing';
 import { of } from 'rxjs';
 
+import { AppConfig } from '../../config/app-config.interface';
 import { AuthService } from '../core/auth/auth.service';
 import { EPersonDataService } from '../core/eperson/eperson-data.service';
 import { EPerson } from '../core/eperson/models/eperson.model';
 import { CookieService } from '../core/services/cookie.service';
+import { KlaroServiceStub } from '../shared/cookies/klaro.service.stub';
 import { CookieServiceMock } from '../shared/mocks/cookie.service.mock';
 import {
   createFailedRemoteDataObject$,
@@ -29,10 +31,16 @@ describe('accessibilitySettingsService', () => {
   let cookieService: CookieServiceMock;
   let authService: AuthServiceStub;
   let ePersonService: EPersonDataService;
+  let klaroService: KlaroServiceStub;
+  let appConfig: AppConfig;
 
   beforeEach(() => {
     cookieService = new CookieServiceMock();
     authService = new AuthServiceStub();
+    klaroService = new KlaroServiceStub();
+    appConfig = { accessibility: { cookieExpirationDuration: 10 } } as AppConfig;
+
+    klaroService.getSavedPreferences.and.returnValue(of({ accessibility: true }));
 
     ePersonService = jasmine.createSpyObj('ePersonService', {
       createPatchFromCache: of([{
@@ -46,6 +54,8 @@ describe('accessibilitySettingsService', () => {
       cookieService as unknown as CookieService,
       authService as unknown as AuthService,
       ePersonService,
+      klaroService,
+      appConfig,
     );
   });
 
@@ -180,12 +190,12 @@ describe('accessibilitySettingsService', () => {
 
   describe('setSettings', () => {
     beforeEach(() => {
-      service.setSettingsInCookie = jasmine.createSpy('setSettingsInCookie');
+      service.setSettingsInCookie = jasmine.createSpy('setSettingsInCookie').and.returnValue(of('cookie'));
     });
 
     it('should attempt to set settings in metadata', () => {
       service.setSettingsInAuthenticatedUserMetadata =
-        jasmine.createSpy('setSettingsInAuthenticatedUserMetadata').and.returnValue(of(false));
+        jasmine.createSpy('setSettingsInAuthenticatedUserMetadata').and.returnValue(of('failed'));
 
       const settings: AccessibilitySettings = {
         notificationTimeOut: '1000',
@@ -209,7 +219,7 @@ describe('accessibilitySettingsService', () => {
 
     it('should not set settings in cookie if metadata succeeded', () => {
       service.setSettingsInAuthenticatedUserMetadata =
-        jasmine.createSpy('setSettingsInAuthenticatedUserMetadata').and.returnValue(of(true));
+        jasmine.createSpy('setSettingsInAuthenticatedUserMetadata').and.returnValue(of('metadata'));
 
       const settings: AccessibilitySettings = {
         notificationTimeOut: '1000',
@@ -221,7 +231,7 @@ describe('accessibilitySettingsService', () => {
 
     it('should return \'metadata\' if settings are stored in metadata', () => {
       service.setSettingsInAuthenticatedUserMetadata =
-        jasmine.createSpy('setSettingsInAuthenticatedUserMetadata').and.returnValue(of(true));
+        jasmine.createSpy('setSettingsInAuthenticatedUserMetadata').and.returnValue(of('metadata'));
 
       const settings: AccessibilitySettings = {
         notificationTimeOut: '1000',
@@ -284,11 +294,11 @@ describe('accessibilitySettingsService', () => {
       expect(service.setSettingsInMetadata).toHaveBeenCalled();
     }));
 
-    it('should emit false when the user is not authenticated', fakeAsync(() => {
+    it('should emit "failed" when the user is not authenticated', fakeAsync(() => {
       authService.getAuthenticatedUserFromStoreIfAuthenticated = jasmine.createSpy().and.returnValue(of(null));
 
       service.setSettingsInAuthenticatedUserMetadata({})
-        .subscribe(value => expect(value).toBeFalse());
+        .subscribe(value => expect(value).toEqual('failed'));
       flush();
 
       expect(service.setSettingsInMetadata).not.toHaveBeenCalled();
@@ -324,23 +334,23 @@ describe('accessibilitySettingsService', () => {
       expect(ePersonService.patch).toHaveBeenCalled();
     });
 
-    it('should emit true when the update succeeded', fakeAsync(() => {
+    it('should emit "metadata" when the update succeeded', fakeAsync(() => {
       ePersonService.patch = jasmine.createSpy().and.returnValue(createSuccessfulRemoteDataObject$({}));
 
       service.setSettingsInMetadata(ePerson, { ['liveRegionTimeOut']: '500' })
         .subscribe(value => {
-          expect(value).toBeTrue();
+          expect(value).toEqual('metadata');
         });
 
       flush();
     }));
 
-    it('should emit false when the update failed', fakeAsync(() => {
+    it('should emit "failed" when the update failed', fakeAsync(() => {
       ePersonService.patch = jasmine.createSpy().and.returnValue(createFailedRemoteDataObject$());
 
       service.setSettingsInMetadata(ePerson, { ['liveRegionTimeOut']: '500' })
         .subscribe(value => {
-          expect(value).toBeFalse();
+          expect(value).toEqual('failed');
         });
 
       flush();
@@ -353,16 +363,34 @@ describe('accessibilitySettingsService', () => {
       cookieService.remove = jasmine.createSpy('remove');
     });
 
-    it('should store the settings in a cookie', () => {
-      service.setSettingsInCookie({ ['liveRegionTimeOut']: '500' });
+    it('should fail to store settings in the cookie when the user has not accepted the cookie', fakeAsync(() => {
+      klaroService.getSavedPreferences.and.returnValue(of({ accessibility: false }));
+
+      service.setSettingsInCookie({ ['liveRegionTimeOut']: '500' }).subscribe(value => {
+        expect(value).toEqual('failed');
+      });
+      flush();
+      expect(cookieService.set).not.toHaveBeenCalled();
+    }));
+
+    it('should store the settings in a cookie', fakeAsync(() => {
+      service.setSettingsInCookie({ ['liveRegionTimeOut']: '500' }).subscribe(value => {
+        expect(value).toEqual('cookie');
+      });
+      flush();
       expect(cookieService.set).toHaveBeenCalled();
-    });
+    }));
+
+    it('should remove the cookie when the settings are empty', fakeAsync(() => {
+      service.setSettingsInCookie({}).subscribe(value => {
+        expect(value).toEqual('cookie');
+      });
+
+      flush();
 
-    it('should remove the cookie when the settings are empty', () => {
-      service.setSettingsInCookie({});
       expect(cookieService.set).not.toHaveBeenCalled();
       expect(cookieService.remove).toHaveBeenCalled();
-    });
+    }));
   });
 
   describe('convertFormValuesToStoredValues', () => {

src/app/accessibility/accessibility-settings.service.stub.ts

@@ -37,5 +37,9 @@ export class AccessibilitySettingsServiceStub {
 
   convertStoredValuesToFormValues = jasmine.createSpy('convertStoredValuesToFormValues').and.returnValue({});
 
-  getPlaceholder = jasmine.createSpy('getPlaceholder').and.returnValue('placeholder');
+  getDefaultValue = jasmine.createSpy('getPlaceholder').and.returnValue('placeholder');
+
+  isValid = jasmine.createSpy('isValid').and.returnValue(true);
+
+  formValuesValid = jasmine.createSpy('allValid').and.returnValue(true);
 }