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

demo(datepicker): fix date's displaying in reactive form section #4771

Merged
merged 2 commits into from Dec 5, 2018
Merged

demo(datepicker): fix date's displaying in reactive form section #4771

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
1ebe8d2
fix(datepicker): fix datepickers cypress test
Nov 7, 2018
8df468d
Merge branch 'development' into datepicker-reactive-forms-issue
Domainv Nov 27, 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
4 changes: 2 additions & 2 deletions cypress/integration/datepicker_page_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ describe('Datepicker demo page test suite', () => {
const reactiveForms = datepicker.exampleDemosArr.reactiveForms;

it('chosen in datepicker date can be displayed in reactive form', () => {
const expectedDate = Cypress.moment().format('YYYY-MM-DD');
const expectedDateValue = Cypress.moment().format('MMM DD, YYYY');
const day = Cypress.moment().format('D');

cy.get(`${ reactiveForms } ${ datepicker.datepickerInput }`).click();
datepicker.clickOnDayInCurrMonth(`${ datepicker.datepickerLastOpened }`, day);

cy.get(`${ reactiveForms } ${ datepicker.formOutput }`)
.should('to.contain', `"date": "${ expectedDate }`);
.should('to.contain', `${ expectedDateValue }`);
});
});
});
13 changes: 6 additions & 7 deletions demo/src/app/components/+datepicker/demos/reactive-forms/reactive-forms.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
<form [formGroup]="myForm">
<div class="row">
<div class="col-xs-12 col-12 col-sm-6 col-md-4 form-group">
<input type="text" class="form-control" placeholder="Datepicker" bsDatepicker formControlName="date" />
<input type="text" class="form-control mb-3" placeholder="Datepicker" bsDatepicker formControlName="date" />
<pre *ngIf="myForm.value.date" class="code-preview">{{myForm.value.date | date}}</pre>
</div>
<div class="col-xs-12 col-12 col-sm-6 col-md-4 form-group">
<input type="text" class="form-control" placeholder="Daterangepicker" bsDaterangepicker formControlName="range" />
<input type="text" class="form-control mb-3"
placeholder="Daterangepicker" bsDaterangepicker formControlName="range" />
<pre *ngIf="myForm.value.range"
class="code-preview">from {{myForm.value.range[0] | date}} to {{myForm.value.range[1] | date}}</pre>
</div>
</div>
</form>
<div class="row">
<div class="col-xs-12 col-md-12">
<pre class="code-preview">{{myForm.value | json}}</pre>
</div>
</div>