Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(module: date-picker): fix year-picker and month-picker style erro… #2136

Merged
merged 2 commits into from
Sep 19, 2018
Merged

fix(module: date-picker): fix year-picker and month-picker style erro… #2136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
356bce8
fix(module: date-picker): fix year-picker and month-picker style erro…
hungtcs Sep 14, 2018
9f232dc
Merge remote-tracking branch 'upstream/master'
hungtcs Sep 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions components/date-picker/month-picker.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';

import * as isBefore from 'date-fns/is_before';
import { dispatchMouseEvent } from '../core/testing';
import { NzInputModule } from '../input/nz-input.module';
import { NzDatePickerModule } from './date-picker.module';
import { CandyDate } from './lib/candy-date';
import { PickerResultSingle } from './standard-types';
Expand All @@ -24,7 +25,7 @@ describe('NzMonthPickerComponent', () => {

beforeEach(fakeAsync(() => {
TestBed.configureTestingModule({
imports : [ FormsModule, NoopAnimationsModule, NzDatePickerModule ],
imports : [FormsModule, NoopAnimationsModule, NzDatePickerModule, NzInputModule ],
providers : [],
declarations: [
NzTestMonthPickerComponent
Expand Down Expand Up @@ -146,10 +147,21 @@ describe('NzMonthPickerComponent', () => {
it('should support nzClassName', () => {
const className = fixtureInstance.nzClassName = 'my-test-class';
fixture.detectChanges();
const picker = debugElement.query(By.css('.ant-calendar-picker')).nativeElement as HTMLElement;
const picker = debugElement.queryAll(By.css('.ant-calendar-picker'))[1].nativeElement as HTMLElement;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it seems it has nothing todo with the pr with this code.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vthinkxie Two elements in the picker has css class ant-calendar-picker, but the test target is the second element. I found the same code in date-picker.component.spec.ts

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hungtcs great, can you add some test for the bug you fixed? thanks.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vthinkxie It's hard to test styles via javascript, see this stackblitz

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hungtcs the test is must for ci, you can use https://developer.mozilla.org/en-US/docs/Web/API/Window/getComputedStyle to test the style in javascript.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vthinkxie Thank you, I will add the test case later.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vthinkxie Test case is completed.

expect(picker.classList.contains(className)).toBeTruthy();
});

it('should support nzCompact', () => {
fixtureInstance.useSuite = 4;

fixture.detectChanges();
const pickerInput = debugElement.query(By.css('input.ant-calendar-picker-input')).nativeElement as HTMLElement;
expect(pickerInput).not.toBeNull();
const compStyles = window.getComputedStyle(pickerInput);
expect(compStyles.getPropertyValue('border-top-right-radius') === '0px').toBeTruthy();
expect(compStyles.getPropertyValue('border-bottom-right-radius') === '0px').toBeTruthy();
});

it('should support nzDisabledDate', fakeAsync(() => {
fixture.detectChanges();
const compareDate = new Date('2018-11-15 00:00:00');
Expand Down Expand Up @@ -441,11 +453,17 @@ describe('NzMonthPickerComponent', () => {

<!-- Suite 3 -->
<nz-month-picker *ngSwitchCase="3" nzOpen [(ngModel)]="modelValue"></nz-month-picker>

<!-- Suite 4 -->
<nz-input-group *ngSwitchCase="4" nzCompact>
<nz-month-picker style="width: 200px;"></nz-month-picker>
<input nz-input type="text" style="width: 200px;" />
</nz-input-group>
</ng-container>
`
})
class NzTestMonthPickerComponent {
useSuite: 1 | 2 | 3;
useSuite: 1 | 2 | 3 | 4;
@ViewChild('tplExtraFooter') tplExtraFooter: TemplateRef<void>;

// --- Suite 1
Expand Down
3 changes: 2 additions & 1 deletion components/date-picker/month-picker.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ import { HeaderPickerComponent, SupportHeaderPanel } from './header-picker.compo
useExisting: forwardRef(() => NzMonthPickerComponent)
}],
host : {
'[class.ant-checkbox-group]': 'true'
'[class.ant-checkbox-group]': 'true',
'[class.ant-calendar-picker]': 'true'
}
})

Expand Down
25 changes: 22 additions & 3 deletions components/date-picker/year-picker.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';

import * as isBefore from 'date-fns/is_before';
import { dispatchMouseEvent } from '../core/testing';
import { NzInputModule } from '../input/nz-input.module';
import { NzDatePickerModule } from './date-picker.module';
import { CandyDate } from './lib/candy-date';
import { PickerResultSingle } from './standard-types';
Expand All @@ -24,7 +25,7 @@ describe('NzYearPickerComponent', () => {

beforeEach(fakeAsync(() => {
TestBed.configureTestingModule({
imports : [ FormsModule, NoopAnimationsModule, NzDatePickerModule ],
imports : [ FormsModule, NoopAnimationsModule, NzDatePickerModule, NzInputModule ],
providers : [],
declarations: [
NzTestYearPickerComponent
Expand Down Expand Up @@ -146,10 +147,21 @@ describe('NzYearPickerComponent', () => {
it('should support nzClassName', () => {
const className = fixtureInstance.nzClassName = 'my-test-class';
fixture.detectChanges();
const picker = debugElement.query(By.css('.ant-calendar-picker')).nativeElement as HTMLElement;
const picker = debugElement.queryAll(By.css('.ant-calendar-picker'))[1].nativeElement as HTMLElement;
expect(picker.classList.contains(className)).toBeTruthy();
});

it('should support nzCompact', () => {
fixtureInstance.useSuite = 4;

fixture.detectChanges();
const pickerInput = debugElement.query(By.css('input.ant-calendar-picker-input')).nativeElement as HTMLElement;
expect(pickerInput).not.toBeNull();
const compStyles = window.getComputedStyle(pickerInput);
expect(compStyles.getPropertyValue('border-top-right-radius') === '0px').toBeTruthy();
expect(compStyles.getPropertyValue('border-bottom-right-radius') === '0px').toBeTruthy();
});

it('should support nzLocale', () => {
const featureKey = 'TEST_PLACEHOLDER';
fixtureInstance.nzLocale = { lang: { placeholder: featureKey } };
Expand Down Expand Up @@ -386,11 +398,18 @@ describe('NzYearPickerComponent', () => {

<!-- Suite 3 -->
<nz-year-picker *ngSwitchCase="3" nzOpen [(ngModel)]="modelValue"></nz-year-picker>

<!-- Suite 4 -->
<nz-input-group *ngSwitchCase="4" nzCompact>
<nz-year-picker style="width: 200px;"></nz-year-picker>
<input nz-input type="text" style="width: 200px;" />
</nz-input-group>

</ng-container>
`
})
class NzTestYearPickerComponent {
useSuite: 1 | 2 | 3;
useSuite: 1 | 2 | 3 | 4;
@ViewChild('tplExtraFooter') tplExtraFooter: TemplateRef<void>;

// --- Suite 1
Expand Down
3 changes: 2 additions & 1 deletion components/date-picker/year-picker.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ import { HeaderPickerComponent, SupportHeaderPanel } from './header-picker.compo
useExisting: forwardRef(() => NzYearPickerComponent)
}],
host : {
'[class.ant-checkbox-group]': 'true'
'[class.ant-checkbox-group]': 'true',
'[class.ant-calendar-picker]': 'true'
}
})

Expand Down