✅ ♻️ Merge test helpers files (ampproject#35985)

* reorganize test helper files. disable local/query-selector lint rule in testing directory

* rename service-helpers to service

build-system/tasks/make-extension/template/bento/extensions/amp-__component_name_hyphenated__/__component_version__/test/test-amp-__component_name_hyphenated__.js

@@ -1,7 +1,7 @@
 import '../amp-__component_name_hyphenated__';
 import {htmlFor} from '#core/dom/static-template';
 import {toggleExperiment} from '#experiments';
-import {waitFor} from '#testing/test-helper';
+import {waitFor} from '#testing/helpers/service';
 
 describes.realWin(
   'amp-__component_name_hyphenated__-v__component_version__',

build-system/tasks/make-extension/template/bento/extensions/amp-__component_name_hyphenated__/__component_version__/test/test-component.js

@@ -1,7 +1,6 @@
 import * as Preact from '#preact';
 import {Bento__component_name_pascalcase__} from '../component';
 import {mount} from 'enzyme';
-import {waitFor} from '#testing/test-helper';
 
 describes.sandboxed('Bento__component_name_pascalcase__ preact component v1.0', {}, (env) => {
   // __do_not_submit__: This is example code only.

build-system/test-configs/forbidden-terms.js

@@ -312,7 +312,7 @@ const forbiddenTermsGlobal = {
       'src/service/origin-experiments-impl.js',
       'src/service/template-impl.js',
       'src/utils/display-observer.js',
-      'testing/test-helper.js',
+      'testing/helpers/service.js',
     ],
   },
   'initLogConstructor|setReportError': {

extensions/amp-accordion/1.0/test/test-amp-accordion.js

@@ -9,7 +9,7 @@ import {CanRender} from '#preact/contextprops';
 
 import {ActionInvocation} from '#service/action-impl';
 
-import {waitFor} from '#testing/test-helper';
+import {waitFor} from '#testing/helpers/service';
 
 describes.realWin(
   'amp-accordion:1.0',

extensions/amp-accordion/1.0/test/test-component.js

@@ -3,7 +3,7 @@ import {mount} from 'enzyme';
 import * as Preact from '#preact';
 import {useAmpContext} from '#preact/context';
 
-import {waitFor} from '#testing/test-helper';
+import {waitFor} from '#testing/helpers/service';
 
 import {
   BentoAccordion,

extensions/amp-ad/0.1/test/test-amp-ad-3p-impl.js

@@ -12,7 +12,7 @@ import {Services} from '#service';
 import {adConfig} from '#ads/_config';
 import {createElementWithAttributes} from '#core/dom';
 import {macroTask} from '#testing/helpers';
-import {stubServiceForDoc} from '#testing/test-helper';
+import {stubServiceForDoc} from '#testing/helpers/service';
 
 function createAmpAd(win, attachToAmpdoc = false, ampdoc) {
   const ampAdElement = createElementWithAttributes(win.document, 'amp-ad', {

extensions/amp-ad/0.1/test/test-amp-ad.js

@@ -3,7 +3,7 @@ import {AmpAd3PImpl} from '../amp-ad-3p-impl';
 import {Services} from '#service';
 import {adConfig} from '#ads/_config';
 import {getA4ARegistry} from '#ads/_a4a-config';
-import {stubService} from '#testing/test-helper';
+import {stubService} from '#testing/helpers/service';
 
 describes.realWin('Ad loader', {amp: true}, (env) => {
   let win, doc;

extensions/amp-analytics/0.1/test/test-amp-analytics.js

@@ -1,7 +1,10 @@
 import {AmpAnalytics} from '../amp-analytics';
 import {AnalyticsConfig} from '../config';
 import {ClickEventTracker, VisibilityTracker} from '../events';
-import {ImagePixelVerifier, mockWindowInterface} from '#testing/test-helper';
+import {
+  ImagePixelVerifier,
+  mockWindowInterface,
+} from '#testing/helpers/service';
 import {LayoutPriority} from '#core/dom/layout';
 import {LinkerManager} from '../linker-manager';
 import {Services} from '#service';

extensions/amp-analytics/0.1/test/test-config.js

@@ -2,7 +2,7 @@ import {AnalyticsConfig, expandConfigRequest, mergeObjects} from '../config';
 import {Services} from '#service';
 import {installDocService} from '#service/ampdoc-impl';
 import {map} from '#core/types/object';
-import {stubService} from '#testing/test-helper';
+import {stubService} from '#testing/helpers/service';
 import {user} from '#utils/log';
 
 describes.realWin(

extensions/amp-analytics/0.1/test/test-cookie-writer.js

@@ -5,7 +5,7 @@ import {dict} from '#core/types/object';
 import {installLinkerReaderService} from '../linker-reader';
 import {installSessionServiceForTesting} from '../session-manager';
 import {installVariableServiceForTesting} from '../variables';
-import {stubService} from '#testing/test-helper';
+import {stubService} from '#testing/helpers/service';
 
 const TAG = '[amp-analytics/cookie-writer]';
 

extensions/amp-analytics/0.1/test/test-linker-manager.js

@@ -12,7 +12,7 @@ import {
 } from '../linker-reader';
 import {installSessionServiceForTesting} from '../session-manager';
 import {installVariableServiceForTesting} from '../variables';
-import {mockWindowInterface} from '#testing/test-helper';
+import {mockWindowInterface} from '#testing/helpers/service';
 
 // TODO(ccordry): Refactor all these tests with async/await.
 describes.realWin('Linker Manager', {amp: true}, (env) => {

extensions/amp-analytics/0.1/test/test-linker-reader.js

@@ -2,7 +2,7 @@ import {
   installLinkerReaderService,
   linkerReaderServiceFor,
 } from '../linker-reader';
-import {mockWindowInterface} from '#testing/test-helper';
+import {mockWindowInterface} from '#testing/helpers/service';
 
 describes.sandboxed('LinkerReader', {}, (env) => {
   let linkerReader;

extensions/amp-analytics/0.1/test/test-linker.js

@@ -1,5 +1,5 @@
 import {createLinker, parseLinker} from '../linker';
-import {mockWindowInterface} from '#testing/test-helper';
+import {mockWindowInterface} from '#testing/helpers/service';
 
 const TAG = '[amp-analytics/linker]';
 

extensions/amp-analytics/0.1/test/test-transport.js

@@ -1,6 +1,9 @@
 import * as fakeTimers from '@sinonjs/fake-timers';
 import {AmpScriptService} from '../../../amp-script/0.1/amp-script';
-import {ImagePixelVerifier, mockWindowInterface} from '#testing/test-helper';
+import {
+  ImagePixelVerifier,
+  mockWindowInterface,
+} from '#testing/helpers/service';
 import {Services} from '#service';
 import {Transport} from '../transport';
 import {getMode} from '../../../../src/mode';

extensions/amp-analytics/0.1/test/test-vendors.js

@@ -2,7 +2,10 @@ import {AmpAnalytics} from '../amp-analytics';
 import {AnalyticsConfig} from '../config';
 import {ExpansionOptions, variableServiceForDoc} from '../variables';
 import {IFRAME_TRANSPORTS} from '../iframe-transport-vendors';
-import {ImagePixelVerifier, mockWindowInterface} from '#testing/test-helper';
+import {
+  ImagePixelVerifier,
+  mockWindowInterface,
+} from '#testing/helpers/service';
 import {Services} from '#service';
 import {hasOwn} from '#core/types/object';
 import {macroTask} from '#testing/helpers';

extensions/amp-base-carousel/1.0/test/test-amp-base-carousel.js

@@ -7,7 +7,7 @@ import {setStyles} from '#core/dom/style';
 import {toArray} from '#core/types/array';
 import {toggleExperiment} from '#experiments';
 import {useStyles} from '../component.jss';
-import {waitFor, whenCalled} from '#testing/test-helper';
+import {waitFor, whenCalled} from '#testing/helpers/service';
 
 describes.realWin(
   'amp-base-carousel:1.0',

extensions/amp-brightcove/1.0/test/test-amp-brightcove.js

@@ -1,7 +1,7 @@
 import * as consent from '../../../../src/consent';
 import '../amp-brightcove';
 import {toggleExperiment} from '#experiments';
-import {waitFor} from '#testing/test-helper';
+import {waitFor} from '#testing/helpers/service';
 import {createElementWithAttributes} from '#core/dom';
 import {parseUrlDeprecated} from '../../../../src/url';
 import {CONSENT_POLICY_STATE} from '#core/constants/consent-state';

extensions/amp-byside-content/0.1/test/test-amp-byside-content.js

@@ -1,5 +1,5 @@
 import '../amp-byside-content';
-import {mockServiceForDoc} from '#testing/test-helper';
+import {mockServiceForDoc} from '#testing/helpers/service';
 
 describes.realWin(
   'amp-byside-content',

extensions/amp-consent/0.1/test/test-consent-ui.js

@@ -16,7 +16,7 @@ import {
   resetServiceForTesting,
 } from '../../../../src/service-helpers';
 import {user} from '#utils/log';
-import {whenCalled} from '#testing/test-helper';
+import {whenCalled} from '#testing/helpers/service';
 
 describes.realWin(
   'consent-ui',

extensions/amp-consent/0.1/test/test-linker-reader.js

@@ -1,5 +1,5 @@
 import {ConsentLinkerReader} from '../linker-reader';
-import {mockWindowInterface} from '#testing/test-helper';
+import {mockWindowInterface} from '#testing/helpers/service';
 
 describes.realWin('LinkerReader', {amp: true}, (env) => {
   let linkerReader;

extensions/amp-consent/0.1/test/test-linker.js

@@ -1,5 +1,5 @@
 import {createLinker, parseLinker} from '../linker';
-import {mockWindowInterface} from '#testing/test-helper';
+import {mockWindowInterface} from '#testing/helpers/service';
 
 const TAG = '[amp-consent/linker]';
 

extensions/amp-consent/0.1/test/test-tcf-api-command-manager.js

@@ -1,6 +1,6 @@
 import {TcfApiCommandManager} from '../tcf-api-command-manager';
 import {macroTask} from '#testing/helpers';
-import {mockWindowInterface} from '#testing/test-helper';
+import {mockWindowInterface} from '#testing/helpers/service';
 import {user} from '#utils/log';
 
 describes.realWin(

extensions/amp-date-countdown/1.0/test/test-amp-date-countdown.js

@@ -2,7 +2,7 @@ import '../../../amp-mustache/0.2/amp-mustache';
 import '../amp-date-countdown';
 import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 
-import {waitFor} from '#testing/test-helper';
+import {waitFor} from '#testing/helpers/service';
 
 describes.realWin(
   'amp-date-countdown 1.0',

extensions/amp-date-display/1.0/test/test-amp-date-display.js

@@ -6,7 +6,7 @@ import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 
 import {user} from '#utils/log';
 
-import {waitFor} from '#testing/test-helper';
+import {waitFor} from '#testing/helpers/service';
 
 describes.realWin(
   'amp-date-display 1.0',

extensions/amp-embedly-card/1.0/test/test-amp-embedly-card.js

@@ -4,8 +4,8 @@ import {computedStyle} from '#core/dom/style';
 
 import {toggleExperiment} from '#experiments';
 
+import {waitFor} from '#testing/helpers/service';
 import {doNotLoadExternalResourcesInTest} from '#testing/iframe';
-import {waitFor} from '#testing/test-helper';
 
 describes.realWin(
   'amp-embedly-card-v1.0',

extensions/amp-facebook/1.0/test/test-amp-facebook-comments.js

@@ -5,7 +5,7 @@ import {resetServiceForTesting} from '../../../../src/service-helpers';
 import {serializeMessage} from '#core/3p-frame-messaging';
 import {setDefaultBootstrapBaseUrlForTesting} from '../../../../src/3p-frame';
 import {toggleExperiment} from '#experiments';
-import {waitFor} from '#testing/test-helper';
+import {waitFor} from '#testing/helpers/service';
 
 describes.realWin(
   'amp-facebook-comments',

extensions/amp-facebook/1.0/test/test-amp-facebook-like.js

@@ -5,7 +5,7 @@ import {resetServiceForTesting} from '../../../../src/service-helpers';
 import {serializeMessage} from '#core/3p-frame-messaging';
 import {setDefaultBootstrapBaseUrlForTesting} from '../../../../src/3p-frame';
 import {toggleExperiment} from '#experiments';
-import {waitFor} from '#testing/test-helper';
+import {waitFor} from '#testing/helpers/service';
 
 describes.realWin(
   'amp-facebook-like',

extensions/amp-facebook/1.0/test/test-amp-facebook-page.js

@@ -5,7 +5,7 @@ import {resetServiceForTesting} from '../../../../src/service-helpers';
 import {serializeMessage} from '#core/3p-frame-messaging';
 import {setDefaultBootstrapBaseUrlForTesting} from '../../../../src/3p-frame';
 import {toggleExperiment} from 'src/experiments';
-import {waitFor} from 'testing/test-helper';
+import {waitFor} from '#testing/helpers/service';
 
 describes.realWin(
   'amp-facebook-page',

extensions/amp-facebook/1.0/test/test-amp-facebook.js

@@ -6,7 +6,7 @@ import {resetServiceForTesting} from '../../../../src/service-helpers';
 import {serializeMessage} from '#core/3p-frame-messaging';
 import {setDefaultBootstrapBaseUrlForTesting} from '../../../../src/3p-frame';
 import {toggleExperiment} from '#experiments';
-import {waitFor} from '#testing/test-helper';
+import {waitFor} from '#testing/helpers/service';
 
 describes.realWin(
   'amp-facebook',

extensions/amp-facebook/1.0/test/test-component.js

@@ -4,7 +4,7 @@ import {WithAmpContext} from '#preact/context';
 import {createRef} from '#preact';
 import {mount} from 'enzyme';
 import {serializeMessage} from '#core/3p-frame-messaging';
-import {waitFor} from '#testing/test-helper';
+import {waitFor} from '#testing/helpers/service';
 
 describes.sandboxed('BentoFacebook preact component', {}, (env) => {
   const href =

extensions/amp-fit-text/1.0/test/test-amp-fit-text.js

@@ -4,7 +4,7 @@ import {createElementWithAttributes} from '#core/dom';
 import {expect} from 'chai';
 import {toggleExperiment} from '#experiments';
 import {useStyles} from '../component.jss';
-import {waitFor} from '#testing/test-helper';
+import {waitFor} from '#testing/helpers/service';
 
 describes.realWin(
   'amp-fit-text component',

extensions/amp-fit-text/1.0/test/test-component.js

@@ -3,7 +3,7 @@ import {BentoFitText, calculateFontSize, setOverflowStyle} from '../component';
 import {computedStyle} from '#core/dom/style';
 import {mount} from 'enzyme';
 import {useStyles} from '../component.jss';
-import {waitFor} from '#testing/test-helper';
+import {waitFor} from '#testing/helpers/service';
 
 describes.realWin('BentoFitText preact component v1.0', {}, (env) => {
   let win;

extensions/amp-form/0.1/test/test-amp-form.js

@@ -17,7 +17,7 @@ import {createCustomEvent} from '#utils/event-helper';
 import {user} from '#utils/log';
 import * as xhrUtils from '#utils/xhr-utils';
 
-import {whenCalled} from '#testing/test-helper';
+import {whenCalled} from '#testing/helpers/service';
 
 import {
   createFormDataWrapper,

extensions/amp-iframe/0.1/test/test-amp-iframe.js

@@ -12,7 +12,7 @@ import {macroTask} from '#testing/helpers';
 import {poll} from '#testing/iframe';
 import {toggleExperiment} from '#experiments';
 import {user} from '#utils/log';
-import {whenCalled} from '#testing/test-helper';
+import {whenCalled} from '#testing/helpers/service';
 
 /** @const {number} */
 const IFRAME_MESSAGE_TIMEOUT = 50;

extensions/amp-iframe/1.0/test/test-amp-iframe.js

@@ -1,7 +1,7 @@
 import '../amp-iframe';
 import {htmlFor} from '#core/dom/static-template';
 import {toggleExperiment} from '#experiments';
-import {waitFor} from '#testing/test-helper';
+import {waitFor} from '#testing/helpers/service';
 import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 import {flush} from '#testing/preact';
 

extensions/amp-image-slider/0.1/test/integration/test-amp-image-slider.js

@@ -1,4 +1,4 @@
-import {createPointerEvent} from '#testing/test-helper';
+import {createPointerEvent} from '#testing/helpers/service';
 
 const t = describes.sandboxed.configure().ifChrome();
 

extensions/amp-inline-gallery/1.0/test/test-amp-inline-gallery.js

@@ -7,7 +7,7 @@ import {createElementWithAttributes} from '#core/dom';
 import {setStyles} from '#core/dom/style';
 import {subscribe} from '#core/context';
 import {toggleExperiment} from '#experiments';
-import {waitFor} from '#testing/test-helper';
+import {waitFor} from '#testing/helpers/service';
 
 describes.realWin(
   'amp-inline-gallery',

extensions/amp-instagram/1.0/test/test-amp-instagram.js

@@ -3,8 +3,8 @@ import {createElementWithAttributes} from '#core/dom';
 
 import {toggleExperiment} from '#experiments';
 
+import {waitFor} from '#testing/helpers/service';
 import {doNotLoadExternalResourcesInTest} from '#testing/iframe';
-import {waitFor} from '#testing/test-helper';
 
 describes.realWin(
   'amp-instagram-v1.0',

extensions/amp-instagram/1.0/test/test-component.js

@@ -4,7 +4,7 @@ import * as Preact from '#preact';
 import {createRef} from '#preact';
 import {WithAmpContext} from '#preact/context';
 
-import {waitFor} from '#testing/test-helper';
+import {waitFor} from '#testing/helpers/service';
 
 import {BentoInstagram} from '../component';
 

extensions/amp-lightbox-gallery/1.0/test/test-amp-lightbox-gallery.js

@@ -10,8 +10,8 @@ import {ActionInvocation} from '#service/action-impl';
 
 import * as analytics from '#utils/analytics';
 
+import {waitFor, whenCalled} from '#testing/helpers/service';
 import {poll} from '#testing/iframe';
-import {waitFor, whenCalled} from '#testing/test-helper';
 
 import {installLightboxGallery} from '../amp-lightbox-gallery';
 

extensions/amp-lightbox/0.1/test/test-amp-lightbox.js

@@ -4,7 +4,7 @@ import {ActionService} from '#service/action-impl';
 import {ActionTrust} from '#core/constants/action-constants';
 import {Keys} from '#core/constants/key-codes';
 import {Services} from '#service';
-import {whenCalled} from '#testing/test-helper';
+import {whenCalled} from '#testing/helpers/service';
 import {whenUpgradedToCustomElement} from '#core/dom/amp-element-helpers';
 
 describes.realWin(

extensions/amp-lightbox/1.0/test/test-amp-lightbox.js

@@ -4,7 +4,7 @@ import {ActionTrust, DEFAULT_ACTION} from '#core/constants/action-constants';
 import {htmlFor} from '#core/dom/static-template';
 import {poll} from '#testing/iframe';
 import {toggleExperiment} from '#experiments';
-import {whenCalled} from '#testing/test-helper';
+import {whenCalled} from '#testing/helpers/service';
 import {Services} from '#service/';
 
 describes.realWin(

extensions/amp-list/0.1/test/integration/test-amp-list.js

@@ -1,4 +1,4 @@
-import {BrowserController} from '#testing/test-helper';
+import {BrowserController} from '#testing/helpers/service';
 
 const TIMEOUT = 15000;
 

extensions/amp-list/0.1/test/test-amp-list-container.js

@@ -5,7 +5,7 @@ import {
   measureElementStub,
   measureMutateElementStub,
   mutateElementStub,
-} from '#testing/test-helper';
+} from '#testing/helpers/service';
 
 import {AmpList} from '../amp-list';
 

extensions/amp-list/0.1/test/test-amp-list-load-more.js

@@ -7,7 +7,7 @@ import {
   measureElementStub,
   measureMutateElementStub,
   mutateElementStub,
-} from '#testing/test-helper';
+} from '#testing/helpers/service';
 
 import {AmpList} from '../amp-list';