Skip to content

Commit a76f026

Browse files
committed
[NAE-1544] Time zone in Date and Datetime field
- correcting tests
1 parent cabf216 commit a76f026

File tree

2 files changed

+20
-6
lines changed

2 files changed

+20
-6
lines changed

projects/netgrif-components/src/lib/data-fields/date-time-field/simple-date-time-field/simple-date-time-field.component.spec.ts

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {DataFieldTemplateComponent} from '../../data-field-template/data-field-t
44
import {RequiredLabelComponent} from '../../required-label/required-label.component';
55
import {Component, CUSTOM_ELEMENTS_SCHEMA} from '@angular/core';
66
import moment from 'moment';
7-
import {NgxMatDatetimePickerModule} from '@angular-material-components/datetime-picker';
7+
import { NgxMatDatetimePickerModule, NgxMatNativeDateModule } from '@angular-material-components/datetime-picker';
88
import {BehaviorSubject} from 'rxjs';
99
import {HttpClientTestingModule} from '@angular/common/http/testing';
1010
import {
@@ -19,7 +19,8 @@ import {
1919
MockUserResourceService,
2020
TestConfigurationService,
2121
TranslateLibModule,
22-
UserResourceService
22+
UserResourceService,
23+
WrappedBoolean
2324
} from '@netgrif/components-core';
2425
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
2526
import { SimpleDateTimeFieldComponent } from './simple-date-time-field.component';
@@ -34,6 +35,7 @@ describe('SimpleDatetimeFieldComponent', () => {
3435
MaterialModule,
3536
AngularResizeEventModule,
3637
NgxMatDatetimePickerModule,
38+
NgxMatNativeDateModule,
3739
TranslateLibModule, HttpClientTestingModule, NoopAnimationsModule
3840
],
3941
providers: [
@@ -67,7 +69,7 @@ describe('SimpleDatetimeFieldComponent', () => {
6769

6870
@Component({
6971
selector: 'nc-test-wrapper',
70-
template: '<nc-simple-date-time-field [dataField]="field" [changedFields]="changedFields"></nc-simple-date-time-field>'
72+
template: '<nc-simple-date-time-field [dataField]="field" [changedFields]="changedFields" [showLargeLayout]="showLargeLayout"></nc-simple-date-time-field>'
7173
})
7274
class TestWrapperComponent {
7375
field = new DateTimeField('', '', moment('2020-03-09'), {
@@ -78,5 +80,10 @@ class TestWrapperComponent {
7880
hidden: true
7981
}, undefined, undefined, undefined, []);
8082
changedFields = new BehaviorSubject<ChangedFields>({behavior: {editable: true}});
83+
showLargeLayout = new WrappedBoolean();
84+
85+
constructor() {
86+
this.showLargeLayout.value = true;
87+
}
8188
}
8289

projects/netgrif-components/src/lib/data-fields/date-time-field/zoned-date-time-field/zoned-date-time-field.component.spec.ts

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {DataFieldTemplateComponent} from '../../data-field-template/data-field-t
44
import {RequiredLabelComponent} from '../../required-label/required-label.component';
55
import {Component, CUSTOM_ELEMENTS_SCHEMA} from '@angular/core';
66
import moment from 'moment';
7-
import {NgxMatDatetimePickerModule} from '@angular-material-components/datetime-picker';
7+
import { NgxMatDatetimePickerModule, NgxMatNativeDateModule } from '@angular-material-components/datetime-picker';
88
import {BehaviorSubject} from 'rxjs';
99
import {HttpClientTestingModule} from '@angular/common/http/testing';
1010
import {
@@ -19,7 +19,8 @@ import {
1919
MockUserResourceService,
2020
TestConfigurationService,
2121
TranslateLibModule,
22-
UserResourceService
22+
UserResourceService,
23+
WrappedBoolean
2324
} from '@netgrif/components-core';
2425
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
2526
import { ZonedDateTimeFieldComponent } from './zoned-date-time-field.component';
@@ -34,6 +35,7 @@ describe('ZonedDateTimeFieldComponent', () => {
3435
MaterialModule,
3536
AngularResizeEventModule,
3637
NgxMatDatetimePickerModule,
38+
NgxMatNativeDateModule,
3739
TranslateLibModule, HttpClientTestingModule, NoopAnimationsModule
3840
],
3941
providers: [
@@ -67,7 +69,7 @@ describe('ZonedDateTimeFieldComponent', () => {
6769

6870
@Component({
6971
selector: 'nc-test-wrapper',
70-
template: '<nc-zoned-date-time-field [dataField]="field" [changedFields]="changedFields"></nc-zoned-date-time-field>'
72+
template: '<nc-zoned-date-time-field [dataField]="field" [changedFields]="changedFields" [showLargeLayout]="showLargeLayout"></nc-zoned-date-time-field>'
7173
})
7274
class TestWrapperComponent {
7375
field = new DateTimeField('', '', moment('2020-03-09'), {
@@ -78,5 +80,10 @@ class TestWrapperComponent {
7880
hidden: true
7981
}, undefined, undefined, undefined, []);
8082
changedFields = new BehaviorSubject<ChangedFields>({behavior: {editable: true}});
83+
showLargeLayout = new WrappedBoolean();
84+
85+
constructor() {
86+
this.showLargeLayout.value = true;
87+
}
8188
}
8289

0 commit comments

Comments
 (0)