hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-15 14:03:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CST-6782] Fixed failing tests

Browse Source
This commit is contained in:
Vincenzo Mecca
2022-09-19 16:26:31 +02:00
parent 36b8b8b61b
commit 4484c3ebbc
2 changed files with 54 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/app/shared/cookies/browser-klaro.service.spec.ts
View File

@@ -262,8 +262,10 @@ describe('BrowserKlaroService', () => {
describe('initialize google analytics configuration', () => { describe('initialize google analytics configuration', () => {
let GOOGLE_ANALYTICS_KEY; let GOOGLE_ANALYTICS_KEY;
let REGISTRATION_VERIFICATION_ENABLED_KEY;
beforeEach(() => { beforeEach(() => {
GOOGLE_ANALYTICS_KEY = clone((service as any).GOOGLE_ANALYTICS_KEY); GOOGLE_ANALYTICS_KEY = clone((service as any).GOOGLE_ANALYTICS_KEY);
REGISTRATION_VERIFICATION_ENABLED_KEY = clone((service as any).REGISTRATION_VERIFICATION_ENABLED_KEY);
spyOn((service as any), 'getUser$').and.returnValue(observableOf(user)); spyOn((service as any), 'getUser$').and.returnValue(observableOf(user));
translateService.get.and.returnValue(observableOf('loading...')); translateService.get.and.returnValue(observableOf('loading...'));
spyOn(service, 'addAppMessages'); spyOn(service, 'addAppMessages');
@@ -292,27 +294,64 @@ describe('BrowserKlaroService', () => {
expect(service.klaroConfig.services).toContain(jasmine.objectContaining({name: googleAnalytics})); expect(service.klaroConfig.services).toContain(jasmine.objectContaining({name: googleAnalytics}));
}); });
it('should filter googleAnalytics when empty configuration is retrieved', () => { it('should filter googleAnalytics when empty configuration is retrieved', () => {
configurationDataService.findByPropertyName = jasmine.createSpy().withArgs(GOOGLE_ANALYTICS_KEY).and.returnValue( configurationDataService.findByPropertyName =
createSuccessfulRemoteDataObject$({ jasmine.createSpy()
... new ConfigurationProperty(), .withArgs(GOOGLE_ANALYTICS_KEY)
name: googleAnalytics, .and
values: [], .returnValue(
})); createSuccessfulRemoteDataObject$({
... new ConfigurationProperty(),
name: googleAnalytics,
values: [],
}
)
)
.withArgs(REGISTRATION_VERIFICATION_ENABLED_KEY)
.and
.returnValue(
createSuccessfulRemoteDataObject$({
... new ConfigurationProperty(),
name: trackingIdTestValue,
values: ['false'],
})
);
service.initialize(); service.initialize();
expect(service.klaroConfig.services).not.toContain(jasmine.objectContaining({name: googleAnalytics})); expect(service.klaroConfig.services).not.toContain(jasmine.objectContaining({name: googleAnalytics}));
}); });
it('should filter googleAnalytics when an error occurs', () => { it('should filter googleAnalytics when an error occurs', () => {
configurationDataService.findByPropertyName = jasmine.createSpy().withArgs(GOOGLE_ANALYTICS_KEY).and.returnValue( configurationDataService.findByPropertyName =
createFailedRemoteDataObject$('Erro while loading GA') jasmine.createSpy()
); .withArgs(GOOGLE_ANALYTICS_KEY).and.returnValue(
createFailedRemoteDataObject$('Error while loading GA')
)
.withArgs(REGISTRATION_VERIFICATION_ENABLED_KEY)
.and
.returnValue(
createSuccessfulRemoteDataObject$({
... new ConfigurationProperty(),
name: trackingIdTestValue,
values: ['false'],
})
);
service.initialize(); service.initialize();
expect(service.klaroConfig.services).not.toContain(jasmine.objectContaining({name: googleAnalytics})); expect(service.klaroConfig.services).not.toContain(jasmine.objectContaining({name: googleAnalytics}));
}); });
it('should filter googleAnalytics when an invalid payload is retrieved', () => { it('should filter googleAnalytics when an invalid payload is retrieved', () => {
configurationDataService.findByPropertyName = jasmine.createSpy().withArgs(GOOGLE_ANALYTICS_KEY).and.returnValue( configurationDataService.findByPropertyName =
createSuccessfulRemoteDataObject$(null) jasmine.createSpy()
); .withArgs(GOOGLE_ANALYTICS_KEY).and.returnValue(
createSuccessfulRemoteDataObject$(null)
)
.withArgs(REGISTRATION_VERIFICATION_ENABLED_KEY)
.and
.returnValue(
createSuccessfulRemoteDataObject$({
... new ConfigurationProperty(),
name: trackingIdTestValue,
values: ['false'],
})
);
service.initialize(); service.initialize();
expect(service.klaroConfig.services).not.toContain(jasmine.objectContaining({name: googleAnalytics})); expect(service.klaroConfig.services).not.toContain(jasmine.objectContaining({name: googleAnalytics}));
}); });

4
src/app/shared/cookies/browser-klaro.service.ts
View File

@@ -50,6 +50,8 @@ export class BrowserKlaroService extends KlaroService {
private readonly GOOGLE_ANALYTICS_KEY = 'google.analytics.key'; private readonly GOOGLE_ANALYTICS_KEY = 'google.analytics.key';
private readonly REGISTRATION_VERIFICATION_ENABLED_KEY = 'registration.verification.enabled';
private readonly GOOGLE_ANALYTICS_SERVICE_NAME = 'google-analytics'; private readonly GOOGLE_ANALYTICS_SERVICE_NAME = 'google-analytics';
/** /**
@@ -90,7 +92,7 @@ export class BrowserKlaroService extends KlaroService {
}), }),
); );
this.configService.findByPropertyName('registration.verification.enabled').pipe( this.configService.findByPropertyName(this.REGISTRATION_VERIFICATION_ENABLED_KEY).pipe(
getFirstCompletedRemoteData(), getFirstCompletedRemoteData(),
).subscribe((remoteData) => { ).subscribe((remoteData) => {
if (remoteData.statusCode === 404 || isEmpty(remoteData.payload?.values) || remoteData.payload.values[0].toLowerCase() !== 'true') { if (remoteData.statusCode === 404 || isEmpty(remoteData.payload?.values) || remoteData.payload.values[0].toLowerCase() !== 'true') {