test: move helpers from common.js to helpers.js (#5368) (#5372)

vaadin · Jan 24, 2023 · 43b1396 · 43b1396
1 parent 14a607f
commit 43b1396
Show file tree

Hide file tree

Showing 39 changed files with 46 additions and 44 deletions.
diff --git a/dev/upload.html b/dev/upload.html
@@ -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');
 

diff --git a/integration/tests/dialog-date-picker.test.js b/integration/tests/dialog-date-picker.test.js
@@ -5,7 +5,7 @@ import sinon from 'sinon';
 import './not-animated-styles.js';
 import '@vaadin/date-picker';
 import '@vaadin/dialog';
-import { getOverlayContent, open, waitForScrollToFinish } from '@vaadin/date-picker/test/common.js';
+import { getOverlayContent, open, waitForScrollToFinish } from '@vaadin/date-picker/test/helpers.js';
 
 describe('date-picker in dialog', () => {
   let dialog, datepicker;

diff --git a/packages/board/test/common.js → packages/board/test/helpers.js b/packages/board/test/common.js → packages/board/test/helpers.js
diff --git a/packages/board/test/redraw.test.js b/packages/board/test/redraw.test.js
@@ -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', () => {

diff --git a/packages/board/test/size.test.js b/packages/board/test/size.test.js
@@ -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;

diff --git a/packages/context-menu/test/visual/common.js → packages/context-menu/test/helpers.js b/packages/context-menu/test/visual/common.js → packages/context-menu/test/helpers.js
diff --git a/packages/context-menu/test/visual/lumo/context-menu.test.js b/packages/context-menu/test/visual/lumo/context-menu.test.js
@@ -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;

diff --git a/packages/context-menu/test/visual/material/context-menu.test.js b/packages/context-menu/test/visual/material/context-menu.test.js
@@ -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;

diff --git a/packages/custom-field/test/custom-field.test.js b/packages/custom-field/test/custom-field.test.js
@@ -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;

diff --git a/packages/custom-field/test/common.js → packages/custom-field/test/helpers.js b/packages/custom-field/test/common.js → packages/custom-field/test/helpers.js
diff --git a/packages/custom-field/test/slot-wrapper.test.js b/packages/custom-field/test/slot-wrapper.test.js
@@ -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() {

diff --git a/packages/date-picker/test/basic.test.js b/packages/date-picker/test/basic.test.js
@@ -12,7 +12,7 @@ import { sendKeys } from '@web/test-runner-commands';
 import sinon from 'sinon';
 import '../src/vaadin-date-picker.js';
 import * as settings from '@polymer/polymer/lib/utils/settings.js';
-import { close, getFocusedCell, getOverlayContent, idleCallback, open } from './common.js';
+import { close, getFocusedCell, getOverlayContent, idleCallback, open } from './helpers.js';
 
 settings.setCancelSyntheticClickEvents(false);
 

diff --git a/packages/date-picker/test/custom-input.test.js b/packages/date-picker/test/custom-input.test.js
@@ -3,7 +3,7 @@ import { fire, fixtureSync, nextRender, tap } from '@vaadin/testing-helpers';
 import sinon from 'sinon';
 import './not-animated-styles.js';
 import '../vaadin-date-picker-light.js';
-import { getOverlayContent, open, waitForScrollToFinish } from './common.js';
+import { getOverlayContent, open, waitForScrollToFinish } from './helpers.js';
 
 describe('custom input', () => {
   let datepicker, input, overlay;

diff --git a/packages/date-picker/test/dom/month-calendar.test.js b/packages/date-picker/test/dom/month-calendar.test.js
@@ -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;

diff --git a/packages/date-picker/test/dropdown.test.js b/packages/date-picker/test/dropdown.test.js
@@ -3,7 +3,7 @@ import { aTimeout, fixtureSync, mousedown, nextRender, oneEvent, touchstart } fr
 import { sendKeys } from '@web/test-runner-commands';
 import sinon from 'sinon';
 import '../src/vaadin-date-picker.js';
-import { getFocusedCell, getOverlayContent, isFullscreen, monthsEqual, open, outsideClick } from './common.js';
+import { getFocusedCell, getOverlayContent, isFullscreen, monthsEqual, open, outsideClick } from './helpers.js';
 
 describe('dropdown', () => {
   let datepicker, input, overlay;

diff --git a/packages/date-picker/test/common.js → packages/date-picker/test/helpers.js b/packages/date-picker/test/common.js → packages/date-picker/test/helpers.js
diff --git a/packages/date-picker/test/keyboard-input.test.js b/packages/date-picker/test/keyboard-input.test.js
@@ -12,7 +12,7 @@ import {
   open,
   waitForOverlayRender,
   waitForScrollToFinish,
-} from './common.js';
+} from './helpers.js';
 
 describe('keyboard', () => {
   let datepicker;

diff --git a/packages/date-picker/test/keyboard-navigation.test.js b/packages/date-picker/test/keyboard-navigation.test.js
@@ -12,7 +12,7 @@ import {
   open,
   waitForOverlayRender,
   waitForScrollToFinish,
-} from './common.js';
+} from './helpers.js';
 
 (isIOS ? describe.skip : describe)('keyboard navigation', () => {
   describe('date-picker', () => {

diff --git a/packages/date-picker/test/month-calendar.test.js b/packages/date-picker/test/month-calendar.test.js
@@ -2,7 +2,7 @@ import { expect } from '@esm-bundle/chai';
 import { aTimeout, fixtureSync, 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;

diff --git a/packages/date-picker/test/overlay.test.js b/packages/date-picker/test/overlay.test.js
@@ -3,7 +3,7 @@ import { click, fixtureSync, listenOnce, nextRender, tap } from '@vaadin/testing
 import sinon from 'sinon';
 import '../src/vaadin-date-picker-overlay-content.js';
 import { afterNextRender } from '@polymer/polymer/lib/utils/render-status.js';
-import { getDefaultI18n, getFirstVisibleItem, monthsEqual } from './common.js';
+import { getDefaultI18n, getFirstVisibleItem, monthsEqual } from './helpers.js';
 
 function waitUntilScrolledTo(overlay, date, callback) {
   if (overlay.$.monthScroller.position) {

diff --git a/packages/date-picker/test/scroller.test.js b/packages/date-picker/test/scroller.test.js
@@ -2,7 +2,7 @@ import { expect } from '@esm-bundle/chai';
 import { aTimeout, fixtureSync, listenOnce } from '@vaadin/testing-helpers';
 import sinon from 'sinon';
 import '../src/vaadin-infinite-scroller.js';
-import { activateScroller, getFirstVisibleItem } from './common.js';
+import { activateScroller, getFirstVisibleItem } from './helpers.js';
 
 describe('vaadin-infinite-scroller', () => {
   let scroller;

diff --git a/packages/date-picker/test/theme-propagation.test.js b/packages/date-picker/test/theme-propagation.test.js
@@ -1,7 +1,7 @@
 import { expect } from '@esm-bundle/chai';
 import { fixtureSync } from '@vaadin/testing-helpers';
 import '../src/vaadin-date-picker.js';
-import { open } from './common.js';
+import { open } from './helpers.js';
 
 describe('theme attribute', () => {
   let datepicker;

diff --git a/packages/date-picker/test/validation.test.js b/packages/date-picker/test/validation.test.js
@@ -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, getOverlayContent, open, setInputValue } from './common.js';
+import { close, getOverlayContent, open, setInputValue } from './helpers.js';
 
 class DatePicker2016 extends DatePicker {
   checkValidity() {

diff --git a/packages/date-picker/test/wai-aria.test.js b/packages/date-picker/test/wai-aria.test.js
@@ -2,7 +2,7 @@ import { expect } from '@esm-bundle/chai';
 import { aTimeout, 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', () => {

diff --git a/packages/field-highlighter/test/visual/common.js b/packages/field-highlighter/test/visual/common.js
@@ -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(
@@ -32,16 +31,3 @@ registerStyles(
   `,
   { moduleId: 'not-animated-user-tags-overlay' },
 );
-
-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'));
-};
diff --git a/packages/field-highlighter/test/visual/helpers.js b/packages/field-highlighter/test/visual/helpers.js
@@ -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'));
+};
diff --git a/packages/field-highlighter/test/visual/lumo/field-highlighter.test.js b/packages/field-highlighter/test/visual/lumo/field-highlighter.test.js
@@ -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;

diff --git a/packages/field-highlighter/test/visual/material/field-highlighter.test.js b/packages/field-highlighter/test/visual/material/field-highlighter.test.js
@@ -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;

diff --git a/packages/horizontal-layout/test/common.js → packages/horizontal-layout/test/helpers.js b/packages/horizontal-layout/test/common.js → packages/horizontal-layout/test/helpers.js
diff --git a/packages/horizontal-layout/test/horizontal-layout.test.js b/packages/horizontal-layout/test/horizontal-layout.test.js
@@ -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', () => {

diff --git a/packages/upload/test/a11y.test.js b/packages/upload/test/a11y.test.js
@@ -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');
 

diff --git a/packages/upload/test/adding-files.test.js b/packages/upload/test/adding-files.test.js
@@ -2,7 +2,7 @@ import { expect } from '@esm-bundle/chai';
 import { change, click, fixtureSync, makeSoloTouchEvent } 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('file list', () => {
   let upload, file, files;

diff --git a/packages/upload/test/file-list.test.js b/packages/upload/test/file-list.test.js
@@ -1,7 +1,7 @@
 import { expect } from '@esm-bundle/chai';
 import { fixtureSync, nextFrame, nextRender } from '@vaadin/testing-helpers';
 import '../vaadin-upload.js';
-import { createFiles, xhrCreator } from './common.js';
+import { createFiles, xhrCreator } from './helpers.js';
 
 describe('file list', () => {
   let upload;

diff --git a/packages/upload/test/file.test.js b/packages/upload/test/file.test.js
@@ -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;

diff --git a/packages/upload/test/common.js → packages/upload/test/helpers.js b/packages/upload/test/common.js → packages/upload/test/helpers.js
diff --git a/packages/upload/test/keyboard-navigation.test.js b/packages/upload/test/keyboard-navigation.test.js
@@ -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');
 

diff --git a/packages/upload/test/upload.test.js b/packages/upload/test/upload.test.js
@@ -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, xhrCreator } from './common.js';
+import { createFile, createFiles, xhrCreator } from './helpers.js';
 
 describe('upload', () => {
   let upload, file;

diff --git a/packages/vertical-layout/test/common.js → packages/vertical-layout/test/helpers.js b/packages/vertical-layout/test/common.js → packages/vertical-layout/test/helpers.js
diff --git a/packages/vertical-layout/test/vertical-layout.test.js b/packages/vertical-layout/test/vertical-layout.test.js
@@ -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', () => {