inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-10-08 14:51:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-3042] Use the custom date adapter from adf-core on Search Date Range widget (#3394)

Browse Source 
-fix localization
-fix tests
-show parse error
This commit is contained in:
Suzana Dirla
2018-05-25 15:45:55 +03:00
committed by Eugenio Romano
parent 85ff224e26
commit 11bac7e796
4 changed files with 46 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/content-services/search/components/search-date-range/search-date-range.component.spec.ts
View File

@@ -15,11 +15,11 @@
* limitations under the License.
*/
import { CustomMomentDateAdapter, SearchDateRangeComponent } from './search-date-range.component';
import { SearchDateRangeComponent } from './search-date-range.component';
import { Observable } from 'rxjs/Observable';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ContentTestingModule } from '../../../testing/content.testing.module';
import { setupTestBed } from '@alfresco/adf-core';
import { setupTestBed, MomentDateAdapter } from '@alfresco/adf-core';
import { By } from '@angular/platform-browser';
import { TranslateService } from '@ngx-translate/core';
@@ -34,9 +34,9 @@ describe('SearchDateRangeComponent', () => {
const localeFixture = 'it';
const dateFormatFixture = 'DD-MMM-YY';
const buildAdapter = (): CustomMomentDateAdapter => {
const dateAdapter = new CustomMomentDateAdapter(null);
dateAdapter.customDateFormat = null;
const buildAdapter = (): MomentDateAdapter => {
const dateAdapter = new MomentDateAdapter();
dateAdapter.overrideDisplyaFormat = null;
return dateAdapter;
};
@@ -72,14 +72,14 @@ describe('SearchDateRangeComponent', () => {
it('should setup the format of the date from configuration', () => {
component.settings = {field: 'cm:created', dateFormat: dateFormatFixture};
component.ngOnInit();
expect(theDateAdapter.customDateFormat).toBe(dateFormatFixture);
expect(theDateAdapter.overrideDisplyaFormat).toBe(dateFormatFixture);
});
it('should setup form control with formatted valid date on change', () => {
component.settings = {field: 'cm:created', dateFormat: dateFormatFixture};
component.ngOnInit();
const inputString = '20.feb.18';
const inputString = '20-feb-18';
const momentFromInput = moment(inputString, dateFormatFixture);
expect(momentFromInput.isValid()).toBeTruthy();