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.

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

test: move blur validation tests into a single file #6230

Merged
merged 2 commits into from
Jul 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 0 additions & 29 deletions packages/date-picker/test/keyboard-input.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -664,20 +664,6 @@ describe('keyboard', () => {
expect(changeSpy.called).to.be.false;
});

it('should change after validate on overlay close', (done) => {
listenOnce(datePicker.$.overlay, 'vaadin-overlay-close', () => {
// Wait for overlay to finish closing
nextRender(datePicker).then(() => {
expect(validateSpy.calledOnce).to.be.true;
expect(changeSpy.calledOnce).to.be.true;
expect(changeSpy.calledAfter(validateSpy)).to.be.true;
done();
});
});

datePicker.close();
});

it('should change after validate on Enter', async () => {
await sendKeys({ press: 'Enter' });

Expand Down Expand Up @@ -753,12 +739,6 @@ describe('keyboard', () => {
expect(changeSpy.called).to.be.false;
});

it('should validate on blur', async () => {
await sendKeys({ press: 'Tab' });
expect(validateSpy.calledOnce).to.be.true;
expect(changeSpy.called).to.be.false;
});

it('should neither change nor validate on Esc', async () => {
await sendKeys({ type: '01/02/20' });
await sendKeys({ press: 'Escape' });
Expand Down Expand Up @@ -798,15 +778,6 @@ describe('keyboard', () => {
expect(changeSpy.calledOnce).to.be.true;
expect(changeSpy.calledAfter(validateSpy)).to.be.true;
});

it('should change after validate on Backspace & blur', async () => {
input.select();
await sendKeys({ press: 'Backspace' });
await sendKeys({ press: 'Tab' });
expect(validateSpy.called).to.be.true;
expect(changeSpy.calledOnce).to.be.true;
expect(changeSpy.calledAfter(validateSpy)).to.be.true;
});
});
});
});
Expand Down
61 changes: 55 additions & 6 deletions packages/date-picker/test/validation.test.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { expect } from '@esm-bundle/chai';
import { enter, fixtureSync, nextRender } from '@vaadin/testing-helpers';
import { enter, fixtureSync, nextRender, outsideClick } from '@vaadin/testing-helpers';
import { sendKeys } from '@web/test-runner-commands';
import sinon from 'sinon';
import './not-animated-styles.js';
import { DatePicker } from '../vaadin-date-picker.js';
import { close, open, setInputValue, waitForOverlayRender } from './helpers.js';
import { close, open, setInputValue, waitForOverlayRender, waitForScrollToFinish } from './helpers.js';

class DatePicker2016 extends DatePicker {
checkValidity() {
Expand Down Expand Up @@ -104,11 +105,35 @@ describe('validation', () => {
expect(validateSpy.calledOnce).to.be.true;
});

it('should validate on close', async () => {
await open(datePicker);
it('should validate before change event on blur', async () => {
datePicker.value = '2023-01-01';
validateSpy.resetHistory();
await close(datePicker);
input.focus();
input.select();
await sendKeys({ press: 'Backspace' });
input.blur();
expect(changeSpy.calledOnce).to.be.true;
expect(validateSpy.called).to.be.true;
expect(validateSpy.calledBefore(changeSpy)).to.be.true;
});

it('should validate on outside click', () => {
input.focus();
input.click();
outsideClick();
expect(validateSpy.calledOnce).to.be.true;
});

it('should validate before change event on outside click', async () => {
input.focus();
input.click();
await waitForOverlayRender();
await sendKeys({ type: '1/1/2023' });
await waitForScrollToFinish(datePicker._overlayContent);
outsideClick();
expect(changeSpy.calledOnce).to.be.true;
expect(validateSpy.calledOnce).to.be.true;
expect(validateSpy.calledBefore(changeSpy)).to.be.true;
});

it('should not validate on input click while opened', async () => {
Expand Down Expand Up @@ -263,6 +288,30 @@ describe('validation', () => {
expect(validateSpy.called).to.be.false;
});
});

describe('autoOpenDisabled', () => {
beforeEach(() => {
datePicker.autoOpenDisabled = true;
});

it('should validate on blur', () => {
input.focus();
input.blur();
expect(validateSpy.calledOnce).to.be.true;
});

it('should validate before change event on blur', async () => {
datePicker.value = '2023-01-01';
validateSpy.resetHistory();
input.focus();
input.select();
await sendKeys({ press: 'Backspace' });
input.blur();
expect(changeSpy.calledOnce).to.be.true;
expect(validateSpy.called).to.be.true;
expect(validateSpy.calledBefore(changeSpy)).to.be.true;
});
});
});

describe('input value', () => {
Expand Down Expand Up @@ -298,7 +347,7 @@ describe('validation', () => {
expect(input.value).to.equal('foo');
});

describe('auto-open disabled', () => {
describe('autoOpenDisabled', () => {
beforeEach(() => {
datePicker.autoOpenDisabled = true;
});
Expand Down