mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-24 17:32:15 +00:00
[ADF-4457] StorageService should be independent of AppConfigService (#4712)
* [ADF-4457] StorageService should be independent of AppConfigService * [ADF-4457] Fix e2e tests * [ADF-4457] Fix e2e tests * [ADF-4457] Improve storage service workflow * Fix linting * Fix unit tests * Fix e2e test * Add missing class to constructor * Fix e2e test * Rebase branch * Improve unit test * fix test
This commit is contained in:
davidcanonieto
committed by
Eugenio Romano
Eugenio Romano
parent
90c403ae9e
commit
5c07d5b3e6
@@ -23,6 +23,8 @@ import { UserPreferencesService, UserPreferenceValues } from './user-preferences
|
||||
import { setupTestBed } from '../testing/setupTestBed';
|
||||
import { CoreTestingModule } from '../testing/core.testing.module';
|
||||
import { AppConfigServiceMock } from '../mock/app-config.service.mock';
|
||||
import { AlfrescoApiService } from './alfresco-api.service';
|
||||
import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock';
|
||||
|
||||
describe('UserPreferencesService', () => {
|
||||
|
||||
@@ -30,13 +32,15 @@ describe('UserPreferencesService', () => {
|
||||
let preferences: UserPreferencesService;
|
||||
let storage: StorageService;
|
||||
let appConfig: AppConfigServiceMock;
|
||||
let alfrescoApiService: AlfrescoApiServiceMock;
|
||||
let translate: TranslateService;
|
||||
let changeDisposable: any;
|
||||
|
||||
setupTestBed({
|
||||
imports: [CoreTestingModule],
|
||||
providers: [
|
||||
{ provide: AppConfigService, useClass: AppConfigServiceMock }
|
||||
{ provide: AppConfigService, useClass: AppConfigServiceMock },
|
||||
{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }
|
||||
]
|
||||
});
|
||||
|
||||
@@ -51,6 +55,7 @@ describe('UserPreferencesService', () => {
|
||||
|
||||
storage = TestBed.get(StorageService);
|
||||
translate = TestBed.get(TranslateService);
|
||||
alfrescoApiService = new AlfrescoApiServiceMock(new AppConfigService(null), new StorageService());
|
||||
});
|
||||
|
||||
beforeEach(() => {
|
||||
@@ -65,176 +70,170 @@ describe('UserPreferencesService', () => {
|
||||
storage.clear();
|
||||
});
|
||||
|
||||
it('should get default pagination from app config', (done) => {
|
||||
preferences = new UserPreferencesService(translate, appConfig, storage);
|
||||
appConfig.config.pagination.size = 0;
|
||||
appConfig.load().then(() => {
|
||||
expect(preferences.paginationSize).toBe(0);
|
||||
done();
|
||||
describe(' with pagination config', () => {
|
||||
|
||||
beforeEach(() => {
|
||||
preferences = new UserPreferencesService(translate, appConfig, storage, alfrescoApiService);
|
||||
});
|
||||
});
|
||||
|
||||
it('should return supported page sizes defined in the app config', () => {
|
||||
preferences = new UserPreferencesService(translate, appConfig, storage);
|
||||
const supportedPages = preferences.supportedPageSizes;
|
||||
appConfig.load();
|
||||
expect(supportedPages).toEqual(supportedPaginationSize);
|
||||
});
|
||||
|
||||
it('should use [GUEST] as default storage prefix', () => {
|
||||
preferences = new UserPreferencesService(translate, appConfig, storage);
|
||||
preferences.setStoragePrefix(null);
|
||||
expect(preferences.getStoragePrefix()).toBe('GUEST');
|
||||
});
|
||||
|
||||
it('should change storage prefix', () => {
|
||||
preferences = new UserPreferencesService(translate, appConfig, storage);
|
||||
preferences.setStoragePrefix('USER_A');
|
||||
expect(preferences.getStoragePrefix()).toBe('USER_A');
|
||||
});
|
||||
|
||||
it('should format property key for default prefix', () => {
|
||||
preferences = new UserPreferencesService(translate, appConfig, storage);
|
||||
preferences.setStoragePrefix(null);
|
||||
expect(preferences.getPropertyKey('propertyA')).toBe('GUEST__propertyA');
|
||||
});
|
||||
|
||||
it('should format property key for custom prefix', () => {
|
||||
preferences = new UserPreferencesService(translate, appConfig, storage);
|
||||
preferences.setStoragePrefix('USER_A');
|
||||
expect(preferences.getPropertyKey('propertyA')).toBe('USER_A__propertyA');
|
||||
});
|
||||
|
||||
it('should save value with default prefix', () => {
|
||||
preferences = new UserPreferencesService(translate, appConfig, storage);
|
||||
preferences.set('propertyA', 'valueA');
|
||||
const propertyKey = preferences.getPropertyKey('propertyA');
|
||||
expect(storage.getItem(propertyKey)).toBe('valueA');
|
||||
});
|
||||
|
||||
it('should null value return default prefix', () => {
|
||||
preferences = new UserPreferencesService(translate, appConfig, storage);
|
||||
storage.setItem('paginationSize', null);
|
||||
const paginationSize = preferences.getPropertyKey('paginationSize');
|
||||
expect(preferences.get(paginationSize, 'default')).toBe('default');
|
||||
});
|
||||
|
||||
it('should save value with custom prefix', () => {
|
||||
preferences = new UserPreferencesService(translate, appConfig, storage);
|
||||
preferences.setStoragePrefix('USER_A');
|
||||
preferences.set('propertyA', 'valueA');
|
||||
const propertyKey = preferences.getPropertyKey('propertyA');
|
||||
expect(storage.getItem(propertyKey)).toBe('valueA');
|
||||
});
|
||||
|
||||
it('should return as default locale the app.config locate as first', () => {
|
||||
preferences = new UserPreferencesService(translate, appConfig, storage);
|
||||
appConfig.config.locale = 'fake-locate-config';
|
||||
spyOn(translate, 'getBrowserCultureLang').and.returnValue('fake-locate-browser');
|
||||
expect(preferences.getDefaultLocale()).toBe('fake-locate-config');
|
||||
});
|
||||
|
||||
it('should return as default locale the browser locale as second', () => {
|
||||
preferences = new UserPreferencesService(translate, appConfig, storage);
|
||||
spyOn(translate, 'getBrowserCultureLang').and.returnValue('fake-locate-browser');
|
||||
expect(preferences.getDefaultLocale()).toBe('fake-locate-browser');
|
||||
});
|
||||
|
||||
it('should return as default locale the component property as third ', () => {
|
||||
preferences = new UserPreferencesService(translate, appConfig, storage);
|
||||
spyOn(translate, 'getBrowserCultureLang').and.stub();
|
||||
expect(preferences.getDefaultLocale()).toBe('en');
|
||||
});
|
||||
|
||||
it('should return as locale the store locate', () => {
|
||||
preferences = new UserPreferencesService(translate, appConfig, storage);
|
||||
preferences.locale = 'fake-store-locate';
|
||||
appConfig.config.locale = 'fake-locate-config';
|
||||
spyOn(translate, 'getBrowserCultureLang').and.returnValue('fake-locate-browser');
|
||||
expect(preferences.locale).toBe('fake-store-locate');
|
||||
});
|
||||
|
||||
it('should store default textOrientation based on language ', async(() => {
|
||||
appConfig.config.languages = [
|
||||
{
|
||||
key: 'fake-locale-config'
|
||||
}
|
||||
];
|
||||
appConfig.config.locale = 'fake-locale-config';
|
||||
preferences = new UserPreferencesService(translate, appConfig, storage);
|
||||
appConfig.load();
|
||||
const textOrientation = preferences.getPropertyKey('textOrientation');
|
||||
expect(storage.getItem(textOrientation)).toBe('ltr');
|
||||
}));
|
||||
|
||||
it('should store textOrientation based on language config direction', async(() => {
|
||||
appConfig.config.languages = [
|
||||
{
|
||||
key: 'fake-locale-config',
|
||||
direction: 'rtl'
|
||||
}
|
||||
];
|
||||
appConfig.config.locale = 'fake-locale-config';
|
||||
preferences = new UserPreferencesService(translate, appConfig, storage);
|
||||
appConfig.load();
|
||||
const textOrientation = preferences.getPropertyKey('textOrientation');
|
||||
expect(storage.getItem(textOrientation)).toBe('rtl');
|
||||
}));
|
||||
|
||||
it('should not store textOrientation based on language ', async(() => {
|
||||
appConfig.config.languages = [
|
||||
{
|
||||
key: 'fake-locale-browser'
|
||||
}
|
||||
];
|
||||
preferences = new UserPreferencesService(translate, appConfig, storage);
|
||||
appConfig.load();
|
||||
|
||||
const textOrientation = preferences.getPropertyKey('textOrientation');
|
||||
expect(storage.getItem(textOrientation)).toBe(null);
|
||||
}));
|
||||
|
||||
it('should default to browser locale for textOrientation when locale is not defined in configuration', (done) => {
|
||||
appConfig.config.languages = [
|
||||
{
|
||||
key: 'fake-locale-browser',
|
||||
direction: 'rtl'
|
||||
}
|
||||
];
|
||||
spyOn(translate, 'getBrowserCultureLang').and.returnValue('fake-locale-browser');
|
||||
preferences = new UserPreferencesService(translate, appConfig, storage);
|
||||
appConfig.load();
|
||||
|
||||
changeDisposable = preferences.onChange
|
||||
.subscribe((userPreferenceStatus) => {
|
||||
expect(userPreferenceStatus['textOrientation']).toBe('rtl');
|
||||
it('should get default pagination from app config', (done) => {
|
||||
appConfig.config.pagination.size = 0;
|
||||
appConfig.load().then(() => {
|
||||
expect(preferences.paginationSize).toBe(0);
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it('should return supported page sizes defined in the app config', () => {
|
||||
const supportedPages = preferences.supportedPageSizes;
|
||||
appConfig.load();
|
||||
expect(supportedPages).toEqual(supportedPaginationSize);
|
||||
});
|
||||
|
||||
it('should use [GUEST] as default storage prefix', () => {
|
||||
preferences.setStoragePrefix(null);
|
||||
expect(preferences.getStoragePrefix()).toBe('GUEST');
|
||||
});
|
||||
|
||||
it('should change storage prefix', () => {
|
||||
preferences.setStoragePrefix('USER_A');
|
||||
expect(preferences.getStoragePrefix()).toBe('USER_A');
|
||||
});
|
||||
|
||||
it('should format property key for default prefix', () => {
|
||||
preferences.setStoragePrefix(null);
|
||||
expect(preferences.getPropertyKey('propertyA')).toBe('GUEST__propertyA');
|
||||
});
|
||||
|
||||
it('should format property key for custom prefix', () => {
|
||||
preferences.setStoragePrefix('USER_A');
|
||||
expect(preferences.getPropertyKey('propertyA')).toBe('USER_A__propertyA');
|
||||
});
|
||||
|
||||
it('should save value with default prefix', () => {
|
||||
preferences.set('propertyA', 'valueA');
|
||||
const propertyKey = preferences.getPropertyKey('propertyA');
|
||||
expect(storage.getItem(propertyKey)).toBe('valueA');
|
||||
});
|
||||
|
||||
it('should null value return default prefix', () => {
|
||||
storage.setItem('paginationSize', null);
|
||||
const paginationSize = preferences.getPropertyKey('paginationSize');
|
||||
expect(preferences.get(paginationSize, 'default')).toBe('default');
|
||||
});
|
||||
|
||||
it('should save value with custom prefix', () => {
|
||||
preferences.setStoragePrefix('USER_A');
|
||||
preferences.set('propertyA', 'valueA');
|
||||
const propertyKey = preferences.getPropertyKey('propertyA');
|
||||
expect(storage.getItem(propertyKey)).toBe('valueA');
|
||||
});
|
||||
|
||||
it('should return as default locale the app.config locate as first', () => {
|
||||
appConfig.config.locale = 'fake-locate-config';
|
||||
spyOn(translate, 'getBrowserCultureLang').and.returnValue('fake-locate-browser');
|
||||
expect(preferences.getDefaultLocale()).toBe('fake-locate-config');
|
||||
});
|
||||
|
||||
it('should return as default locale the browser locale as second', () => {
|
||||
spyOn(translate, 'getBrowserCultureLang').and.returnValue('fake-locate-browser');
|
||||
expect(preferences.getDefaultLocale()).toBe('fake-locate-browser');
|
||||
});
|
||||
|
||||
it('should return as default locale the component property as third ', () => {
|
||||
spyOn(translate, 'getBrowserCultureLang').and.stub();
|
||||
expect(preferences.getDefaultLocale()).toBe('en');
|
||||
});
|
||||
|
||||
it('should return as locale the store locate', () => {
|
||||
preferences.locale = 'fake-store-locate';
|
||||
appConfig.config.locale = 'fake-locate-config';
|
||||
spyOn(translate, 'getBrowserCultureLang').and.returnValue('fake-locate-browser');
|
||||
expect(preferences.locale).toBe('fake-store-locate');
|
||||
});
|
||||
|
||||
it('should not store in the storage the locale if the app.config.json does not have a value', () => {
|
||||
preferences.locale = 'fake-store-locate';
|
||||
spyOn(translate, 'getBrowserCultureLang').and.returnValue('fake-locate-browser');
|
||||
expect(preferences.locale).toBe('fake-store-locate');
|
||||
expect(storage.getItem(UserPreferenceValues.Locale)).toBe(null);
|
||||
});
|
||||
|
||||
it('should stream the page size value when is set', (done) => {
|
||||
preferences.paginationSize = 5;
|
||||
changeDisposable = preferences.onChange.subscribe((userPreferenceStatus) => {
|
||||
expect(userPreferenceStatus[UserPreferenceValues.PaginationSize]).toBe(5);
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it('should stream the user preference status when changed', (done) => {
|
||||
preferences.set('propertyA', 'valueA');
|
||||
changeDisposable = preferences.onChange.subscribe((userPreferenceStatus) => {
|
||||
expect(userPreferenceStatus.propertyA).toBe('valueA');
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
it('should not store in the storage the locale if the app.config.json does not have a value', () => {
|
||||
preferences = new UserPreferencesService(translate, appConfig, storage);
|
||||
preferences.locale = 'fake-store-locate';
|
||||
spyOn(translate, 'getBrowserCultureLang').and.returnValue('fake-locate-browser');
|
||||
expect(preferences.locale).toBe('fake-store-locate');
|
||||
expect(storage.getItem(UserPreferenceValues.Locale)).toBe(null);
|
||||
});
|
||||
describe('with language config', () => {
|
||||
|
||||
it('should stream the page size value when is set', (done) => {
|
||||
preferences = new UserPreferencesService(translate, appConfig, storage);
|
||||
preferences.paginationSize = 5;
|
||||
changeDisposable = preferences.onChange.subscribe((userPreferenceStatus) => {
|
||||
expect(userPreferenceStatus[UserPreferenceValues.PaginationSize]).toBe(5);
|
||||
done();
|
||||
});
|
||||
});
|
||||
it('should store default textOrientation based on language', async(() => {
|
||||
appConfig.config.languages = [
|
||||
{
|
||||
key: 'fake-locale-config'
|
||||
}
|
||||
];
|
||||
appConfig.config.locale = 'fake-locale-config';
|
||||
preferences = new UserPreferencesService(translate, appConfig, storage, alfrescoApiService);
|
||||
alfrescoApiService.initialize();
|
||||
const textOrientation = preferences.getPropertyKey('textOrientation');
|
||||
expect(storage.getItem(textOrientation)).toBe('ltr');
|
||||
}));
|
||||
|
||||
it('should stream the user preference status when changed', (done) => {
|
||||
preferences = new UserPreferencesService(translate, appConfig, storage);
|
||||
preferences.set('propertyA', 'valueA');
|
||||
changeDisposable = preferences.onChange.subscribe((userPreferenceStatus) => {
|
||||
expect(userPreferenceStatus.propertyA).toBe('valueA');
|
||||
done();
|
||||
it('should store textOrientation based on language config direction', async(() => {
|
||||
appConfig.config.languages = [
|
||||
{
|
||||
key: 'fake-locale-config',
|
||||
direction: 'rtl'
|
||||
}
|
||||
];
|
||||
appConfig.config.locale = 'fake-locale-config';
|
||||
preferences = new UserPreferencesService(translate, appConfig, storage, alfrescoApiService);
|
||||
alfrescoApiService.initialize();
|
||||
const textOrientation = preferences.getPropertyKey('textOrientation');
|
||||
expect(storage.getItem(textOrientation)).toBe('rtl');
|
||||
}));
|
||||
|
||||
it('should not store textOrientation based on language ', async(() => {
|
||||
appConfig.config.languages = [
|
||||
{
|
||||
key: 'fake-locale-browser'
|
||||
}
|
||||
];
|
||||
preferences = new UserPreferencesService(translate, appConfig, storage, alfrescoApiService);
|
||||
alfrescoApiService.initialize();
|
||||
|
||||
const textOrientation = preferences.getPropertyKey('textOrientation');
|
||||
expect(storage.getItem(textOrientation)).toBe(null);
|
||||
}));
|
||||
|
||||
it('should default to browser locale for textOrientation when locale is not defined in configuration', (done) => {
|
||||
appConfig.config.languages = [
|
||||
{
|
||||
key: 'fake-locale-browser',
|
||||
direction: 'rtl'
|
||||
}
|
||||
];
|
||||
spyOn(translate, 'getBrowserCultureLang').and.returnValue('fake-locale-browser');
|
||||
preferences = new UserPreferencesService(translate, appConfig, storage, alfrescoApiService);
|
||||
alfrescoApiService.initialize();
|
||||
|
||||
changeDisposable = preferences.onChange
|
||||
.subscribe((userPreferenceStatus) => {
|
||||
expect(userPreferenceStatus['textOrientation']).toBe('rtl');
|
||||
done();
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user