Skip to content

Commit

Permalink
Fix the tests and revert the eslint changes for now
Browse files Browse the repository at this point in the history
  • Loading branch information
tmcconechy committed Oct 15, 2019
1 parent 126c86a commit d7d229b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 190 deletions.
2 changes: 1 addition & 1 deletion src/components/datepicker/datepicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ DatePicker.prototype = {
if (this.isFullMonth) {
this.pattern = this.settings.dateFormat;
} else if (this.element.data('mask') === undefined) {
// this.element.mask(maskOptions);
this.element.mask(maskOptions);
}

this.addedValidation = false;
Expand Down
182 changes: 0 additions & 182 deletions test/.eslintrc.js

This file was deleted.

13 changes: 6 additions & 7 deletions test/components/datepicker/datepicker.e2e-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -486,18 +486,17 @@ describe('Datepicker Destroy Mask Tests', () => {

it('Should still mask after destroy', async () => {
await browser.driver.sleep(config.sleepShort);
const inputEl = await element(by.id('dp1'));
inputEl.clear();
inputEl.sendKeys('101020011221AM');
await element(by.id('dp1')).clear();
await element(by.id('dp1')).sendKeys('101020011221AM');

expect(inputEl.getAttribute('value')).toEqual('10/10/2001 12:21 AM');
inputEl.clear();
expect(await element(by.id('dp1')).getAttribute('value')).toEqual('10/10/2001 12:21 AM');
await element(by.id('dp1')).clear();

await element(by.id('btn-update')).click();
await browser.driver.sleep(config.sleepShort);
inputEl.sendKeys('101020011221AM');
await element(by.id('dp1')).sendKeys('101020011221AM');

expect(inputEl.getAttribute('value')).toEqual('10/10/2001 12:21 AM');
expect(await element(by.id('dp1')).getAttribute('value')).toEqual('10/10/2001 12:21 AM');
});
});

Expand Down

0 comments on commit d7d229b

Please sign in to comment.