Replace modules in src/test-util with @hypothesis/frontend-testing

package.json

@@ -13,6 +13,7 @@
     "@babel/preset-typescript": "^7.16.7",
     "@hypothesis/frontend-build": "^2.0.0",
     "@hypothesis/frontend-shared": "^6.5.0",
+    "@hypothesis/frontend-testing": "^1.0.1",
     "@npmcli/arborist": "^7.0.0",
     "@octokit/rest": "^20.0.1",
     "@rollup/plugin-babel": "^6.0.0",

src/annotator/anchoring/test/pdf-test.js

@@ -1,4 +1,5 @@
-import { delay } from '../../../test-util/wait';
+import { delay } from '@hypothesis/frontend-testing';
+
 import { matchQuote } from '../match-quote';
 import * as pdfAnchoring from '../pdf';
 import { TextRange } from '../text-range';

src/annotator/components/test/Buckets-test.js

@@ -1,6 +1,6 @@
+import { checkAccessibility } from '@hypothesis/frontend-testing';
 import { mount } from 'enzyme';
 
-import { checkAccessibility } from '../../../test-util/accessibility';
 import Buckets from '../Buckets';
 
 describe('Buckets', () => {

src/annotator/components/test/Toolbar-test.js

@@ -1,6 +1,6 @@
+import { checkAccessibility } from '@hypothesis/frontend-testing';
 import { mount } from 'enzyme';
 
-import { checkAccessibility } from '../../../test-util/accessibility';
 import Toolbar from '../Toolbar';
 
 const noop = () => {};

src/annotator/integrations/test/html-test.js

@@ -1,4 +1,5 @@
-import { delay } from '../../../test-util/wait';
+import { delay } from '@hypothesis/frontend-testing';
+
 import { FeatureFlags } from '../../features';
 import { HTMLIntegration, $imports } from '../html';
 

src/annotator/integrations/test/image-text-layer-test.js

@@ -1,4 +1,5 @@
-import { delay } from '../../../test-util/wait';
+import { delay } from '@hypothesis/frontend-testing';
+
 import { ImageTextLayer } from '../image-text-layer';
 
 // Sizes and spacing between character bounding boxes in these tests, expressed

src/annotator/integrations/test/pdf-metadata-test.js

@@ -1,6 +1,6 @@
+import { delay } from '@hypothesis/frontend-testing';
 import EventEmitter from 'tiny-emitter';
 
-import { delay } from '../../../test-util/wait';
 import { PDFMetadata } from '../pdf-metadata';
 
 /**

src/annotator/integrations/test/pdf-test.js

@@ -1,4 +1,5 @@
-import { delay } from '../../../test-util/wait';
+import { delay } from '@hypothesis/frontend-testing';
+
 import { RenderingStates } from '../../anchoring/pdf';
 import { createPlaceholder } from '../../anchoring/placeholder';
 import { FakePDFViewerApplication } from '../../anchoring/test/fake-pdf-viewer-application';

src/annotator/integrations/test/vitalsource-test.js

@@ -1,4 +1,5 @@
-import { delay, waitFor } from '../../../test-util/wait';
+import { delay, waitFor } from '@hypothesis/frontend-testing';
+
 import {
   VitalSourceInjector,
   VitalSourceContentIntegration,

src/annotator/test/bucket-bar-client-test.js

@@ -1,4 +1,5 @@
-import { delay } from '../../test-util/wait';
+import { delay } from '@hypothesis/frontend-testing';
+
 import { BucketBarClient, $imports } from '../bucket-bar-client';
 
 describe('BucketBarClient', () => {

src/annotator/test/frame-observer-test.js

@@ -1,4 +1,5 @@
-import { delay, waitFor } from '../../test-util/wait';
+import { delay, waitFor } from '@hypothesis/frontend-testing';
+
 import {
   FrameObserver,
   onDocumentReady,

src/annotator/test/guest-test.js

@@ -1,6 +1,6 @@
+import { delay } from '@hypothesis/frontend-testing';
 import { TinyEmitter } from 'tiny-emitter';
 
-import { delay } from '../../test-util/wait';
 import { Guest, $imports } from '../guest';
 
 class FakeAdder {

src/annotator/test/highlight-clusters-test.js

@@ -1,4 +1,5 @@
-import { waitFor } from '../../test-util/wait';
+import { waitFor } from '@hypothesis/frontend-testing';
+
 import { FeatureFlags } from '../features';
 import { HighlightClusterController, $imports } from '../highlight-clusters';
 

src/annotator/test/integration/hypothesis-injector-test.js

@@ -1,4 +1,5 @@
-import { delay, waitFor } from '../../../test-util/wait';
+import { delay, waitFor } from '@hypothesis/frontend-testing';
+
 import { DEBOUNCE_WAIT, onNextDocumentReady } from '../../frame-observer';
 import {
   HypothesisInjector,

src/shared/messaging/test/port-finder-test.js

@@ -1,4 +1,5 @@
-import { delay } from '../../../test-util/wait';
+import { delay } from '@hypothesis/frontend-testing';
+
 import {
   MAX_WAIT_FOR_PORT,
   POLLING_INTERVAL_FOR_PORT,

src/shared/messaging/test/port-provider-test.js

@@ -1,4 +1,5 @@
-import { delay } from '../../../test-util/wait';
+import { delay } from '@hypothesis/frontend-testing';
+
 import { PortProvider, $imports } from '../port-provider';
 
 describe('PortProvider', () => {

src/shared/test/frame-error-capture-test.js

@@ -1,4 +1,5 @@
-import { delay } from '../../test-util/wait';
+import { delay } from '@hypothesis/frontend-testing';
+
 import {
   captureErrors,
   handleErrorsInFrames,

src/shared/test/integration/messaging-test.js

@@ -1,4 +1,5 @@
-import { delay } from '../../../test-util/wait';
+import { delay } from '@hypothesis/frontend-testing';
+
 import { ListenerCollection as ListenerCollection_ } from '../../listener-collection';
 import {
   PortFinder as PortFinder_,

src/shared/test/keyboard-navigation-test.js

@@ -1,8 +1,8 @@
+import { waitFor } from '@hypothesis/frontend-testing';
 import { options as preactOptions, render } from 'preact';
 import { useRef } from 'preact/hooks';
 import { act } from 'preact/test-utils';
 
-import { waitFor } from '../../test-util/wait';
 import { useArrowKeyNavigation } from '../keyboard-navigation';
 
 function Toolbar({ navigationOptions = {} }) {

src/sidebar/components/Annotation/test/Annotation-test.js

@@ -1,7 +1,9 @@
+import {
+  checkAccessibility,
+  mockImportedComponents,
+} from '@hypothesis/frontend-testing';
 import { mount } from 'enzyme';
 
-import { checkAccessibility } from '../../../../test-util/accessibility';
-import { mockImportedComponents } from '../../../../test-util/mock-imported-components';
 import * as fixtures from '../../../test/annotation-fixtures';
 import Annotation, { $imports } from '../Annotation';
 

src/sidebar/components/Annotation/test/AnnotationActionBar-test.js

@@ -1,9 +1,11 @@
+import {
+  checkAccessibility,
+  mockImportedComponents,
+  waitFor,
+} from '@hypothesis/frontend-testing';
 import { mount } from 'enzyme';
 import { act } from 'preact/test-utils';
 
-import { checkAccessibility } from '../../../../test-util/accessibility';
-import { mockImportedComponents } from '../../../../test-util/mock-imported-components';
-import { waitFor } from '../../../../test-util/wait';
 import * as fixtures from '../../../test/annotation-fixtures';
 import AnnotationActionBar, { $imports } from '../AnnotationActionBar';
 

src/sidebar/components/Annotation/test/AnnotationBody-test.js

@@ -1,8 +1,10 @@
+import {
+  checkAccessibility,
+  mockImportedComponents,
+} from '@hypothesis/frontend-testing';
 import { mount } from 'enzyme';
 import { act } from 'preact/test-utils';
 
-import { checkAccessibility } from '../../../../test-util/accessibility';
-import { mockImportedComponents } from '../../../../test-util/mock-imported-components';
 import * as fixtures from '../../../test/annotation-fixtures';
 import AnnotationBody, { $imports } from '../AnnotationBody';
 

src/sidebar/components/Annotation/test/AnnotationDocumentInfo-test.js

@@ -1,6 +1,6 @@
+import { checkAccessibility } from '@hypothesis/frontend-testing';
 import { mount } from 'enzyme';
 
-import { checkAccessibility } from '../../../../test-util/accessibility';
 import AnnotationDocumentInfo from '../AnnotationDocumentInfo';
 
 describe('AnnotationDocumentInfo', () => {

src/sidebar/components/Annotation/test/AnnotationEditor-test.js

@@ -1,9 +1,11 @@
+import {
+  checkAccessibility,
+  mockImportedComponents,
+  waitFor,
+} from '@hypothesis/frontend-testing';
 import { mount } from 'enzyme';
 import { act } from 'preact/test-utils';
 
-import { checkAccessibility } from '../../../../test-util/accessibility';
-import { mockImportedComponents } from '../../../../test-util/mock-imported-components';
-import { waitFor } from '../../../../test-util/wait';
 import * as fixtures from '../../../test/annotation-fixtures';
 import AnnotationEditor, { $imports } from '../AnnotationEditor';
 

src/sidebar/components/Annotation/test/AnnotationHeader-test.js

@@ -1,7 +1,9 @@
+import {
+  checkAccessibility,
+  mockImportedComponents,
+} from '@hypothesis/frontend-testing';
 import { mount } from 'enzyme';
 
-import { checkAccessibility } from '../../../../test-util/accessibility';
-import { mockImportedComponents } from '../../../../test-util/mock-imported-components';
 import * as fixtures from '../../../test/annotation-fixtures';
 import AnnotationHeader, { $imports } from '../AnnotationHeader';
 

src/sidebar/components/Annotation/test/AnnotationPublishControl-test.js

@@ -1,8 +1,10 @@
 import { GlobeIcon, GroupsIcon, LockIcon } from '@hypothesis/frontend-shared';
+import {
+  checkAccessibility,
+  mockImportedComponents,
+} from '@hypothesis/frontend-testing';
 import { mount } from 'enzyme';
 
-import { checkAccessibility } from '../../../../test-util/accessibility';
-import { mockImportedComponents } from '../../../../test-util/mock-imported-components';
 import AnnotationPublishControl, {
   $imports,
 } from '../AnnotationPublishControl';

src/sidebar/components/Annotation/test/AnnotationQuote-test.js

@@ -1,7 +1,9 @@
+import {
+  checkAccessibility,
+  mockImportedComponents,
+} from '@hypothesis/frontend-testing';
 import { mount } from 'enzyme';
 
-import { checkAccessibility } from '../../../../test-util/accessibility';
-import { mockImportedComponents } from '../../../../test-util/mock-imported-components';
 import AnnotationQuote, { $imports } from '../AnnotationQuote';
 
 describe('AnnotationQuote', () => {

src/sidebar/components/Annotation/test/AnnotationReplyToggle-test.js

@@ -1,7 +1,7 @@
+import { checkAccessibility } from '@hypothesis/frontend-testing';
 import { mount } from 'enzyme';
 import { act } from 'preact/test-utils';
 
-import { checkAccessibility } from '../../../../test-util/accessibility';
 import AnnotationReplyToggle from '../AnnotationReplyToggle';
 
 describe('AnnotationReplyToggle', () => {

src/sidebar/components/Annotation/test/AnnotationShareControl-test.js

@@ -1,8 +1,10 @@
+import {
+  checkAccessibility,
+  mockImportedComponents,
+} from '@hypothesis/frontend-testing';
 import { mount } from 'enzyme';
 import { act } from 'preact/test-utils';
 
-import { checkAccessibility } from '../../../../test-util/accessibility';
-import { mockImportedComponents } from '../../../../test-util/mock-imported-components';
 import AnnotationShareControl, { $imports } from '../AnnotationShareControl';
 
 describe('AnnotationShareControl', () => {

src/sidebar/components/Annotation/test/AnnotationShareInfo-test.js

@@ -1,7 +1,9 @@
+import {
+  checkAccessibility,
+  mockImportedComponents,
+} from '@hypothesis/frontend-testing';
 import { mount } from 'enzyme';
 
-import { checkAccessibility } from '../../../../test-util/accessibility';
-import { mockImportedComponents } from '../../../../test-util/mock-imported-components';
 import AnnotationShareInfo, { $imports } from '../AnnotationShareInfo';
 
 describe('AnnotationShareInfo', () => {

src/sidebar/components/Annotation/test/AnnotationTimestamps-test.js

@@ -1,7 +1,7 @@
+import { checkAccessibility } from '@hypothesis/frontend-testing';
 import { mount } from 'enzyme';
 import { act } from 'preact/test-utils';
 
-import { checkAccessibility } from '../../../../test-util/accessibility';
 import AnnotationTimestamps, { $imports } from '../AnnotationTimestamps';
 
 describe('AnnotationTimestamps', () => {

src/sidebar/components/Annotation/test/AnnotationUser-test.js

@@ -1,6 +1,6 @@
+import { checkAccessibility } from '@hypothesis/frontend-testing';
 import { mount } from 'enzyme';
 
-import { checkAccessibility } from '../../../../test-util/accessibility';
 import AnnotationUser from '../AnnotationUser';
 
 describe('AnnotationUser', () => {

src/sidebar/components/Annotation/test/EmptyAnnotation-test.js

@@ -1,7 +1,9 @@
+import {
+  checkAccessibility,
+  mockImportedComponents,
+} from '@hypothesis/frontend-testing';
 import { mount } from 'enzyme';
 
-import { checkAccessibility } from '../../../../test-util/accessibility';
-import { mockImportedComponents } from '../../../../test-util/mock-imported-components';
 import EmptyAnnotation, { $imports } from '../EmptyAnnotation';
 
 describe('EmptyAnnotation', () => {

src/sidebar/components/GroupList/test/GroupList-test.js

@@ -1,7 +1,7 @@
+import { mockImportedComponents } from '@hypothesis/frontend-testing';
 import { mount } from 'enzyme';
 import { act } from 'preact/test-utils';
 
-import { mockImportedComponents } from '../../../../test-util/mock-imported-components';
 import GroupList, { $imports } from '../GroupList';
 
 describe('GroupList', () => {

src/sidebar/components/GroupList/test/GroupListItem-test.js

@@ -1,7 +1,7 @@
+import { delay } from '@hypothesis/frontend-testing';
 import { mount } from 'enzyme';
 import { act } from 'preact/test-utils';
 
-import { delay } from '../../../../test-util/wait';
 import GroupListItem, { $imports } from '../GroupListItem';
 
 describe('GroupListItem', () => {

src/sidebar/components/GroupList/test/GroupListSection-test.js

@@ -1,6 +1,6 @@
+import { mockImportedComponents } from '@hypothesis/frontend-testing';
 import { mount } from 'enzyme';
 
-import { mockImportedComponents } from '../../../../test-util/mock-imported-components';
 import GroupListSection, { $imports } from '../GroupListSection';
 
 describe('GroupListSection', () => {

src/sidebar/components/ShareDialog/test/ExportAnnotations-test.js

@@ -1,8 +1,10 @@
+import {
+  checkAccessibility,
+  mockImportedComponents,
+  waitForElement,
+} from '@hypothesis/frontend-testing';
 import { mount } from 'enzyme';
 
-import { checkAccessibility } from '../../../../test-util/accessibility';
-import { mockImportedComponents } from '../../../../test-util/mock-imported-components';
-import { waitForElement } from '../../../../test-util/wait';
 import * as fixtures from '../../../test/annotation-fixtures';
 import ExportAnnotations, { $imports } from '../ExportAnnotations';
 

src/sidebar/components/ShareDialog/test/FileInput-test.js

@@ -1,6 +1,6 @@
+import { checkAccessibility } from '@hypothesis/frontend-testing';
 import { mount } from 'enzyme';
 
-import { checkAccessibility } from '../../../../test-util/accessibility';
 import FileInput from '../FileInput';
 
 describe('FileInput', () => {

src/sidebar/components/ShareDialog/test/ImportAnnotations-test.js

@@ -1,7 +1,10 @@
+import {
+  checkAccessibility,
+  waitFor,
+  waitForElement,
+} from '@hypothesis/frontend-testing';
 import { mount } from 'enzyme';
 
-import { checkAccessibility } from '../../../../test-util/accessibility';
-import { waitFor, waitForElement } from '../../../../test-util/wait';
 import ImportAnnotations, { $imports } from '../ImportAnnotations';
 
 describe('ImportAnnotations', () => {

src/sidebar/components/ShareDialog/test/ShareAnnotations-test.js

@@ -1,7 +1,9 @@
+import {
+  checkAccessibility,
+  mockImportedComponents,
+} from '@hypothesis/frontend-testing';
 import { mount } from 'enzyme';
 
-import { checkAccessibility } from '../../../../test-util/accessibility';
-import { mockImportedComponents } from '../../../../test-util/mock-imported-components';
 import ShareAnnotations from '../ShareAnnotations';
 import { $imports } from '../ShareAnnotations';
 

src/sidebar/components/ShareDialog/test/ShareDialog-test.js

@@ -1,8 +1,10 @@
 import { Tab } from '@hypothesis/frontend-shared';
+import {
+  checkAccessibility,
+  mockImportedComponents,
+} from '@hypothesis/frontend-testing';
 import { mount } from 'enzyme';
 
-import { checkAccessibility } from '../../../../test-util/accessibility';
-import { mockImportedComponents } from '../../../../test-util/mock-imported-components';
 import ShareDialog from '../ShareDialog';
 import { $imports } from '../ShareDialog';
 

src/sidebar/components/test/AnnotationView-test.js

@@ -1,7 +1,6 @@
+import { mockImportedComponents, waitFor } from '@hypothesis/frontend-testing';
 import { mount } from 'enzyme';
 
-import { mockImportedComponents } from '../../../test-util/mock-imported-components';
-import { waitFor } from '../../../test-util/wait';
 import AnnotationView, { $imports } from '../AnnotationView';
 
 describe('AnnotationView', () => {