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 helpers from common.js to helpers.js #5368

Merged
merged 1 commit into from
Jan 24, 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
2 changes: 1 addition & 1 deletion dev/upload.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<script type="module">
import '@vaadin/upload';
import '@vaadin/radio-group';
import { xhrCreator } from '@vaadin/upload/test/common.js';
import { xhrCreator } from '@vaadin/upload/test/helpers.js';

const nextUpload = document.querySelector('#next-upload');

Expand Down
2 changes: 1 addition & 1 deletion integration/tests/dialog-date-picker.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import sinon from 'sinon';
import './not-animated-styles.js';
import '@vaadin/date-picker';
import '@vaadin/dialog';
import { open, waitForScrollToFinish } from '@vaadin/date-picker/test/common.js';
import { open, waitForScrollToFinish } from '@vaadin/date-picker/test/helpers.js';

describe('date-picker in dialog', () => {
let dialog, datepicker;
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/board/test/redraw.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { expect } from '@esm-bundle/chai';
import { aTimeout, fixtureSync } from '@vaadin/testing-helpers';
import '../vaadin-board.js';
import { allResized, onceResized } from './common.js';
import { allResized, onceResized } from './helpers.js';

describe('redraw', () => {
describe('board', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/board/test/size.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { expect } from '@esm-bundle/chai';
import { fixtureSync } from '@vaadin/testing-helpers';
import '../vaadin-board.js';
import { allResized } from './common.js';
import { allResized } from './helpers.js';

describe('size', () => {
let container, rows, rowDefault, rowSmaller, rowLarger;
Expand Down
2 changes: 1 addition & 1 deletion packages/context-menu/test/dom/context-menu.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { expect } from '@esm-bundle/chai';
import { fixtureSync, nextRender } from '@vaadin/testing-helpers';
import '../../src/vaadin-context-menu.js';
import '../not-animated-styles.js';
import { openSubMenus } from '../common.js';
import { openSubMenus } from '../helpers.js';

describe('context-menu', () => {
let menu, overlay;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { fixtureSync, nextRender } from '@vaadin/testing-helpers';
import { visualDiff } from '@web/test-runner-visual-regression';
import '../../../theme/lumo/vaadin-context-menu.js';
import '../../not-animated-styles.js';
import { openSubMenus } from '../../common.js';
import { openSubMenus } from '../../helpers.js';

describe('context-menu', () => {
let element;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { fixtureSync, nextRender } from '@vaadin/testing-helpers';
import { visualDiff } from '@web/test-runner-visual-regression';
import '../../../theme/material/vaadin-context-menu.js';
import '../../not-animated-styles.js';
import { openSubMenus } from '../../common.js';
import { openSubMenus } from '../../helpers.js';

describe('context-menu', () => {
let element;
Expand Down
2 changes: 1 addition & 1 deletion packages/custom-field/test/custom-field.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { expect } from '@esm-bundle/chai';
import { fixtureSync, focusin, focusout } from '@vaadin/testing-helpers';
import sinon from 'sinon';
import '../src/vaadin-custom-field.js';
import { dispatchChange } from './common.js';
import { dispatchChange } from './helpers.js';

describe('custom field', () => {
let customField;
Expand Down
2 changes: 1 addition & 1 deletion packages/custom-field/test/slot-wrapper.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { expect } from '@esm-bundle/chai';
import { fixtureSync, nextFrame } from '@vaadin/testing-helpers';
import '../src/vaadin-custom-field.js';
import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
import { dispatchChange } from './common.js';
import { dispatchChange } from './helpers.js';

class XField extends PolymerElement {
static get template() {
Expand Down
2 changes: 1 addition & 1 deletion packages/date-picker/test/basic.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { sendKeys } from '@web/test-runner-commands';
import sinon from 'sinon';
import '../src/vaadin-date-picker.js';
import { parseDate } from '../src/vaadin-date-picker-helper.js';
import { close, open, touchTap, waitForOverlayRender } from './common.js';
import { close, open, touchTap, waitForOverlayRender } from './helpers.js';

describe('basic features', () => {
let datepicker, input;
Expand Down
2 changes: 1 addition & 1 deletion packages/date-picker/test/custom-input.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { fire, fixtureSync, tap } from '@vaadin/testing-helpers';
import sinon from 'sinon';
import './not-animated-styles.js';
import '../vaadin-date-picker-light.js';
import { open, setInputValue, waitForScrollToFinish } from './common.js';
import { open, setInputValue, waitForScrollToFinish } from './helpers.js';

describe('custom input', () => {
let datepicker, overlay;
Expand Down
2 changes: 1 addition & 1 deletion packages/date-picker/test/dom/date-picker.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { expect } from '@esm-bundle/chai';
import { aTimeout, fixtureSync } from '@vaadin/testing-helpers';
import '../../src/vaadin-date-picker.js';
import { resetUniqueId } from '@vaadin/component-base/src/unique-id-utils.js';
import { open } from '../common.js';
import { open } from '../helpers.js';

describe('vaadin-date-picker', () => {
let datePicker;
Expand Down
2 changes: 1 addition & 1 deletion packages/date-picker/test/dom/month-calendar.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { expect } from '@esm-bundle/chai';
import { fixtureSync, nextFrame } from '@vaadin/testing-helpers';
import '../../src/vaadin-month-calendar.js';
import { resetUniqueId } from '@vaadin/component-base/src/unique-id-utils.js';
import { getDefaultI18n } from '../common.js';
import { getDefaultI18n } from '../helpers.js';

describe('vaadin-month-calendar', () => {
let monthCalendar;
Expand Down
2 changes: 1 addition & 1 deletion packages/date-picker/test/dropdown.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { aTimeout, fire, fixtureSync, mousedown, nextRender, oneEvent, touchstar
import { sendKeys } from '@web/test-runner-commands';
import sinon from 'sinon';
import '../src/vaadin-date-picker.js';
import { getFocusedCell, monthsEqual, open, outsideClick, waitForOverlayRender } from './common.js';
import { getFocusedCell, monthsEqual, open, outsideClick, waitForOverlayRender } from './helpers.js';

describe('dropdown', () => {
let datepicker, input, overlay;
Expand Down
2 changes: 1 addition & 1 deletion packages/date-picker/test/fullscreen.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { fixtureSync, tap } from '@vaadin/testing-helpers';
import { sendKeys, setViewport } from '@web/test-runner-commands';
import sinon from 'sinon';
import '../src/vaadin-date-picker.js';
import { getFocusedCell, open, touchTap, waitForOverlayRender } from './common.js';
import { getFocusedCell, open, touchTap, waitForOverlayRender } from './helpers.js';

describe('fullscreen mode', () => {
let datepicker, input, overlay, width, height;
Expand Down
2 changes: 1 addition & 1 deletion packages/date-picker/test/keyboard-input.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import sinon from 'sinon';
import './not-animated-styles.js';
import '../vaadin-date-picker.js';
import { getAdjustedYear } from '../src/vaadin-date-picker-helper.js';
import { close, getFocusedCell, idleCallback, open, waitForOverlayRender, waitForScrollToFinish } from './common.js';
import { close, getFocusedCell, idleCallback, open, waitForOverlayRender, waitForScrollToFinish } from './helpers.js';

describe('keyboard', () => {
let datepicker;
Expand Down
2 changes: 1 addition & 1 deletion packages/date-picker/test/keyboard-navigation.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
open,
waitForOverlayRender,
waitForScrollToFinish,
} from './common.js';
} from './helpers.js';

describe('keyboard navigation', () => {
describe('date-picker', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/date-picker/test/month-calendar.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { expect } from '@esm-bundle/chai';
import { aTimeout, fixtureSync, makeSoloTouchEvent, nextRender, tap } from '@vaadin/testing-helpers';
import sinon from 'sinon';
import '../src/vaadin-month-calendar.js';
import { getDefaultI18n } from './common.js';
import { getDefaultI18n } from './helpers.js';

describe('vaadin-month-calendar', () => {
let monthCalendar, valueChangedSpy;
Expand Down
2 changes: 1 addition & 1 deletion packages/date-picker/test/overlay.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { expect } from '@esm-bundle/chai';
import { click, fixtureSync, listenOnce, nextRender, tap } from '@vaadin/testing-helpers';
import sinon from 'sinon';
import '../src/vaadin-date-picker-overlay-content.js';
import { getDefaultI18n, getFirstVisibleItem, monthsEqual, waitForScrollToFinish } from './common.js';
import { getDefaultI18n, getFirstVisibleItem, monthsEqual, waitForScrollToFinish } from './helpers.js';

async function customizeFixture({ initialPosition, monthScrollerItems, monthScrollerOffset }) {
const overlay = fixtureSync(`<vaadin-date-picker-overlay-content></vaadin-date-picker-overlay-content>`);
Expand Down
2 changes: 1 addition & 1 deletion packages/date-picker/test/scroller.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { expect } from '@esm-bundle/chai';
import { aTimeout, fixtureSync, listenOnce } from '@vaadin/testing-helpers';
import sinon from 'sinon';
import { InfiniteScroller } from '../src/vaadin-infinite-scroller.js';
import { activateScroller, getFirstVisibleItem } from './common.js';
import { activateScroller, getFirstVisibleItem } from './helpers.js';

customElements.define(
'vaadin-infinite-scroller',
Expand Down
2 changes: 1 addition & 1 deletion packages/date-picker/test/theme-propagation.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { expect } from '@esm-bundle/chai';
import { fixtureSync, nextRender } from '@vaadin/testing-helpers';
import '../src/vaadin-date-picker.js';
import { open, waitForScrollToFinish } from './common.js';
import { open, waitForScrollToFinish } from './helpers.js';

describe('theme attribute', () => {
let datepicker;
Expand Down
2 changes: 1 addition & 1 deletion packages/date-picker/test/validation.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { enter, fixtureSync, nextRender } from '@vaadin/testing-helpers';
import sinon from 'sinon';
import './not-animated-styles.js';
import { DatePicker } from '../vaadin-date-picker.js';
import { close, open, setInputValue } from './common.js';
import { close, open, setInputValue } from './helpers.js';

class DatePicker2016 extends DatePicker {
checkValidity() {
Expand Down
2 changes: 1 addition & 1 deletion packages/date-picker/test/wai-aria.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { expect } from '@esm-bundle/chai';
import { fixtureSync, nextFrame, nextRender } from '@vaadin/testing-helpers';
import './not-animated-styles.js';
import '../vaadin-date-picker.js';
import { activateScroller, getDefaultI18n, open } from './common.js';
import { activateScroller, getDefaultI18n, open } from './helpers.js';

describe('WAI-ARIA', () => {
describe('date picker', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/date-time-picker/test/validation.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { aTimeout, fixtureSync, nextRender } from '@vaadin/testing-helpers';
import { sendKeys } from '@web/test-runner-commands';
import sinon from 'sinon';
import '../vaadin-date-time-picker.js';
import { waitForOverlayRender } from '@vaadin/date-picker/test/common.js';
import { waitForOverlayRender } from '@vaadin/date-picker/test/helpers.js';

class DateTimePicker2020Element extends customElements.get('vaadin-date-time-picker') {
checkValidity() {
Expand Down
2 changes: 1 addition & 1 deletion packages/field-highlighter/test/field-components.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import '@vaadin/radio-group';
import '@vaadin/select';
import '@vaadin/text-field';
import { html, render } from 'lit';
import { close, outsideClick, waitForOverlayRender } from '@vaadin/date-picker/test/common.js';
import { close, outsideClick, waitForOverlayRender } from '@vaadin/date-picker/test/helpers.js';
import { FieldHighlighter } from '../src/vaadin-field-highlighter.js';

async function waitForIntersectionObserver() {
Expand Down
14 changes: 0 additions & 14 deletions packages/field-highlighter/test/visual/common.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
import { FieldHighlighter } from '../../src/vaadin-field-highlighter.js';

/* Hide caret */
registerStyles(
Expand Down Expand Up @@ -31,16 +30,3 @@ registerStyles(
}
`,
);

const users = [
{ id: 'a', name: 'User', colorIndex: 0, fieldIndex: 2 },
{ id: 'b', name: 'Moderator', colorIndex: 1, fieldIndex: 1 },
{ id: 'c', name: 'Admin', colorIndex: 2, fieldIndex: 0 },
];

export const setUsers = (field) => {
Copy link
Member

Choose a reason for hiding this comment

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

It's a great idea to separate common.js and helpers.js in this case 💪

FieldHighlighter.init(field);
FieldHighlighter.setUsers(field, users);
// Mimic focus to show highlight and badges
field.dispatchEvent(new CustomEvent('mouseenter'));
};
14 changes: 14 additions & 0 deletions packages/field-highlighter/test/visual/helpers.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { FieldHighlighter } from '../../src/vaadin-field-highlighter.js';

const users = [
{ id: 'a', name: 'User', colorIndex: 0, fieldIndex: 2 },
{ id: 'b', name: 'Moderator', colorIndex: 1, fieldIndex: 1 },
{ id: 'c', name: 'Admin', colorIndex: 2, fieldIndex: 0 },
];

export const setUsers = (field) => {
FieldHighlighter.init(field);
FieldHighlighter.setUsers(field, users);
// Mimic focus to show highlight and badges
field.dispatchEvent(new CustomEvent('mouseenter'));
};
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import '@vaadin/radio-group/theme/lumo/vaadin-radio-group.js';
import '@vaadin/text-area/theme/lumo/vaadin-text-area.js';
import '@vaadin/text-field/theme/lumo/vaadin-text-field.js';
import '../../../theme/lumo/vaadin-field-highlighter.js';
import { setUsers } from '../common.js';
import '../common.js';
import { setUsers } from '../helpers.js';

describe('field-highlighter', () => {
let div, element;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ import '@vaadin/radio-group/theme/material/vaadin-radio-group.js';
import '@vaadin/text-area/theme/material/vaadin-text-area.js';
import '@vaadin/text-field/theme/material/vaadin-text-field.js';
import '../../../theme/material/vaadin-field-highlighter.js';
import { setUsers } from '../common.js';
import '../common.js';
import { setUsers } from '../helpers.js';

describe('field-highlighter', () => {
let div, element;
Expand Down
2 changes: 1 addition & 1 deletion packages/horizontal-layout/test/horizontal-layout.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { expect } from '@esm-bundle/chai';
import { fixtureSync } from '@vaadin/testing-helpers';
import '../vaadin-horizontal-layout.js';
import { getComputedCSSPropertyValue } from './common.js';
import { getComputedCSSPropertyValue } from './helpers.js';

describe('vaadin-horizontal-layout', () => {
describe('basic features', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/upload/test/a11y.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { expect } from '@esm-bundle/chai';
import { fixtureSync } from '@vaadin/testing-helpers';
import sinon from 'sinon';
import '../vaadin-upload.js';
import { createFile } from './common.js';
import { createFile } from './helpers.js';

const FAKE_FILE = createFile(100000, 'application/uknown');

Expand Down
2 changes: 1 addition & 1 deletion packages/upload/test/adding-files.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { expect } from '@esm-bundle/chai';
import { change, fixtureSync } from '@vaadin/testing-helpers';
import sinon from 'sinon';
import '../vaadin-upload.js';
import { createFile, createFiles, touchDevice, xhrCreator } from './common.js';
import { createFile, createFiles, touchDevice, xhrCreator } from './helpers.js';

describe('adding files', () => {
let upload, files;
Expand Down
2 changes: 1 addition & 1 deletion packages/upload/test/file-list.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { expect } from '@esm-bundle/chai';
import { fixtureSync, nextFrame, nextRender } from '@vaadin/testing-helpers';
import '../vaadin-upload.js';
import { createFiles, removeFile, xhrCreator } from './common.js';
import { createFiles, removeFile, xhrCreator } from './helpers.js';

describe('file list', () => {
let upload;
Expand Down
2 changes: 1 addition & 1 deletion packages/upload/test/file.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { expect } from '@esm-bundle/chai';
import { fixtureSync } from '@vaadin/testing-helpers';
import { sendKeys } from '@web/test-runner-commands';
import '../vaadin-upload.js';
import { createFile } from './common.js';
import { createFile } from './helpers.js';

describe('<vaadin-upload-file> element', () => {
let fileElement, fileObject;
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/upload/test/keyboard-navigation.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { expect } from '@esm-bundle/chai';
import { fixtureSync, nextRender } from '@vaadin/testing-helpers';
import { sendKeys } from '@web/test-runner-commands';
import '../vaadin-upload.js';
import { createFile } from './common.js';
import { createFile } from './helpers.js';

const FAKE_FILE = createFile(100000, 'application/uknown');

Expand Down
2 changes: 1 addition & 1 deletion packages/upload/test/slots.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { expect } from '@esm-bundle/chai';
import { click, fixtureSync, makeSoloTouchEvent, nextRender } from '@vaadin/testing-helpers';
import sinon from 'sinon';
import '../vaadin-upload.js';
import { createFile } from './common.js';
import { createFile } from './helpers.js';

describe('slots', () => {
let upload;
Expand Down
2 changes: 1 addition & 1 deletion packages/upload/test/upload.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { fixtureSync, nextRender } from '@vaadin/testing-helpers';
import sinon from 'sinon';
import '../vaadin-upload.js';
import { afterNextRender } from '@polymer/polymer/lib/utils/render-status.js';
import { createFile, createFiles, removeFile, xhrCreator } from './common.js';
import { createFile, createFiles, removeFile, xhrCreator } from './helpers.js';

describe('upload', () => {
let upload, file;
Expand Down
2 changes: 1 addition & 1 deletion packages/vertical-layout/test/vertical-layout.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { expect } from '@esm-bundle/chai';
import { fixtureSync } from '@vaadin/testing-helpers';
import '../vaadin-vertical-layout.js';
import { getComputedCSSPropertyValue } from './common.js';
import { getComputedCSSPropertyValue } from './helpers.js';

describe('vaadin-vertical-layout', () => {
describe('basic features', () => {
Expand Down