Move component test utilities to src/test-util/

Improve organizational clarity by separating tests from utility modules
used in tests, and also pave the way for re-using these utilities for UI
outside the sidebar app in future (eg. src/annotator/).

src/sidebar/components/test/annotation-action-bar-test.js

@@ -6,9 +6,9 @@ import AnnotationActionBar from '../annotation-action-bar';
 import { $imports } from '../annotation-action-bar';
 import * as fixtures from '../../test/annotation-fixtures';
 
-import { checkAccessibility } from './accessibility';
-import mockImportedComponents from './mock-imported-components';
-import { waitFor } from './util';
+import { checkAccessibility } from '../../../test-util/accessibility';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
+import { waitFor } from '../../../test-util/wait';
 
 describe('AnnotationActionBar', () => {
   let fakeAnnotation;

src/sidebar/components/test/annotation-body-test.js

@@ -7,8 +7,8 @@ import * as fixtures from '../../test/annotation-fixtures';
 import AnnotationBody from '../annotation-body';
 import { $imports } from '../annotation-body';
 
-import { checkAccessibility } from './accessibility';
-import mockImportedComponents from './mock-imported-components';
+import { checkAccessibility } from '../../../test-util/accessibility';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
 
 describe('AnnotationBody', () => {
   function createBody(props = {}) {

src/sidebar/components/test/annotation-document-info-test.js

@@ -5,8 +5,8 @@ import * as fixtures from '../../test/annotation-fixtures';
 import AnnotationDocumentInfo from '../annotation-document-info';
 import { $imports } from '../annotation-document-info';
 
-import { checkAccessibility } from './accessibility';
-import mockImportedComponents from './mock-imported-components';
+import { checkAccessibility } from '../../../test-util/accessibility';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
 
 describe('AnnotationDocumentInfo', () => {
   let fakeDomainAndTitle;

src/sidebar/components/test/annotation-header-test.js

@@ -5,8 +5,8 @@ import * as fixtures from '../../test/annotation-fixtures';
 import AnnotationHeader from '../annotation-header';
 import { $imports } from '../annotation-header';
 
-import { checkAccessibility } from './accessibility';
-import mockImportedComponents from './mock-imported-components';
+import { checkAccessibility } from '../../../test-util/accessibility';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
 
 describe('AnnotationHeader', () => {
   let fakeIsHighlight;

src/sidebar/components/test/annotation-omega-test.js

@@ -4,7 +4,7 @@ import { act } from 'preact/test-utils';
 
 import * as fixtures from '../../test/annotation-fixtures';
 
-import mockImportedComponents from './mock-imported-components';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
 
 // @TODO Note this import as `Annotation` for easier updating later
 

src/sidebar/components/test/annotation-publish-control-test.js

@@ -5,8 +5,8 @@ import * as fixtures from '../../test/annotation-fixtures';
 import AnnotationPublishControl from '../annotation-publish-control';
 import { $imports } from '../annotation-publish-control';
 
-import { checkAccessibility } from './accessibility';
-import mockImportedComponents from './mock-imported-components';
+import { checkAccessibility } from '../../../test-util/accessibility';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
 
 describe('AnnotationPublishControl', () => {
   let fakeGroup;

src/sidebar/components/test/annotation-quote-test.js

@@ -4,8 +4,8 @@ import { createElement } from 'preact';
 import AnnotationQuote from '../annotation-quote';
 import { $imports } from '../annotation-quote';
 
-import { checkAccessibility } from './accessibility';
-import mockImportedComponents from './mock-imported-components';
+import { checkAccessibility } from '../../../test-util/accessibility';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
 
 describe('AnnotationQuote', () => {
   let fakeAnnotation;

src/sidebar/components/test/annotation-share-control-test.js

@@ -5,8 +5,8 @@ import { act } from 'preact/test-utils';
 import AnnotationShareControl from '../annotation-share-control';
 import { $imports } from '../annotation-share-control';
 
-import { checkAccessibility } from './accessibility';
-import mockImportedComponents from './mock-imported-components';
+import { checkAccessibility } from '../../../test-util/accessibility';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
 
 describe('AnnotationShareControl', () => {
   let fakeAnnotation;

src/sidebar/components/test/annotation-share-info-test.js

@@ -5,8 +5,8 @@ import * as fixtures from '../../test/annotation-fixtures';
 import AnnotationShareInfo from '../annotation-share-info';
 import { $imports } from '../annotation-share-info';
 
-import { checkAccessibility } from './accessibility';
-import mockImportedComponents from './mock-imported-components';
+import { checkAccessibility } from '../../../test-util/accessibility';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
 
 describe('AnnotationShareInfo', () => {
   let fakeGroup;

src/sidebar/components/test/annotation-user-test.js

@@ -4,8 +4,8 @@ import { createElement } from 'preact';
 import AnnotationUser from '../annotation-user';
 import { $imports } from '../annotation-user';
 
-import { checkAccessibility } from './accessibility';
-import mockImportedComponents from './mock-imported-components';
+import { checkAccessibility } from '../../../test-util/accessibility';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
 
 describe('AnnotationUser', () => {
   let fakeAnnotation;

src/sidebar/components/test/autocomplete-list-test.js

@@ -4,7 +4,7 @@ import { createElement } from 'preact';
 import AutocompleteList from '../autocomplete-list';
 import { $imports } from '../autocomplete-list';
 
-import mockImportedComponents from './mock-imported-components';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
 
 describe('AutocompleteList', function() {
   let fakeList;

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

@@ -4,8 +4,8 @@ import { createElement } from 'preact';
 import Button from '../button';
 import { $imports } from '../button';
 
-import { checkAccessibility } from './accessibility';
-import mockImportedComponents from './mock-imported-components';
+import { checkAccessibility } from '../../../test-util/accessibility';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
 
 describe('Button', () => {
   let fakeOnClick;

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

@@ -5,7 +5,7 @@ import { act } from 'preact/test-utils';
 import Excerpt from '../excerpt';
 import { $imports } from '../excerpt';
 
-import { checkAccessibility } from './accessibility';
+import { checkAccessibility } from '../../../test-util/accessibility';
 
 describe('Excerpt', () => {
   const SHORT_DIV = <div id="foo" style="height: 5px;" />;

src/sidebar/components/test/focused-mode-header-test.js

@@ -4,8 +4,8 @@ import { createElement } from 'preact';
 import FocusedModeHeader from '../focused-mode-header';
 import { $imports } from '../focused-mode-header';
 
-import { checkAccessibility } from './accessibility';
-import mockImportedComponents from './mock-imported-components';
+import { checkAccessibility } from '../../../test-util/accessibility';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
 
 describe('FocusedModeHeader', function() {
   let fakeStore;

src/sidebar/components/test/group-list-section-test.js

@@ -4,7 +4,7 @@ import { createElement } from 'preact';
 import GroupListSection from '../group-list-section';
 import { $imports } from '../group-list-section';
 
-import mockImportedComponents from './mock-imported-components';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
 
 describe('GroupListSection', () => {
   const testGroups = [

src/sidebar/components/test/group-list-test.js

@@ -5,7 +5,7 @@ import { act } from 'preact/test-utils';
 import GroupList from '../group-list';
 import { $imports } from '../group-list';
 
-import mockImportedComponents from './mock-imported-components';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
 
 describe('GroupList', () => {
   let fakeServiceConfig;

src/sidebar/components/test/help-panel-test.js

@@ -5,8 +5,8 @@ import { act } from 'preact/test-utils';
 import HelpPanel from '../help-panel';
 import { $imports } from '../help-panel';
 
-import { checkAccessibility } from './accessibility';
-import mockImportedComponents from './mock-imported-components';
+import { checkAccessibility } from '../../../test-util/accessibility';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
 
 describe('HelpPanel', function() {
   let fakeAuth;

src/sidebar/components/test/logged-out-message-test.js

@@ -4,8 +4,8 @@ import { createElement } from 'preact';
 import LoggedOutMessage from '../logged-out-message';
 import { $imports } from '../logged-out-message';
 
-import { checkAccessibility } from './accessibility';
-import mockImportedComponents from './mock-imported-components';
+import { checkAccessibility } from '../../../test-util/accessibility';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
 
 describe('LoggedOutMessage', () => {
   const createLoggedOutMessage = props => {

src/sidebar/components/test/markdown-editor-test.js

@@ -6,7 +6,7 @@ import { LinkType } from '../../markdown-commands';
 import MarkdownEditor from '../markdown-editor';
 import { $imports } from '../markdown-editor';
 
-import { checkAccessibility } from './accessibility';
+import { checkAccessibility } from '../../../test-util/accessibility';
 
 describe('MarkdownEditor', () => {
   const formatResult = {

src/sidebar/components/test/markdown-view-test.js

@@ -4,7 +4,7 @@ import { createElement } from 'preact';
 import MarkdownView from '../markdown-view';
 import { $imports } from '../markdown-view';
 
-import { checkAccessibility } from './accessibility';
+import { checkAccessibility } from '../../../test-util/accessibility';
 
 describe('MarkdownView', () => {
   let fakeMediaEmbedder;

src/sidebar/components/test/menu-item-test.js

@@ -4,8 +4,8 @@ import { createElement } from 'preact';
 import MenuItem from '../menu-item';
 import { $imports } from '../menu-item';
 
-import { checkAccessibility } from './accessibility';
-import mockImportedComponents from './mock-imported-components';
+import { checkAccessibility } from '../../../test-util/accessibility';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
 
 describe('MenuItem', () => {
   const createMenuItem = props =>

src/sidebar/components/test/menu-section-test.js

@@ -4,8 +4,8 @@ import { createElement } from 'preact';
 import MenuSection from '../menu-section';
 import { $imports } from '../menu-section';
 
-import { checkAccessibility } from './accessibility';
-import mockImportedComponents from './mock-imported-components';
+import { checkAccessibility } from '../../../test-util/accessibility';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
 
 describe('MenuSection', () => {
   const createMenuSection = props =>

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

@@ -5,7 +5,7 @@ import { act } from 'preact/test-utils';
 import Menu from '../menu';
 import { $imports } from '../menu';
 
-import { checkAccessibility } from './accessibility';
+import { checkAccessibility } from '../../../test-util/accessibility';
 
 describe('Menu', () => {
   let container;

src/sidebar/components/test/moderation-banner-test.js

@@ -5,8 +5,8 @@ import * as fixtures from '../../test/annotation-fixtures';
 import ModerationBanner from '../moderation-banner';
 import { $imports } from '../moderation-banner';
 
-import { checkAccessibility } from './accessibility';
-import mockImportedComponents from './mock-imported-components';
+import { checkAccessibility } from '../../../test-util/accessibility';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
 
 const moderatedAnnotation = fixtures.moderatedAnnotation;
 

src/sidebar/components/test/new-note-btn-test.js

@@ -6,8 +6,8 @@ import events from '../../events';
 import NewNoteButton from '../new-note-btn';
 import { $imports } from '../new-note-btn';
 
-import { checkAccessibility } from './accessibility';
-import mockImportedComponents from './mock-imported-components';
+import { checkAccessibility } from '../../../test-util/accessibility';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
 
 describe('NewNoteButton', function() {
   let fakeStore;

src/sidebar/components/test/search-input-test.js

@@ -4,7 +4,7 @@ import { createElement } from 'preact';
 import SearchInput from '../search-input';
 import { $imports } from '../search-input';
 
-import { checkAccessibility } from './accessibility';
+import { checkAccessibility } from '../../../test-util/accessibility';
 
 describe('SearchInput', () => {
   let fakeStore;

src/sidebar/components/test/search-status-bar-test.js

@@ -4,8 +4,8 @@ import { createElement } from 'preact';
 import SearchStatusBar from '../search-status-bar';
 import { $imports } from '../search-status-bar';
 
-import { checkAccessibility } from './accessibility';
-import mockImportedComponents from './mock-imported-components';
+import { checkAccessibility } from '../../../test-util/accessibility';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
 
 describe('SearchStatusBar', () => {
   let fakeRootThread;

src/sidebar/components/test/selection-tabs-test.js

@@ -5,8 +5,8 @@ import uiConstants from '../../ui-constants';
 import SelectionTabs from '../selection-tabs';
 import { $imports } from '../selection-tabs';
 
-import { checkAccessibility } from './accessibility';
-import mockImportedComponents from './mock-imported-components';
+import { checkAccessibility } from '../../../test-util/accessibility';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
 
 describe('SelectionTabs', function() {
   // mock services

src/sidebar/components/test/share-annotations-panel-test.js

@@ -4,8 +4,8 @@ import { createElement } from 'preact';
 import ShareAnnotationsPanel from '../share-annotations-panel';
 import { $imports } from '../share-annotations-panel';
 
-import { checkAccessibility } from './accessibility';
-import mockImportedComponents from './mock-imported-components';
+import { checkAccessibility } from '../../../test-util/accessibility';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
 
 describe('ShareAnnotationsPanel', () => {
   let fakeStore;

src/sidebar/components/test/share-links-test.js

@@ -4,8 +4,8 @@ import { createElement } from 'preact';
 import ShareLinks from '../share-links';
 import { $imports } from '../share-links';
 
-import { checkAccessibility } from './accessibility';
-import mockImportedComponents from './mock-imported-components';
+import { checkAccessibility } from '../../../test-util/accessibility';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
 
 describe('ShareLinks', () => {
   let fakeAnalytics;

src/sidebar/components/test/sidebar-content-error-test.js

@@ -4,8 +4,8 @@ import { createElement } from 'preact';
 import SidebarContentError from '../sidebar-content-error';
 import { $imports } from '../sidebar-content-error';
 
-import { checkAccessibility } from './accessibility';
-import mockImportedComponents from './mock-imported-components';
+import { checkAccessibility } from '../../../test-util/accessibility';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
 
 describe('SidebarContentError', () => {
   const createSidebarContentError = (

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

@@ -4,8 +4,8 @@ import { createElement } from 'preact';
 import SidebarPanel from '../sidebar-panel';
 import { $imports } from '../sidebar-panel';
 
-import { checkAccessibility } from './accessibility';
-import mockImportedComponents from './mock-imported-components';
+import { checkAccessibility } from '../../../test-util/accessibility';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
 
 describe('SidebarPanel', () => {
   let fakeStore;

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

@@ -3,7 +3,7 @@ import { createElement } from 'preact';
 
 import Slider from '../slider';
 
-import { checkAccessibility } from './accessibility';
+import { checkAccessibility } from '../../../test-util/accessibility';
 
 describe('Slider', () => {
   let container;

src/sidebar/components/test/sort-menu-test.js

@@ -4,7 +4,7 @@ import { createElement } from 'preact';
 import SortMenu from '../sort-menu';
 import { $imports } from '../sort-menu';
 
-import mockImportedComponents from './mock-imported-components';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
 
 describe('SortMenu', () => {
   let fakeState;

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

@@ -3,7 +3,7 @@ import { createElement } from 'preact';
 
 import Spinner from '../spinner';
 
-import { checkAccessibility } from './accessibility';
+import { checkAccessibility } from '../../../test-util/accessibility';
 
 describe('Spinner', function() {
   const createSpinner = (props = {}) => mount(<Spinner {...props} />);

src/sidebar/components/test/stream-search-input-test.js

@@ -5,7 +5,7 @@ import { act } from 'preact/test-utils';
 import StreamSearchInput from '../stream-search-input';
 import { $imports } from '../stream-search-input';
 
-import mockImportedComponents from './mock-imported-components';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
 
 describe('StreamSearchInput', () => {
   let fakeLocation;

src/sidebar/components/test/tag-editor-test.js

@@ -5,8 +5,8 @@ import { act } from 'preact/test-utils';
 import TagEditor from '../tag-editor';
 import { $imports } from '../tag-editor';
 
-import { checkAccessibility } from './accessibility';
-import mockImportedComponents from './mock-imported-components';
+import { checkAccessibility } from '../../../test-util/accessibility';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
 
 describe('TagEditor', function() {
   let containers = [];

src/sidebar/components/test/tag-list-test.js

@@ -4,8 +4,8 @@ import { createElement } from 'preact';
 import TagList from '../tag-list';
 import { $imports } from '../tag-list';
 
-import { checkAccessibility } from './accessibility';
-import mockImportedComponents from './mock-imported-components';
+import { checkAccessibility } from '../../../test-util/accessibility';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
 
 describe('TagList', function() {
   let fakeServiceUrl;

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

@@ -5,7 +5,7 @@ import { act } from 'preact/test-utils';
 import Timestamp from '../timestamp';
 import { $imports } from '../timestamp';
 
-import { checkAccessibility } from './accessibility';
+import { checkAccessibility } from '../../../test-util/accessibility';
 
 describe('Timestamp', () => {
   let clock;

src/sidebar/components/test/top-bar-test.js

@@ -6,8 +6,8 @@ import uiConstants from '../../ui-constants';
 import TopBar from '../top-bar';
 import { $imports } from '../top-bar';
 
-import { checkAccessibility } from './accessibility';
-import mockImportedComponents from './mock-imported-components';
+import { checkAccessibility } from '../../../test-util/accessibility';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
 
 describe('TopBar', () => {
   const fakeSettings = {};

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

@@ -4,8 +4,8 @@ import { createElement } from 'preact';
 import Tutorial from '../tutorial';
 import { $imports } from '../tutorial';
 
-import { checkAccessibility } from './accessibility';
-import mockImportedComponents from './mock-imported-components';
+import { checkAccessibility } from '../../../test-util/accessibility';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
 
 describe('Tutorial', function() {
   let fakeIsThirdPartyService;

src/sidebar/components/test/user-menu-test.js

@@ -5,7 +5,7 @@ import bridgeEvents from '../../../shared/bridge-events';
 import UserMenu from '../user-menu';
 import { $imports } from '../user-menu';
 
-import mockImportedComponents from './mock-imported-components';
+import mockImportedComponents from '../../../test-util/mock-imported-components';
 
 describe('UserMenu', () => {
   let fakeAuth;

src/sidebar/components/test/version-info-test.js

@@ -4,7 +4,7 @@ import { createElement } from 'preact';
 import VersionInfo from '../version-info';
 import { $imports } from '../version-info';
 
-import { checkAccessibility } from './accessibility';
+import { checkAccessibility } from '../../../test-util/accessibility';
 
 describe('VersionInfo', function() {
   let fakeVersionData;