From 25b9f5867a7bc6407788dc604b2250bdd874c586 Mon Sep 17 00:00:00 2001 From: Ryan Cebulko Date: Fri, 11 Jun 2021 20:27:51 -0400 Subject: [PATCH] autofix --- ads/google/a4a/test/test-utils.js | 2 +- extensions/amp-3d-gltf/0.1/test/test-amp-3d-gltf.js | 2 +- extensions/amp-3q-player/0.1/test/test-amp-3q-player.js | 2 +- extensions/amp-a4a/0.1/test/test-a4a-integration.js | 2 +- extensions/amp-a4a/0.1/test/test-a4a-var-source.js | 2 +- extensions/amp-a4a/0.1/test/test-amp-a4a.js | 4 ++-- extensions/amp-accordion/0.1/test/test-amp-accordion.js | 2 +- extensions/amp-accordion/1.0/test/test-amp-accordion.js | 2 +- extensions/amp-accordion/1.0/test/test-component.js | 2 +- extensions/amp-ad/0.1/test/test-amp-ad-3p-impl.js | 2 +- extensions/amp-ad/0.1/test/test-amp-ad-ui.js | 2 +- .../amp-ad/0.1/test/test-amp-ad-xorigin-iframe-handler.js | 5 +---- extensions/amp-ad/0.1/test/test-amp-ad.js | 2 +- extensions/amp-ad/0.1/test/test-concurrent-load.js | 2 +- extensions/amp-analytics/0.1/test/test-amp-analytics.js | 7 ++----- extensions/amp-analytics/0.1/test/test-config.js | 2 +- extensions/amp-analytics/0.1/test/test-cookie-writer.js | 2 +- extensions/amp-analytics/0.1/test/test-events.js | 2 +- extensions/amp-analytics/0.1/test/test-iframe-transport.js | 2 +- extensions/amp-analytics/0.1/test/test-linker-manager.js | 2 +- extensions/amp-analytics/0.1/test/test-linker-reader.js | 2 +- extensions/amp-analytics/0.1/test/test-linker.js | 2 +- extensions/amp-analytics/0.1/test/test-requests.js | 2 +- extensions/amp-analytics/0.1/test/test-transport.js | 5 +---- extensions/amp-analytics/0.1/test/test-vendors.js | 7 ++----- .../amp-animation/0.1/test/test-keyframes-extractor.js | 2 +- extensions/amp-animation/0.1/test/test-web-animations.js | 2 +- .../amp-base-carousel/1.0/test/test-amp-base-carousel.js | 2 +- extensions/amp-brightcove/0.1/test/test-amp-brightcove.js | 2 +- .../amp-byside-content/0.1/test/test-amp-byside-content.js | 2 +- extensions/amp-carousel/0.1/test/test-slidescroll.js | 2 +- extensions/amp-consent/0.1/test/test-amp-consent.js | 2 +- .../amp-consent/0.1/test/test-consent-policy-manager.js | 2 +- .../amp-consent/0.1/test/test-consent-state-manager.js | 2 +- extensions/amp-consent/0.1/test/test-consent-ui.js | 4 ++-- extensions/amp-consent/0.1/test/test-linker-reader.js | 2 +- extensions/amp-consent/0.1/test/test-linker.js | 2 +- .../amp-consent/0.1/test/test-tcf-api-command-manager.js | 4 ++-- .../amp-date-countdown/1.0/test/test-amp-date-countdown.js | 2 +- .../amp-date-display/1.0/test/test-amp-date-display.js | 2 +- .../test-integration-amp-date-picker-actions.js | 2 +- .../integration/test-integration-amp-date-picker-init.js | 2 +- .../test/integration/test-integration-dates-attributes.js | 2 +- .../test/integration/test-integration-maximum-nights.js | 2 +- .../0.1/test/test-amp-facebook-comments.js | 2 +- .../1.0/test/test-amp-facebook-comments.js | 4 ++-- .../amp-facebook-like/1.0/test/test-amp-facebook-like.js | 4 ++-- extensions/amp-facebook/1.0/test/test-amp-facebook.js | 4 ++-- extensions/amp-facebook/1.0/test/test-component.js | 2 +- extensions/amp-fit-text/1.0/test/test-amp-fit-text.js | 2 +- extensions/amp-fit-text/1.0/test/test-component.js | 2 +- .../test/integration/test-integration-form-verifiers.js | 2 +- .../amp-form/0.1/test/integration/test-integration-form.js | 2 +- extensions/amp-form/0.1/test/test-amp-form.js | 2 +- extensions/amp-iframe/0.1/test/test-amp-iframe.js | 6 +++--- extensions/amp-ima-video/0.1/test/test-amp-ima-video.js | 2 +- .../0.1/test/integration/test-amp-image-lightbox.js | 2 +- .../0.1/test/integration/test-amp-image-slider.js | 2 +- .../amp-inline-gallery/1.0/test/test-amp-inline-gallery.js | 2 +- .../0.1/test/integration/test-integration-amp-inputmask.js | 2 +- extensions/amp-instagram/1.0/test/test-amp-instagram.js | 4 ++-- extensions/amp-instagram/1.0/test/test-component.js | 2 +- .../0.1/test/integration/test-amp-lightbox-gallery.js | 2 +- extensions/amp-lightbox/0.1/test/test-amp-lightbox.js | 2 +- extensions/amp-lightbox/1.0/test/test-amp-lightbox.js | 4 ++-- extensions/amp-list/0.1/test/integration/test-amp-list.js | 2 +- extensions/amp-list/0.1/test/test-amp-list-container.js | 2 +- extensions/amp-list/0.1/test/test-amp-list-load-more.js | 2 +- extensions/amp-next-page/0.1/test/test-amp-next-page.js | 2 +- .../amp-onetap-google/0.1/test/test-amp-onetap-google.js | 2 +- .../amp-pan-zoom/0.1/test/integration/test-amp-pan-zoom.js | 2 +- extensions/amp-pan-zoom/0.1/test/test-amp-pan-zoom.js | 2 +- extensions/amp-render/1.0/test/test-amp-render.js | 2 +- extensions/amp-render/1.0/test/test-component.js | 2 +- .../amp-script/0.1/test/integration/test-amp-script.js | 4 ++-- extensions/amp-script/0.1/test/unit/test-amp-script.js | 2 +- extensions/amp-selector/1.0/test/test-amp-selector.js | 2 +- .../amp-sidebar/0.1/test/integration/test-amp-sidebar.js | 2 +- extensions/amp-sidebar/0.1/test/test-amp-sidebar.js | 2 +- extensions/amp-sidebar/0.1/test/test-toolbar.js | 2 +- .../amp-sidebar/0.2/test/integration/test-amp-sidebar.js | 2 +- extensions/amp-sidebar/0.2/test/test-amp-sidebar.js | 2 +- extensions/amp-sidebar/0.2/test/test-toolbar.js | 2 +- extensions/amp-sidebar/1.0/test/test-amp-sidebar.js | 2 +- .../amp-social-share/1.0/test/test-amp-social-share.js | 2 +- extensions/amp-sticky-ad/1.0/test/test-amp-sticky-ad.js | 4 ++-- .../0.1/test/test-algorithm-count-pages.js | 2 +- .../amp-story-auto-ads/0.1/test/test-amp-story-auto-ads.js | 2 +- .../0.1/test/test-story-ad-page-manager.js | 2 +- .../amp-story-auto-ads/0.1/test/test-story-ad-page.js | 2 +- .../0.1/test/test-amp-story-interactive-binary-poll.js | 2 +- .../0.1/test/test-amp-story-interactive-poll.js | 2 +- .../0.1/test/test-amp-story-interactive.js | 2 +- .../1.0/test/integration/test-amp-story-affiliate-link.js | 5 +---- .../1.0/test/test-amp-story-media-query-service.js | 2 +- extensions/amp-story/1.0/test/test-amp-story.js | 2 +- .../amp-stream-gallery/1.0/test/test-amp-stream-gallery.js | 4 ++-- extensions/amp-timeago/1.0/test/test-amp-timeago.js | 2 +- extensions/amp-timeago/1.0/test/test-component.js | 2 +- extensions/amp-twitter/1.0/test/test-amp-twitter.js | 4 ++-- extensions/amp-twitter/1.0/test/test-component.js | 2 +- .../0.1/test/test-amp-user-notification.js | 2 +- .../amp-video-iframe/0.1/test/test-amp-video-iframe.js | 4 ++-- .../amp-video-iframe/1.0/test/test-amp-video-iframe.js | 2 +- extensions/amp-video/0.1/test/test-amp-video.js | 2 +- extensions/amp-video/1.0/test/test-amp-video.js | 2 +- extensions/amp-vimeo/1.0/test/test-amp-vimeo.js | 2 +- extensions/amp-youtube/0.1/test/test-amp-youtube.js | 2 +- extensions/amp-youtube/1.0/test/test-amp-youtube.js | 4 ++-- test/integration/test-actions.js | 4 ++-- test/integration/test-amp-ad-3p.js | 2 +- test/integration/test-amp-ad-doubleclick.js | 2 +- test/integration/test-amp-ad-type-custom.js | 2 +- test/integration/test-amp-analytics.js | 2 +- test/integration/test-amp-bind.js | 4 ++-- test/integration/test-amp-img.js | 2 +- test/integration/test-amp-pixel.js | 2 +- test/integration/test-amp-recaptcha-input.js | 4 ++-- test/integration/test-amp-skimlinks.js | 2 +- test/integration/test-amp-story-analytics.js | 2 +- test/integration/test-amphtml-ads.js | 4 ++-- test/integration/test-boilerplates.js | 7 ++----- test/integration/test-configuration.js | 2 +- test/integration/test-css.js | 2 +- test/integration/test-double-loading.js | 2 +- test/integration/test-errors.js | 2 +- test/integration/test-extensions-loading.js | 2 +- test/integration/test-position-observer.js | 2 +- test/integration/test-released.js | 2 +- test/integration/test-shadow-amp.js | 2 +- test/integration/test-shadow-dom-element.js | 2 +- test/integration/test-toggle-display.js | 2 +- test/integration/test-user-error-reporting.js | 2 +- test/integration/test-video-players-helper.js | 2 +- test/unit/3p/test-3p-messaging.js | 2 +- test/unit/ads/test-adplugg.js | 2 +- test/unit/ads/test-aduptech.js | 2 +- test/unit/ads/test-csa.js | 2 +- test/unit/ads/test-ssp.js | 2 +- test/unit/core/dom/stream/test-response.js | 2 +- test/unit/core/dom/test-media-query-props.js | 2 +- test/unit/core/dom/video/test-pause-helper.js | 2 +- test/unit/inabox/test-inabox-resources.js | 2 +- test/unit/preact/test-base-element-mapping.js | 4 ++-- test/unit/preact/test-base-element-runtime.js | 4 ++-- test/unit/test-3p-environment.js | 2 +- test/unit/test-action.js | 2 +- test/unit/test-ad-helper.js | 2 +- test/unit/test-amp-img-intrinsic.js | 4 ++-- test/unit/test-amp-img-v1.js | 2 +- test/unit/test-amp-img.js | 2 +- test/unit/test-amp-story-player.js | 2 +- test/unit/test-ampdoc.js | 2 +- test/unit/test-cache-cid-api.js | 2 +- test/unit/test-cid-api.js | 2 +- test/unit/test-cid.js | 4 ++-- test/unit/test-document-info.js | 2 +- test/unit/test-element-service.js | 2 +- test/unit/test-extension-analytics.js | 2 +- test/unit/test-fixed-layer.js | 2 +- test/unit/test-friendly-iframe-embed.js | 4 ++-- test/unit/test-hidden-observer.js | 2 +- test/unit/test-iframe-helper.js | 2 +- test/unit/test-iframe-stub.js | 5 +---- test/unit/test-impression.js | 2 +- test/unit/test-input.js | 2 +- test/unit/test-navigation.js | 2 +- test/unit/test-notification-ui-manager.js | 2 +- test/unit/test-position-observer.js | 2 +- test/unit/test-preconnect.js | 2 +- test/unit/test-render-delaying-services.js | 4 ++-- test/unit/test-scheduler.js | 2 +- test/unit/test-standard-actions.js | 2 +- test/unit/test-style-installer.js | 2 +- test/unit/test-url-replacements.js | 7 ++----- test/unit/test-viewer-cid-api.js | 2 +- test/unit/test-yield.js | 2 +- test/unit/url-expander/test-expander.js | 2 +- test/unit/utils/test-dom-transform-stream.js | 2 +- 179 files changed, 209 insertions(+), 233 deletions(-) diff --git a/ads/google/a4a/test/test-utils.js b/ads/google/a4a/test/test-utils.js index b65b360354f6f..524d682526be3 100644 --- a/ads/google/a4a/test/test-utils.js +++ b/ads/google/a4a/test/test-utils.js @@ -44,7 +44,7 @@ import {MockA4AImpl} from '../../../../extensions/amp-a4a/0.1/test/utils'; import {Services} from '#service'; import {buildUrl} from '#ads/google/a4a/shared/url-builder'; import {createElementWithAttributes} from '#core/dom'; -import {createIframePromise} from '../../../../testing/iframe'; +import {createIframePromise} from '#testing/iframe'; import {installDocService} from '#service/ampdoc-impl'; import {installExtensionsService} from '#service/extensions-impl'; import {installXhrService} from '#service/xhr-impl'; diff --git a/extensions/amp-3d-gltf/0.1/test/test-amp-3d-gltf.js b/extensions/amp-3d-gltf/0.1/test/test-amp-3d-gltf.js index 8e9ced08e8d16..b33995786b7e7 100644 --- a/extensions/amp-3d-gltf/0.1/test/test-amp-3d-gltf.js +++ b/extensions/amp-3d-gltf/0.1/test/test-amp-3d-gltf.js @@ -15,7 +15,7 @@ */ import '../amp-3d-gltf'; -import {createIframeWithMessageStub} from '../../../../testing/iframe'; +import {createIframeWithMessageStub} from '#testing/iframe'; describes.realWin( 'amp-3d-gltf', diff --git a/extensions/amp-3q-player/0.1/test/test-amp-3q-player.js b/extensions/amp-3q-player/0.1/test/test-amp-3q-player.js index 26248720f11c2..19891d8bd471d 100644 --- a/extensions/amp-3q-player/0.1/test/test-amp-3q-player.js +++ b/extensions/amp-3q-player/0.1/test/test-amp-3q-player.js @@ -19,7 +19,7 @@ import * as fullscreen from '#core/dom/fullscreen'; import {Services} from '#service'; import {VideoEvents} from '../../../../src/video-interface'; import {createElementWithAttributes} from '#core/dom'; -import {installResizeObserverStub} from '../../../../testing/resize-observer-stub'; +import {installResizeObserverStub} from '#testing/resize-observer-stub'; import {listenOncePromise} from '../../../../src/event-helper'; describes.realWin( diff --git a/extensions/amp-a4a/0.1/test/test-a4a-integration.js b/extensions/amp-a4a/0.1/test/test-a4a-integration.js index 2880830fbc6c0..837dbce0940ba 100644 --- a/extensions/amp-a4a/0.1/test/test-a4a-integration.js +++ b/extensions/amp-a4a/0.1/test/test-a4a-integration.js @@ -23,7 +23,7 @@ import '../../../amp-ad/0.1/amp-ad-xorigin-iframe-handler'; import {AMP_SIGNATURE_HEADER} from '../signature-verifier'; import {FetchMock, networkFailure} from './fetch-mock'; import {MockA4AImpl, TEST_URL} from './utils'; -import {createIframePromise} from '../../../../testing/iframe'; +import {createIframePromise} from '#testing/iframe'; import {getA4ARegistry, signingServerURLs} from '#ads/_a4a-config'; import {installCryptoService} from '#service/crypto-impl'; import {installDocService} from '#service/ampdoc-impl'; diff --git a/extensions/amp-a4a/0.1/test/test-a4a-var-source.js b/extensions/amp-a4a/0.1/test/test-a4a-var-source.js index e38d1a710d20f..3521f99dedb45 100644 --- a/extensions/amp-a4a/0.1/test/test-a4a-var-source.js +++ b/extensions/amp-a4a/0.1/test/test-a4a-var-source.js @@ -15,7 +15,7 @@ */ import {A4AVariableSource} from '../a4a-variable-source'; -import {createIframePromise} from '../../../../testing/iframe'; +import {createIframePromise} from '#testing/iframe'; import {installDocumentInfoServiceForDoc} from '#service/document-info-impl'; describes.sandboxed('A4AVariableSource', {}, () => { diff --git a/extensions/amp-a4a/0.1/test/test-amp-a4a.js b/extensions/amp-a4a/0.1/test/test-amp-a4a.js index 6085a27c21923..dc8e97dcdd366 100644 --- a/extensions/amp-a4a/0.1/test/test-amp-a4a.js +++ b/extensions/amp-a4a/0.1/test/test-amp-a4a.js @@ -50,7 +50,7 @@ import {Services} from '#service'; import {Signals} from '#core/data-structures/signals'; import {cancellation} from '../../../../src/error-reporting'; import {createElementWithAttributes} from '#core/dom'; -import {createIframePromise} from '../../../../testing/iframe'; +import {createIframePromise} from '#testing/iframe'; import {dev, user} from '../../../../src/log'; import { incrementLoadingAds, @@ -58,7 +58,7 @@ import { } from '../../../amp-ad/0.1/concurrent-load'; import {installRealTimeConfigServiceForDoc} from '#service/real-time-config/real-time-config-impl'; import {layoutRectLtwh, layoutSizeFromRect} from '#core/math/layout-rect'; -import {macroTask} from '../../../../testing/yield'; +import {macroTask} from '#testing/yield'; import {resetScheduledElementForTesting} from '#service/custom-element-registry'; import {data as testFragments} from './testdata/test_fragments'; import {toggleExperiment} from '#experiments'; diff --git a/extensions/amp-accordion/0.1/test/test-amp-accordion.js b/extensions/amp-accordion/0.1/test/test-amp-accordion.js index d305564dd9b71..e70bfd9fca05c 100644 --- a/extensions/amp-accordion/0.1/test/test-amp-accordion.js +++ b/extensions/amp-accordion/0.1/test/test-amp-accordion.js @@ -22,7 +22,7 @@ import {Services} from '#service'; import {computedStyle} from '#core/dom/style'; import {createElementWithAttributes, tryFocus} from '#core/dom'; import {htmlFor} from '#core/dom/static-template'; -import {poll} from '../../../../testing/iframe'; +import {poll} from '#testing/iframe'; import {whenUpgradedToCustomElement} from '../../../../src/amp-element-helpers'; describes.realWin( diff --git a/extensions/amp-accordion/1.0/test/test-amp-accordion.js b/extensions/amp-accordion/1.0/test/test-amp-accordion.js index f649a5dfd3b9a..0c9937b141b32 100644 --- a/extensions/amp-accordion/1.0/test/test-amp-accordion.js +++ b/extensions/amp-accordion/1.0/test/test-amp-accordion.js @@ -20,7 +20,7 @@ import {CanRender} from '../../../../src/context/contextprops'; import {htmlFor} from '#core/dom/static-template'; import {subscribe, unsubscribe} from '../../../../src/context'; import {toggleExperiment} from '#experiments'; -import {waitFor} from '../../../../testing/test-helper'; +import {waitFor} from '#testing/test-helper'; describes.realWin( 'amp-accordion:1.0', diff --git a/extensions/amp-accordion/1.0/test/test-component.js b/extensions/amp-accordion/1.0/test/test-component.js index c1d721ce03b9c..eddd4f61beaf2 100644 --- a/extensions/amp-accordion/1.0/test/test-component.js +++ b/extensions/amp-accordion/1.0/test/test-component.js @@ -23,7 +23,7 @@ import { } from '../component'; import {mount} from 'enzyme'; import {useAmpContext} from '#preact/context'; -import {waitFor} from '../../../../testing/test-helper'; +import {waitFor} from '#testing/test-helper'; const ContextReader = (props) => { const {renderable} = useAmpContext(); diff --git a/extensions/amp-ad/0.1/test/test-amp-ad-3p-impl.js b/extensions/amp-ad/0.1/test/test-amp-ad-3p-impl.js index 5ed3d6d6726e8..2d3cd1bafcac8 100644 --- a/extensions/amp-ad/0.1/test/test-amp-ad-3p-impl.js +++ b/extensions/amp-ad/0.1/test/test-amp-ad-3p-impl.js @@ -26,7 +26,7 @@ import {LayoutPriority} from '#core/dom/layout'; import {Services} from '#service'; import {adConfig} from '#ads/_config'; import {createElementWithAttributes} from '#core/dom'; -import {macroTask} from '../../../../testing/yield'; +import {macroTask} from '#testing/yield'; function createAmpAd(win, attachToAmpdoc = false, ampdoc) { const ampAdElement = createElementWithAttributes(win.document, 'amp-ad', { diff --git a/extensions/amp-ad/0.1/test/test-amp-ad-ui.js b/extensions/amp-ad/0.1/test/test-amp-ad-ui.js index 1cfbdb1691f51..b6523960fd0f6 100644 --- a/extensions/amp-ad/0.1/test/test-amp-ad-ui.js +++ b/extensions/amp-ad/0.1/test/test-amp-ad-ui.js @@ -19,7 +19,7 @@ import * as domQuery from '#core/dom/query'; import {AmpAdUIHandler} from '../amp-ad-ui'; import {BaseElement} from '../../../../src/base-element'; import {createElementWithAttributes} from '#core/dom'; -import {macroTask} from '../../../../testing/yield'; +import {macroTask} from '#testing/yield'; import {setStyles} from '#core/dom/style'; describes.realWin( diff --git a/extensions/amp-ad/0.1/test/test-amp-ad-xorigin-iframe-handler.js b/extensions/amp-ad/0.1/test/test-amp-ad-xorigin-iframe-handler.js index 0a2ef0a132d51..c53e2ad7f3ceb 100644 --- a/extensions/amp-ad/0.1/test/test-amp-ad-xorigin-iframe-handler.js +++ b/extensions/amp-ad/0.1/test/test-amp-ad-xorigin-iframe-handler.js @@ -19,10 +19,7 @@ import {AmpAdXOriginIframeHandler} from '../amp-ad-xorigin-iframe-handler'; import {BaseElement} from '../../../../src/base-element'; import {Services} from '#service'; import {Signals} from '#core/data-structures/signals'; -import { - createIframeWithMessageStub, - expectPostMessage, -} from '../../../../testing/iframe'; +import {createIframeWithMessageStub, expectPostMessage} from '#testing/iframe'; import {layoutRectLtwh} from '#core/math/layout-rect'; import {toggleExperiment} from '#experiments'; diff --git a/extensions/amp-ad/0.1/test/test-amp-ad.js b/extensions/amp-ad/0.1/test/test-amp-ad.js index 07f41c992adbf..1511ca25039e9 100644 --- a/extensions/amp-ad/0.1/test/test-amp-ad.js +++ b/extensions/amp-ad/0.1/test/test-amp-ad.js @@ -19,7 +19,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/test-helper'; describes.realWin('Ad loader', {amp: true}, (env) => { let win, doc; diff --git a/extensions/amp-ad/0.1/test/test-concurrent-load.js b/extensions/amp-ad/0.1/test/test-concurrent-load.js index 09a015c9c41aa..8dead74f602a8 100644 --- a/extensions/amp-ad/0.1/test/test-concurrent-load.js +++ b/extensions/amp-ad/0.1/test/test-concurrent-load.js @@ -23,7 +23,7 @@ import { waitFor3pThrottle, } from '../concurrent-load'; import {installTimerService} from '#service/timer-impl'; -import {macroTask} from '../../../../testing/yield'; +import {macroTask} from '#testing/yield'; describes.realWin('concurrent-load', {}, (env) => { describe('getAmpAdRenderOutsideViewport', () => { diff --git a/extensions/amp-analytics/0.1/test/test-amp-analytics.js b/extensions/amp-analytics/0.1/test/test-amp-analytics.js index 7d00e43f8d3c5..3611d8d901a3d 100644 --- a/extensions/amp-analytics/0.1/test/test-amp-analytics.js +++ b/extensions/amp-analytics/0.1/test/test-amp-analytics.js @@ -17,10 +17,7 @@ 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/test-helper'; import {LayoutPriority} from '#core/dom/layout'; import {LinkerManager} from '../linker-manager'; import {Services} from '#service'; @@ -34,7 +31,7 @@ import { import {installCryptoService} from '#service/crypto-impl'; import {installUserNotificationManagerForTesting} from '../../../amp-user-notification/0.1/amp-user-notification'; import {instrumentationServiceForDocForTesting} from '../instrumentation'; -import {macroTask} from '../../../../testing/yield'; +import {macroTask} from '#testing/yield'; describes.realWin( 'amp-analytics', diff --git a/extensions/amp-analytics/0.1/test/test-config.js b/extensions/amp-analytics/0.1/test/test-config.js index 5c4bd7be64e84..c45af4aefdedd 100644 --- a/extensions/amp-analytics/0.1/test/test-config.js +++ b/extensions/amp-analytics/0.1/test/test-config.js @@ -18,7 +18,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/test-helper'; import {user} from '../../../../src/log'; describes.realWin( diff --git a/extensions/amp-analytics/0.1/test/test-cookie-writer.js b/extensions/amp-analytics/0.1/test/test-cookie-writer.js index e5040b608c590..da955145eef39 100644 --- a/extensions/amp-analytics/0.1/test/test-cookie-writer.js +++ b/extensions/amp-analytics/0.1/test/test-cookie-writer.js @@ -20,7 +20,7 @@ import {CookieWriter} from '../cookie-writer'; import {dict} from '#core/types/object'; import {installLinkerReaderService} from '../linker-reader'; import {installVariableServiceForTesting} from '../variables'; -import {stubService} from '../../../../testing/test-helper'; +import {stubService} from '#testing/test-helper'; const TAG = '[amp-analytics/cookie-writer]'; diff --git a/extensions/amp-analytics/0.1/test/test-events.js b/extensions/amp-analytics/0.1/test/test-events.js index 9204f423fab25..69730df7599b7 100644 --- a/extensions/amp-analytics/0.1/test/test-events.js +++ b/extensions/amp-analytics/0.1/test/test-events.js @@ -31,7 +31,7 @@ import { import {AmpdocAnalyticsRoot} from '../analytics-root'; import {Deferred} from '#core/data-structures/promise'; import {Signals} from '#core/data-structures/signals'; -import {macroTask} from '../../../../testing/yield'; +import {macroTask} from '#testing/yield'; import {toggleExperiment} from '#experiments'; describes.realWin('Events', {amp: 1}, (env) => { diff --git a/extensions/amp-analytics/0.1/test/test-iframe-transport.js b/extensions/amp-analytics/0.1/test/test-iframe-transport.js index b335dc00de87f..aac91624eaf43 100644 --- a/extensions/amp-analytics/0.1/test/test-iframe-transport.js +++ b/extensions/amp-analytics/0.1/test/test-iframe-transport.js @@ -19,7 +19,7 @@ import { getIframeTransportScriptUrlForTesting, } from '../iframe-transport'; import {addParamsToUrl} from '../../../../src/url'; -import {expectPostMessage} from '../../../../testing/iframe.js'; +import {expectPostMessage} from '#testing/iframe.js'; import {urls} from '../../../../src/config'; import {user} from '../../../../src/log'; diff --git a/extensions/amp-analytics/0.1/test/test-linker-manager.js b/extensions/amp-analytics/0.1/test/test-linker-manager.js index 5cfee2cd8774e..d7f6895a27023 100644 --- a/extensions/amp-analytics/0.1/test/test-linker-manager.js +++ b/extensions/amp-analytics/0.1/test/test-linker-manager.js @@ -27,7 +27,7 @@ import { linkerReaderServiceFor, } from '../linker-reader'; import {installVariableServiceForTesting} from '../variables'; -import {mockWindowInterface} from '../../../../testing/test-helper'; +import {mockWindowInterface} from '#testing/test-helper'; // TODO(ccordry): Refactor all these tests with async/await. describes.realWin('Linker Manager', {amp: true}, (env) => { diff --git a/extensions/amp-analytics/0.1/test/test-linker-reader.js b/extensions/amp-analytics/0.1/test/test-linker-reader.js index 22b517e811f87..4c6d505e02c4e 100644 --- a/extensions/amp-analytics/0.1/test/test-linker-reader.js +++ b/extensions/amp-analytics/0.1/test/test-linker-reader.js @@ -18,7 +18,7 @@ import { installLinkerReaderService, linkerReaderServiceFor, } from '../linker-reader'; -import {mockWindowInterface} from '../../../../testing/test-helper'; +import {mockWindowInterface} from '#testing/test-helper'; describes.sandboxed('LinkerReader', {}, (env) => { let linkerReader; diff --git a/extensions/amp-analytics/0.1/test/test-linker.js b/extensions/amp-analytics/0.1/test/test-linker.js index ed78000233ef7..d36ab0ac48982 100644 --- a/extensions/amp-analytics/0.1/test/test-linker.js +++ b/extensions/amp-analytics/0.1/test/test-linker.js @@ -15,7 +15,7 @@ */ import {createLinker, parseLinker} from '../linker'; -import {mockWindowInterface} from '../../../../testing/test-helper'; +import {mockWindowInterface} from '#testing/test-helper'; const TAG = '[amp-analytics/linker]'; diff --git a/extensions/amp-analytics/0.1/test/test-requests.js b/extensions/amp-analytics/0.1/test/test-requests.js index 656864d0b3d41..dd532b4d2716a 100644 --- a/extensions/amp-analytics/0.1/test/test-requests.js +++ b/extensions/amp-analytics/0.1/test/test-requests.js @@ -21,7 +21,7 @@ import {ExpansionOptions, installVariableServiceForTesting} from '../variables'; import {RequestHandler, expandPostMessage} from '../requests'; import {Services} from '#service'; import {installLinkerReaderService} from '../linker-reader'; -import {macroTask} from '../../../../testing/yield'; +import {macroTask} from '#testing/yield'; describes.realWin('Requests', {amp: 1}, (env) => { let ampdoc; diff --git a/extensions/amp-analytics/0.1/test/test-transport.js b/extensions/amp-analytics/0.1/test/test-transport.js index e26b38aeb3b77..6b212b6bceba2 100644 --- a/extensions/amp-analytics/0.1/test/test-transport.js +++ b/extensions/amp-analytics/0.1/test/test-transport.js @@ -16,10 +16,7 @@ import * as fakeTimers from '@sinonjs/fake-timers'; import {AmpScriptService} from '../../../../extensions/amp-script/0.1/amp-script'; -import { - ImagePixelVerifier, - mockWindowInterface, -} from '../../../../testing/test-helper'; +import {ImagePixelVerifier, mockWindowInterface} from '#testing/test-helper'; import {Services} from '#service'; import {Transport} from '../transport'; import {getMode} from '../../../../src/mode'; diff --git a/extensions/amp-analytics/0.1/test/test-vendors.js b/extensions/amp-analytics/0.1/test/test-vendors.js index 6815886844aaa..da650e3ee363b 100644 --- a/extensions/amp-analytics/0.1/test/test-vendors.js +++ b/extensions/amp-analytics/0.1/test/test-vendors.js @@ -18,13 +18,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/test-helper'; import {Services} from '#service'; import {hasOwn} from '#core/types/object'; -import {macroTask} from '../../../../testing/yield'; +import {macroTask} from '#testing/yield'; import VENDOR_REQUESTS from './vendor-requests.json' assert {type: 'json'}; // lgtm[js/syntax-error] describes.realWin( diff --git a/extensions/amp-animation/0.1/test/test-keyframes-extractor.js b/extensions/amp-animation/0.1/test/test-keyframes-extractor.js index 3c37d8cebd729..b2c4a850d8141 100644 --- a/extensions/amp-animation/0.1/test/test-keyframes-extractor.js +++ b/extensions/amp-animation/0.1/test/test-keyframes-extractor.js @@ -15,7 +15,7 @@ */ import {extractKeyframes} from '../parsers/keyframes-extractor'; -import {poll} from '../../../../testing/iframe'; +import {poll} from '#testing/iframe'; describes.realWin('extractKeyframes', {amp: 1}, (env) => { let win, doc; diff --git a/extensions/amp-animation/0.1/test/test-web-animations.js b/extensions/amp-animation/0.1/test/test-web-animations.js index fda7de85b539a..75284f9a7588c 100644 --- a/extensions/amp-animation/0.1/test/test-web-animations.js +++ b/extensions/amp-animation/0.1/test/test-web-animations.js @@ -21,7 +21,7 @@ import {closestAncestorElementBySelector} from '#core/dom/query'; import {htmlFor, htmlRefs} from '#core/dom/static-template'; import {isArray, isObject} from '#core/types'; -import {poll} from '../../../../testing/iframe'; +import {poll} from '#testing/iframe'; import {user} from '../../../../src/log'; describes.realWin('MeasureScanner', {amp: 1}, (env) => { diff --git a/extensions/amp-base-carousel/1.0/test/test-amp-base-carousel.js b/extensions/amp-base-carousel/1.0/test/test-amp-base-carousel.js index 24d69f208398a..358f1a27f9429 100644 --- a/extensions/amp-base-carousel/1.0/test/test-amp-base-carousel.js +++ b/extensions/amp-base-carousel/1.0/test/test-amp-base-carousel.js @@ -22,7 +22,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/test-helper'; describes.realWin( 'amp-base-carousel:1.0', diff --git a/extensions/amp-brightcove/0.1/test/test-amp-brightcove.js b/extensions/amp-brightcove/0.1/test/test-amp-brightcove.js index 64626e476b5bf..fb43c5e514f55 100644 --- a/extensions/amp-brightcove/0.1/test/test-amp-brightcove.js +++ b/extensions/amp-brightcove/0.1/test/test-amp-brightcove.js @@ -22,7 +22,7 @@ import {CommonSignals} from '#core/constants/common-signals'; import {VideoEvents} from '../../../../src/video-interface'; import {createElementWithAttributes} from '#core/dom'; import {listenOncePromise} from '../../../../src/event-helper'; -import {macroTask} from '../../../../testing/yield'; +import {macroTask} from '#testing/yield'; import {parseUrlDeprecated} from '../../../../src/url'; import {whenUpgradedToCustomElement} from '../../../../src/amp-element-helpers'; diff --git a/extensions/amp-byside-content/0.1/test/test-amp-byside-content.js b/extensions/amp-byside-content/0.1/test/test-amp-byside-content.js index b01761a8f0cb4..8a29c59b25635 100644 --- a/extensions/amp-byside-content/0.1/test/test-amp-byside-content.js +++ b/extensions/amp-byside-content/0.1/test/test-amp-byside-content.js @@ -15,7 +15,7 @@ */ import '../amp-byside-content'; -import {mockServiceForDoc} from '../../../../testing/test-helper'; +import {mockServiceForDoc} from '#testing/test-helper'; describes.realWin( 'amp-byside-content', diff --git a/extensions/amp-carousel/0.1/test/test-slidescroll.js b/extensions/amp-carousel/0.1/test/test-slidescroll.js index 51a41a263287d..cc0f307a62421 100644 --- a/extensions/amp-carousel/0.1/test/test-slidescroll.js +++ b/extensions/amp-carousel/0.1/test/test-slidescroll.js @@ -19,7 +19,7 @@ import {ActionService} from '#service/action-impl'; import {ActionTrust} from '#core/constants/action-constants'; import {Services} from '#service'; import {createElementWithAttributes} from '#core/dom'; -import {installResizeObserverStub} from '../../../../testing/resize-observer-stub'; +import {installResizeObserverStub} from '#testing/resize-observer-stub'; import {user} from '../../../../src/log'; import {whenUpgradedToCustomElement} from '../../../../src/amp-element-helpers'; diff --git a/extensions/amp-consent/0.1/test/test-amp-consent.js b/extensions/amp-consent/0.1/test/test-amp-consent.js index e9b49c96fa4ef..438b18ef78542 100644 --- a/extensions/amp-consent/0.1/test/test-amp-consent.js +++ b/extensions/amp-consent/0.1/test/test-amp-consent.js @@ -29,7 +29,7 @@ import {ConsentStateManager} from '../consent-state-manager'; import {GEO_IN_GROUP} from '../../../amp-geo/0.1/amp-geo-in-group'; import {dev, user} from '../../../../src/log'; import {dict} from '#core/types/object'; -import {macroTask} from '../../../../testing/yield'; +import {macroTask} from '#testing/yield'; import { registerServiceBuilder, resetServiceForTesting, diff --git a/extensions/amp-consent/0.1/test/test-consent-policy-manager.js b/extensions/amp-consent/0.1/test/test-consent-policy-manager.js index 839ecfb66fafe..666b3d599c96e 100644 --- a/extensions/amp-consent/0.1/test/test-consent-policy-manager.js +++ b/extensions/amp-consent/0.1/test/test-consent-policy-manager.js @@ -31,7 +31,7 @@ import { } from '../consent-policy-manager'; import {dict} from '#core/types/object'; import {expandPolicyConfig} from '../consent-config'; -import {macroTask} from '../../../../testing/yield'; +import {macroTask} from '#testing/yield'; import { registerServiceBuilder, diff --git a/extensions/amp-consent/0.1/test/test-consent-state-manager.js b/extensions/amp-consent/0.1/test/test-consent-state-manager.js index 73eaf6f4afade..9d675ec6d1a9b 100644 --- a/extensions/amp-consent/0.1/test/test-consent-state-manager.js +++ b/extensions/amp-consent/0.1/test/test-consent-state-manager.js @@ -24,7 +24,7 @@ import {CONSENT_STRING_TYPE} from '#core/constants/consent-state'; import {ConsentInstance, ConsentStateManager} from '../consent-state-manager'; import {Services} from '#service'; import {dev} from '../../../../src/log'; -import {macroTask} from '../../../../testing/yield'; +import {macroTask} from '#testing/yield'; import { registerServiceBuilder, resetServiceForTesting, diff --git a/extensions/amp-consent/0.1/test/test-consent-ui.js b/extensions/amp-consent/0.1/test/test-consent-ui.js index 75eefeaa09648..d4b139b33b951 100644 --- a/extensions/amp-consent/0.1/test/test-consent-ui.js +++ b/extensions/amp-consent/0.1/test/test-consent-ui.js @@ -26,14 +26,14 @@ import {ConsentUI, consentUiClasses} from '../consent-ui'; import {Services} from '#service'; import {dict} from '#core/types/object'; import {elementByTag} from '#core/dom/query'; -import {macroTask} from '../../../../testing/yield'; +import {macroTask} from '#testing/yield'; import { registerServiceBuilder, resetServiceForTesting, } from '../../../../src/service-helpers'; import {toggleExperiment} from '#experiments'; import {user} from '../../../../src/log'; -import {whenCalled} from '../../../../testing/test-helper.js'; +import {whenCalled} from '#testing/test-helper.js'; describes.realWin( 'consent-ui', diff --git a/extensions/amp-consent/0.1/test/test-linker-reader.js b/extensions/amp-consent/0.1/test/test-linker-reader.js index 9f2dfbb5eb32f..0f8a48ca898c1 100644 --- a/extensions/amp-consent/0.1/test/test-linker-reader.js +++ b/extensions/amp-consent/0.1/test/test-linker-reader.js @@ -15,7 +15,7 @@ */ import {ConsentLinkerReader} from '../linker-reader'; -import {mockWindowInterface} from '../../../../testing/test-helper'; +import {mockWindowInterface} from '#testing/test-helper'; describes.realWin('LinkerReader', {amp: true}, (env) => { let linkerReader; diff --git a/extensions/amp-consent/0.1/test/test-linker.js b/extensions/amp-consent/0.1/test/test-linker.js index 700b78784a6b8..1f4d6a63b3f6d 100644 --- a/extensions/amp-consent/0.1/test/test-linker.js +++ b/extensions/amp-consent/0.1/test/test-linker.js @@ -15,7 +15,7 @@ */ import {createLinker, parseLinker} from '../linker'; -import {mockWindowInterface} from '../../../../testing/test-helper'; +import {mockWindowInterface} from '#testing/test-helper'; const TAG = '[amp-consent/linker]'; diff --git a/extensions/amp-consent/0.1/test/test-tcf-api-command-manager.js b/extensions/amp-consent/0.1/test/test-tcf-api-command-manager.js index 082a2a9773c2f..dea7d5a5d78bd 100644 --- a/extensions/amp-consent/0.1/test/test-tcf-api-command-manager.js +++ b/extensions/amp-consent/0.1/test/test-tcf-api-command-manager.js @@ -15,8 +15,8 @@ */ import {TcfApiCommandManager} from '../tcf-api-command-manager'; -import {macroTask} from '../../../../testing/yield'; -import {mockWindowInterface} from '../../../../testing/test-helper'; +import {macroTask} from '#testing/yield'; +import {mockWindowInterface} from '#testing/test-helper'; import {user} from '../../../../src/log'; describes.realWin( diff --git a/extensions/amp-date-countdown/1.0/test/test-amp-date-countdown.js b/extensions/amp-date-countdown/1.0/test/test-amp-date-countdown.js index 467cc04f3d7c5..fc8c91124254a 100644 --- a/extensions/amp-date-countdown/1.0/test/test-amp-date-countdown.js +++ b/extensions/amp-date-countdown/1.0/test/test-amp-date-countdown.js @@ -16,7 +16,7 @@ import '../../../amp-mustache/0.2/amp-mustache'; import '../amp-date-countdown'; -import {waitFor} from '../../../../testing/test-helper.js'; +import {waitFor} from '#testing/test-helper.js'; import {whenUpgradedToCustomElement} from '../../../../src/amp-element-helpers'; describes.realWin( diff --git a/extensions/amp-date-display/1.0/test/test-amp-date-display.js b/extensions/amp-date-display/1.0/test/test-amp-date-display.js index 1480e1372efb7..2278d7a271a3a 100644 --- a/extensions/amp-date-display/1.0/test/test-amp-date-display.js +++ b/extensions/amp-date-display/1.0/test/test-amp-date-display.js @@ -18,7 +18,7 @@ import '../../../amp-mustache/0.2/amp-mustache'; import '../amp-date-display'; import {expect} from 'chai'; import {user} from '../../../../src/log'; -import {waitFor} from '../../../../testing/test-helper.js'; +import {waitFor} from '#testing/test-helper.js'; import {whenUpgradedToCustomElement} from '../../../../src/amp-element-helpers'; describes.realWin( diff --git a/extensions/amp-date-picker/0.1/test/integration/test-integration-amp-date-picker-actions.js b/extensions/amp-date-picker/0.1/test/integration/test-integration-amp-date-picker-actions.js index 21b587831367a..ee236b797d301 100644 --- a/extensions/amp-date-picker/0.1/test/integration/test-integration-amp-date-picker-actions.js +++ b/extensions/amp-date-picker/0.1/test/integration/test-integration-amp-date-picker-actions.js @@ -15,7 +15,7 @@ */ import * as fakeTimers from '@sinonjs/fake-timers'; -import {poll} from '../../../../../testing/iframe'; +import {poll} from '#testing/iframe'; const config = describes.sandboxed.configure().ifChrome(); config.skip('amp-date-picker', {}, function () { diff --git a/extensions/amp-date-picker/0.1/test/integration/test-integration-amp-date-picker-init.js b/extensions/amp-date-picker/0.1/test/integration/test-integration-amp-date-picker-init.js index 5ea813910f049..207f5eb13a6ba 100644 --- a/extensions/amp-date-picker/0.1/test/integration/test-integration-amp-date-picker-init.js +++ b/extensions/amp-date-picker/0.1/test/integration/test-integration-amp-date-picker-init.js @@ -15,7 +15,7 @@ */ import {AmpEvents} from '#core/constants/amp-events.js'; -import {createFixtureIframe} from '../../../../../testing/iframe.js'; +import {createFixtureIframe} from '#testing/iframe.js'; function checkElementUpgrade(element) { expect(element).to.have.class('i-amphtml-element'); diff --git a/extensions/amp-date-picker/0.1/test/integration/test-integration-dates-attributes.js b/extensions/amp-date-picker/0.1/test/integration/test-integration-dates-attributes.js index a95d86f64a60e..5fa920d27e5be 100644 --- a/extensions/amp-date-picker/0.1/test/integration/test-integration-dates-attributes.js +++ b/extensions/amp-date-picker/0.1/test/integration/test-integration-dates-attributes.js @@ -16,7 +16,7 @@ import * as fakeTimers from '@sinonjs/fake-timers'; import {htmlFor} from '#core/dom/static-template'; -import {poll} from '../../../../../testing/iframe'; +import {poll} from '#testing/iframe'; const config = describes.sandboxed.configure().ifChrome(); diff --git a/extensions/amp-date-picker/0.1/test/integration/test-integration-maximum-nights.js b/extensions/amp-date-picker/0.1/test/integration/test-integration-maximum-nights.js index febc3f5faa1bc..32af28112b4ae 100644 --- a/extensions/amp-date-picker/0.1/test/integration/test-integration-maximum-nights.js +++ b/extensions/amp-date-picker/0.1/test/integration/test-integration-maximum-nights.js @@ -16,7 +16,7 @@ import * as fakeTimers from '@sinonjs/fake-timers'; import {htmlFor} from '#core/dom/static-template'; -import {poll} from '../../../../../testing/iframe'; +import {poll} from '#testing/iframe'; const config = describes.sandboxed.configure().ifChrome(); diff --git a/extensions/amp-facebook-comments/0.1/test/test-amp-facebook-comments.js b/extensions/amp-facebook-comments/0.1/test/test-amp-facebook-comments.js index 4723edbb94d8c..1a0422319e7b4 100644 --- a/extensions/amp-facebook-comments/0.1/test/test-amp-facebook-comments.js +++ b/extensions/amp-facebook-comments/0.1/test/test-amp-facebook-comments.js @@ -16,7 +16,7 @@ import '../amp-facebook-comments'; import {createElementWithAttributes} from '#core/dom'; -import {doNotLoadExternalResourcesInTest} from '../../../../testing/iframe'; +import {doNotLoadExternalResourcesInTest} from '#testing/iframe'; import {resetServiceForTesting} from '../../../../src/service-helpers'; import {serializeMessage} from '../../../../src/3p-frame-messaging'; import {setDefaultBootstrapBaseUrlForTesting} from '../../../../src/3p-frame'; diff --git a/extensions/amp-facebook-comments/1.0/test/test-amp-facebook-comments.js b/extensions/amp-facebook-comments/1.0/test/test-amp-facebook-comments.js index 02e04f4e933ec..182a97a4c16da 100644 --- a/extensions/amp-facebook-comments/1.0/test/test-amp-facebook-comments.js +++ b/extensions/amp-facebook-comments/1.0/test/test-amp-facebook-comments.js @@ -16,12 +16,12 @@ import '../amp-facebook-comments'; import {createElementWithAttributes} from '#core/dom'; -import {doNotLoadExternalResourcesInTest} from '../../../../testing/iframe'; +import {doNotLoadExternalResourcesInTest} from '#testing/iframe'; import {resetServiceForTesting} from '../../../../src/service-helpers'; import {serializeMessage} from '../../../../src/3p-frame-messaging'; import {setDefaultBootstrapBaseUrlForTesting} from '../../../../src/3p-frame'; import {toggleExperiment} from '#experiments'; -import {waitFor} from '../../../../testing/test-helper'; +import {waitFor} from '#testing/test-helper'; describes.realWin( 'amp-facebook-comments', diff --git a/extensions/amp-facebook-like/1.0/test/test-amp-facebook-like.js b/extensions/amp-facebook-like/1.0/test/test-amp-facebook-like.js index 4c57bfa596dd0..9abf150ea27d4 100644 --- a/extensions/amp-facebook-like/1.0/test/test-amp-facebook-like.js +++ b/extensions/amp-facebook-like/1.0/test/test-amp-facebook-like.js @@ -16,12 +16,12 @@ import '../amp-facebook-like'; import {createElementWithAttributes} from '#core/dom'; -import {doNotLoadExternalResourcesInTest} from '../../../../testing/iframe'; +import {doNotLoadExternalResourcesInTest} from '#testing/iframe'; import {resetServiceForTesting} from '../../../../src/service-helpers'; import {serializeMessage} from '../../../../src/3p-frame-messaging'; import {setDefaultBootstrapBaseUrlForTesting} from '../../../../src/3p-frame'; import {toggleExperiment} from '#experiments'; -import {waitFor} from '../../../../testing/test-helper'; +import {waitFor} from '#testing/test-helper'; describes.realWin( 'amp-facebook-like', diff --git a/extensions/amp-facebook/1.0/test/test-amp-facebook.js b/extensions/amp-facebook/1.0/test/test-amp-facebook.js index 103bf25ebdc23..13d35a272ea5c 100644 --- a/extensions/amp-facebook/1.0/test/test-amp-facebook.js +++ b/extensions/amp-facebook/1.0/test/test-amp-facebook.js @@ -16,13 +16,13 @@ import '../amp-facebook'; import {createElementWithAttributes} from '#core/dom'; -import {doNotLoadExternalResourcesInTest} from '../../../../testing/iframe'; +import {doNotLoadExternalResourcesInTest} from '#testing/iframe'; import {facebook} from '#3p/facebook'; import {resetServiceForTesting} from '../../../../src/service-helpers'; import {serializeMessage} from '../../../../src/3p-frame-messaging'; import {setDefaultBootstrapBaseUrlForTesting} from '../../../../src/3p-frame'; import {toggleExperiment} from '#experiments'; -import {waitFor} from '../../../../testing/test-helper'; +import {waitFor} from '#testing/test-helper'; describes.realWin( 'amp-facebook', diff --git a/extensions/amp-facebook/1.0/test/test-component.js b/extensions/amp-facebook/1.0/test/test-component.js index 57f7b1dbbf1a5..01e48e07109d6 100644 --- a/extensions/amp-facebook/1.0/test/test-component.js +++ b/extensions/amp-facebook/1.0/test/test-component.js @@ -20,7 +20,7 @@ import {WithAmpContext} from '#preact/context'; import {createRef} from '#preact'; import {mount} from 'enzyme'; import {serializeMessage} from '../../../../src/3p-frame-messaging'; -import {waitFor} from '../../../../testing/test-helper'; +import {waitFor} from '#testing/test-helper'; describes.sandboxed('Facebook preact component', {}, (env) => { const href = diff --git a/extensions/amp-fit-text/1.0/test/test-amp-fit-text.js b/extensions/amp-fit-text/1.0/test/test-amp-fit-text.js index c6a91eb031a4a..3b780825c909b 100644 --- a/extensions/amp-fit-text/1.0/test/test-amp-fit-text.js +++ b/extensions/amp-fit-text/1.0/test/test-amp-fit-text.js @@ -20,7 +20,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/test-helper'; describes.realWin( 'amp-fit-text component', diff --git a/extensions/amp-fit-text/1.0/test/test-component.js b/extensions/amp-fit-text/1.0/test/test-component.js index 821ff734ad736..0d0bde05e572c 100644 --- a/extensions/amp-fit-text/1.0/test/test-component.js +++ b/extensions/amp-fit-text/1.0/test/test-component.js @@ -19,7 +19,7 @@ import {FitText, 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/test-helper'; describes.realWin('FitText preact component v1.0', {}, (env) => { let win; diff --git a/extensions/amp-form/0.1/test/integration/test-integration-form-verifiers.js b/extensions/amp-form/0.1/test/integration/test-integration-form-verifiers.js index bc2bfdcdcdf5a..9c925cef3d643 100644 --- a/extensions/amp-form/0.1/test/integration/test-integration-form-verifiers.js +++ b/extensions/amp-form/0.1/test/integration/test-integration-form-verifiers.js @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {poll} from '../../../../../testing/iframe'; +import {poll} from '#testing/iframe'; const RENDER_TIMEOUT = 15000; diff --git a/extensions/amp-form/0.1/test/integration/test-integration-form.js b/extensions/amp-form/0.1/test/integration/test-integration-form.js index ef9a195f2a68a..0ad40db56f580 100644 --- a/extensions/amp-form/0.1/test/integration/test-integration-form.js +++ b/extensions/amp-form/0.1/test/integration/test-integration-form.js @@ -20,7 +20,7 @@ import {AmpMustache} from '../../../../amp-mustache/0.1/amp-mustache'; import {Services} from '#service'; import {installGlobalSubmitListenerForDoc} from '../../../../../src/document-submit'; import {listenOncePromise} from '../../../../../src/event-helper'; -import {poll} from '../../../../../testing/iframe'; +import {poll} from '#testing/iframe'; import {registerExtendedTemplateForDoc} from '#service/template-impl'; import {stubElementsForDoc} from '#service/custom-element-registry'; diff --git a/extensions/amp-form/0.1/test/test-amp-form.js b/extensions/amp-form/0.1/test/test-amp-form.js index 90da61cdbed5b..7cd37351789ee 100644 --- a/extensions/amp-form/0.1/test/test-amp-form.js +++ b/extensions/amp-form/0.1/test/test-amp-form.js @@ -45,7 +45,7 @@ import { setReportValiditySupportedForTesting, } from '../form-validators'; import {user} from '../../../../src/log'; -import {whenCalled} from '../../../../testing/test-helper.js'; +import {whenCalled} from '#testing/test-helper.js'; describes.repeated( '', diff --git a/extensions/amp-iframe/0.1/test/test-amp-iframe.js b/extensions/amp-iframe/0.1/test/test-amp-iframe.js index 54f62895bce0d..3545128e7c80b 100644 --- a/extensions/amp-iframe/0.1/test/test-amp-iframe.js +++ b/extensions/amp-iframe/0.1/test/test-amp-iframe.js @@ -22,10 +22,10 @@ import {Services} from '#service'; import {createElementWithAttributes} from '#core/dom'; import {whenUpgradedToCustomElement} from '../../../../src/amp-element-helpers'; -import {installResizeObserverStub} from '../../../../testing/resize-observer-stub'; +import {installResizeObserverStub} from '#testing/resize-observer-stub'; import {isAdLike} from '../../../../src/iframe-helper'; -import {macroTask} from '../../../../testing/yield'; -import {poll} from '../../../../testing/iframe'; +import {macroTask} from '#testing/yield'; +import {poll} from '#testing/iframe'; import {toggleExperiment} from '#experiments'; import {user} from '../../../../src/log'; diff --git a/extensions/amp-ima-video/0.1/test/test-amp-ima-video.js b/extensions/amp-ima-video/0.1/test/test-amp-ima-video.js index caad823975793..d108cf22d2bf5 100644 --- a/extensions/amp-ima-video/0.1/test/test-amp-ima-video.js +++ b/extensions/amp-ima-video/0.1/test/test-amp-ima-video.js @@ -16,7 +16,7 @@ import '../amp-ima-video'; import {htmlFor} from '#core/dom/static-template'; -import {installResizeObserverStub} from '../../../../testing/resize-observer-stub'; +import {installResizeObserverStub} from '#testing/resize-observer-stub'; import {waitForChildPromise} from '#core/dom'; describes.realWin( diff --git a/extensions/amp-image-lightbox/0.1/test/integration/test-amp-image-lightbox.js b/extensions/amp-image-lightbox/0.1/test/integration/test-amp-image-lightbox.js index c4213ccdb3020..ef7b47b105a96 100644 --- a/extensions/amp-image-lightbox/0.1/test/integration/test-amp-image-lightbox.js +++ b/extensions/amp-image-lightbox/0.1/test/integration/test-amp-image-lightbox.js @@ -14,7 +14,7 @@ * limitations under the License. */ -import {poll} from '../../../../../testing/iframe'; +import {poll} from '#testing/iframe'; describes.sandboxed .configure() diff --git a/extensions/amp-image-slider/0.1/test/integration/test-amp-image-slider.js b/extensions/amp-image-slider/0.1/test/integration/test-amp-image-slider.js index 7afec4dc61bd4..fac0dd2ec4b3d 100644 --- a/extensions/amp-image-slider/0.1/test/integration/test-amp-image-slider.js +++ b/extensions/amp-image-slider/0.1/test/integration/test-amp-image-slider.js @@ -14,7 +14,7 @@ * limitations under the License. */ -import {createPointerEvent} from '../../../../../testing/test-helper'; +import {createPointerEvent} from '#testing/test-helper'; const t = describes.sandboxed.configure().ifChrome(); diff --git a/extensions/amp-inline-gallery/1.0/test/test-amp-inline-gallery.js b/extensions/amp-inline-gallery/1.0/test/test-amp-inline-gallery.js index 1575809421c63..58675574081fb 100644 --- a/extensions/amp-inline-gallery/1.0/test/test-amp-inline-gallery.js +++ b/extensions/amp-inline-gallery/1.0/test/test-amp-inline-gallery.js @@ -22,7 +22,7 @@ import {createElementWithAttributes} from '#core/dom'; import {setStyles} from '#core/dom/style'; import {subscribe} from '../../../../src/context'; import {toggleExperiment} from '#experiments'; -import {waitFor} from '../../../../testing/test-helper'; +import {waitFor} from '#testing/test-helper'; describes.realWin( 'amp-inline-gallery', diff --git a/extensions/amp-inputmask/0.1/test/integration/test-integration-amp-inputmask.js b/extensions/amp-inputmask/0.1/test/integration/test-integration-amp-inputmask.js index c0ece94295a48..0187992b1abe9 100644 --- a/extensions/amp-inputmask/0.1/test/integration/test-integration-amp-inputmask.js +++ b/extensions/amp-inputmask/0.1/test/integration/test-integration-amp-inputmask.js @@ -14,7 +14,7 @@ * limitations under the License. */ -import {poll} from '../../../../../testing/iframe'; +import {poll} from '#testing/iframe'; import {simulateKeyboardInteraction} from './utils'; const config = describes.sandboxed.configure().ifChrome(); diff --git a/extensions/amp-instagram/1.0/test/test-amp-instagram.js b/extensions/amp-instagram/1.0/test/test-amp-instagram.js index 3d16828ab0696..9d2003784c7ce 100644 --- a/extensions/amp-instagram/1.0/test/test-amp-instagram.js +++ b/extensions/amp-instagram/1.0/test/test-amp-instagram.js @@ -16,9 +16,9 @@ import '../amp-instagram'; import {createElementWithAttributes} from '#core/dom'; -import {doNotLoadExternalResourcesInTest} from '../../../../testing/iframe'; +import {doNotLoadExternalResourcesInTest} from '#testing/iframe'; import {toggleExperiment} from '#experiments'; -import {waitFor} from '../../../../testing/test-helper'; +import {waitFor} from '#testing/test-helper'; describes.realWin( 'amp-instagram-v1.0', diff --git a/extensions/amp-instagram/1.0/test/test-component.js b/extensions/amp-instagram/1.0/test/test-component.js index a94886e92e10c..391da7c68ffc8 100644 --- a/extensions/amp-instagram/1.0/test/test-component.js +++ b/extensions/amp-instagram/1.0/test/test-component.js @@ -19,7 +19,7 @@ import {Instagram} from '../component'; import {WithAmpContext} from '#preact/context'; import {createRef} from '#preact'; import {mount} from 'enzyme'; -import {waitFor} from '../../../../testing/test-helper'; +import {waitFor} from '#testing/test-helper'; describes.sandboxed('Instagram preact component v1.0', {}, (env) => { it('Normal render', () => { diff --git a/extensions/amp-lightbox-gallery/0.1/test/integration/test-amp-lightbox-gallery.js b/extensions/amp-lightbox-gallery/0.1/test/integration/test-amp-lightbox-gallery.js index 683dce9cb1874..ec39b915c92b1 100644 --- a/extensions/amp-lightbox-gallery/0.1/test/integration/test-amp-lightbox-gallery.js +++ b/extensions/amp-lightbox-gallery/0.1/test/integration/test-amp-lightbox-gallery.js @@ -15,7 +15,7 @@ */ import * as analytics from '../../../../../src/analytics'; -import {poll} from '../../../../../testing/iframe'; +import {poll} from '#testing/iframe'; // TODO(cathyxz, #16822): This suite is flaky. describes.sandboxed.configure().skip('amp-lightbox-gallery', function () { diff --git a/extensions/amp-lightbox/0.1/test/test-amp-lightbox.js b/extensions/amp-lightbox/0.1/test/test-amp-lightbox.js index dea418757076f..41e3d88262e25 100644 --- a/extensions/amp-lightbox/0.1/test/test-amp-lightbox.js +++ b/extensions/amp-lightbox/0.1/test/test-amp-lightbox.js @@ -20,7 +20,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.js'; +import {whenCalled} from '#testing/test-helper.js'; import {whenUpgradedToCustomElement} from '../../../../src/amp-element-helpers'; describes.realWin( diff --git a/extensions/amp-lightbox/1.0/test/test-amp-lightbox.js b/extensions/amp-lightbox/1.0/test/test-amp-lightbox.js index 24542fd092fb2..e94b5595a0e93 100644 --- a/extensions/amp-lightbox/1.0/test/test-amp-lightbox.js +++ b/extensions/amp-lightbox/1.0/test/test-amp-lightbox.js @@ -17,9 +17,9 @@ import '../amp-lightbox'; import {ActionInvocation} from '#service/action-impl'; import {ActionTrust, DEFAULT_ACTION} from '#core/constants/action-constants'; import {htmlFor} from '#core/dom/static-template'; -import {poll} from '../../../../testing/iframe'; +import {poll} from '#testing/iframe'; import {toggleExperiment} from '#experiments'; -import {whenCalled} from '../../../../testing/test-helper'; +import {whenCalled} from '#testing/test-helper'; describes.realWin( 'amp-lightbox:1.0', diff --git a/extensions/amp-list/0.1/test/integration/test-amp-list.js b/extensions/amp-list/0.1/test/integration/test-amp-list.js index 440403466d535..d04e8fb491671 100644 --- a/extensions/amp-list/0.1/test/integration/test-amp-list.js +++ b/extensions/amp-list/0.1/test/integration/test-amp-list.js @@ -14,7 +14,7 @@ * limitations under the License. */ -import {BrowserController} from '../../../../../testing/test-helper'; +import {BrowserController} from '#testing/test-helper'; const TIMEOUT = 15000; diff --git a/extensions/amp-list/0.1/test/test-amp-list-container.js b/extensions/amp-list/0.1/test/test-amp-list-container.js index 098353917193a..463f09705f490 100644 --- a/extensions/amp-list/0.1/test/test-amp-list-container.js +++ b/extensions/amp-list/0.1/test/test-amp-list-container.js @@ -21,7 +21,7 @@ import { measureElementStub, measureMutateElementStub, mutateElementStub, -} from '../../../../testing/test-helper'; +} from '#testing/test-helper'; describes.realWin( 'amp-list layout container', diff --git a/extensions/amp-list/0.1/test/test-amp-list-load-more.js b/extensions/amp-list/0.1/test/test-amp-list-load-more.js index 8c631acb0f216..a53011d2a86b4 100644 --- a/extensions/amp-list/0.1/test/test-amp-list-load-more.js +++ b/extensions/amp-list/0.1/test/test-amp-list-load-more.js @@ -21,7 +21,7 @@ import { measureElementStub, measureMutateElementStub, mutateElementStub, -} from '../../../../testing/test-helper'; +} from '#testing/test-helper'; import {toggleExperiment} from '#experiments'; const HAS_MORE_ITEMS_PAYLOAD = { diff --git a/extensions/amp-next-page/0.1/test/test-amp-next-page.js b/extensions/amp-next-page/0.1/test/test-amp-next-page.js index 2a83a08d909f3..5914b6afc81b2 100644 --- a/extensions/amp-next-page/0.1/test/test-amp-next-page.js +++ b/extensions/amp-next-page/0.1/test/test-amp-next-page.js @@ -19,7 +19,7 @@ import {Services} from '#service'; import {VisibilityState} from '#core/constants/visibility-state'; import {getServicePromiseForDoc} from '../../../../src/service-helpers'; import {layoutRectLtwh} from '#core/math/layout-rect'; -import {macroTask} from '../../../../testing/yield'; +import {macroTask} from '#testing/yield'; import {setStyle} from '#core/dom/style'; import {toggleExperiment} from '#experiments'; diff --git a/extensions/amp-onetap-google/0.1/test/test-amp-onetap-google.js b/extensions/amp-onetap-google/0.1/test/test-amp-onetap-google.js index aff6575f7c602..29d552fe52939 100644 --- a/extensions/amp-onetap-google/0.1/test/test-amp-onetap-google.js +++ b/extensions/amp-onetap-google/0.1/test/test-amp-onetap-google.js @@ -21,7 +21,7 @@ import {BaseElement} from '../../../../src/base-element'; import {Services} from '#service'; import {createElementWithAttributes, waitForChild} from '#core/dom'; import {loadPromise} from '../../../../src/event-helper'; -import {macroTask} from '../../../../testing/yield'; +import {macroTask} from '#testing/yield'; import {user} from '../../../../src/log'; const TAG = 'amp-onetap-google'; diff --git a/extensions/amp-pan-zoom/0.1/test/integration/test-amp-pan-zoom.js b/extensions/amp-pan-zoom/0.1/test/integration/test-amp-pan-zoom.js index fe34abb49624f..a926b3b66e139 100644 --- a/extensions/amp-pan-zoom/0.1/test/integration/test-amp-pan-zoom.js +++ b/extensions/amp-pan-zoom/0.1/test/integration/test-amp-pan-zoom.js @@ -15,7 +15,7 @@ */ import {AmpEvents} from '#core/constants/amp-events'; -import {createFixtureIframe} from '../../../../../testing/iframe'; +import {createFixtureIframe} from '#testing/iframe'; import {toggleExperiment} from '#experiments'; describes.sandboxed diff --git a/extensions/amp-pan-zoom/0.1/test/test-amp-pan-zoom.js b/extensions/amp-pan-zoom/0.1/test/test-amp-pan-zoom.js index 08020eb794302..c1b410398f673 100644 --- a/extensions/amp-pan-zoom/0.1/test/test-amp-pan-zoom.js +++ b/extensions/amp-pan-zoom/0.1/test/test-amp-pan-zoom.js @@ -16,7 +16,7 @@ import '../amp-pan-zoom'; import {Services} from '#service'; -import {createPointerEvent} from '../../../../testing/test-helper'; +import {createPointerEvent} from '#testing/test-helper'; import {htmlFor} from '#core/dom/static-template'; import {listenOncePromise} from '../../../../src/event-helper'; import {setStyles} from '#core/dom/style'; diff --git a/extensions/amp-render/1.0/test/test-amp-render.js b/extensions/amp-render/1.0/test/test-amp-render.js index b0b3cbe007c98..fd031cf30f4b3 100644 --- a/extensions/amp-render/1.0/test/test-amp-render.js +++ b/extensions/amp-render/1.0/test/test-amp-render.js @@ -24,7 +24,7 @@ import {ActionTrust} from '#core/constants/action-constants'; import {Services} from '#service'; import {htmlFor} from '#core/dom/static-template'; import {toggleExperiment} from '#experiments'; -import {waitFor} from '../../../../testing/test-helper'; +import {waitFor} from '#testing/test-helper'; import {whenUpgradedToCustomElement} from '../../../../src/amp-element-helpers'; describes.realWin( diff --git a/extensions/amp-render/1.0/test/test-component.js b/extensions/amp-render/1.0/test/test-component.js index 38d6949f22951..8a7258e3e9a08 100644 --- a/extensions/amp-render/1.0/test/test-component.js +++ b/extensions/amp-render/1.0/test/test-component.js @@ -16,7 +16,7 @@ import * as Preact from '#preact'; import {Render} from '../component'; -import {macroTask} from '../../../../testing/yield'; +import {macroTask} from '#testing/yield'; import {mount} from 'enzyme'; describes.sandboxed('Render 1.0 preact component', {}, () => { diff --git a/extensions/amp-script/0.1/test/integration/test-amp-script.js b/extensions/amp-script/0.1/test/integration/test-amp-script.js index 4620ed8ea4b1e..56dc75077ff00 100644 --- a/extensions/amp-script/0.1/test/integration/test-amp-script.js +++ b/extensions/amp-script/0.1/test/integration/test-amp-script.js @@ -14,8 +14,8 @@ * limitations under the License. */ -import {BrowserController} from '../../../../../testing/test-helper'; -import {poll as classicPoll} from '../../../../../testing/iframe'; +import {BrowserController} from '#testing/test-helper'; +import {poll as classicPoll} from '#testing/iframe'; const TIMEOUT = 10000; diff --git a/extensions/amp-script/0.1/test/unit/test-amp-script.js b/extensions/amp-script/0.1/test/unit/test-amp-script.js index 68cf8855cdc61..2ba0cf22130a6 100644 --- a/extensions/amp-script/0.1/test/unit/test-amp-script.js +++ b/extensions/amp-script/0.1/test/unit/test-amp-script.js @@ -21,7 +21,7 @@ import { SanitizerImpl, StorageLocation, } from '../../amp-script'; -import {FakeWindow} from '../../../../../testing/fake-dom'; +import {FakeWindow} from '#testing/fake-dom'; import {Services} from '#service'; import { registerServiceBuilderForDoc, diff --git a/extensions/amp-selector/1.0/test/test-amp-selector.js b/extensions/amp-selector/1.0/test/test-amp-selector.js index ef7b77e6fda70..aac9ed0b908d1 100644 --- a/extensions/amp-selector/1.0/test/test-amp-selector.js +++ b/extensions/amp-selector/1.0/test/test-amp-selector.js @@ -18,7 +18,7 @@ import {ActionInvocation} from '#service/action-impl'; import {ActionTrust} from '#core/constants/action-constants'; import {htmlFor} from '#core/dom/static-template'; import {toggleExperiment} from '#experiments'; -import {waitFor} from '../../../../testing/test-helper'; +import {waitFor} from '#testing/test-helper'; describes.realWin( 'amp-selector:1.0', diff --git a/extensions/amp-sidebar/0.1/test/integration/test-amp-sidebar.js b/extensions/amp-sidebar/0.1/test/integration/test-amp-sidebar.js index b3eab341cce72..1ca14cf6736d3 100644 --- a/extensions/amp-sidebar/0.1/test/integration/test-amp-sidebar.js +++ b/extensions/amp-sidebar/0.1/test/integration/test-amp-sidebar.js @@ -14,7 +14,7 @@ * limitations under the License. */ -import {poll} from '../../../../../testing/iframe'; +import {poll} from '#testing/iframe'; describes.sandboxed .configure() diff --git a/extensions/amp-sidebar/0.1/test/test-amp-sidebar.js b/extensions/amp-sidebar/0.1/test/test-amp-sidebar.js index 20b54754ace6a..2c7b58409aa57 100644 --- a/extensions/amp-sidebar/0.1/test/test-amp-sidebar.js +++ b/extensions/amp-sidebar/0.1/test/test-amp-sidebar.js @@ -20,7 +20,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 {assertScreenReaderElement} from '../../../../testing/test-helper'; +import {assertScreenReaderElement} from '#testing/test-helper'; import {clearModalStack, getModalStackLength} from '../../../../src/modal'; import {createElementWithAttributes} from '#core/dom'; import {whenUpgradedToCustomElement} from '../../../../src/amp-element-helpers'; diff --git a/extensions/amp-sidebar/0.1/test/test-toolbar.js b/extensions/amp-sidebar/0.1/test/test-toolbar.js index 884c38be78282..56e049197182d 100644 --- a/extensions/amp-sidebar/0.1/test/test-toolbar.js +++ b/extensions/amp-sidebar/0.1/test/test-toolbar.js @@ -18,7 +18,7 @@ import {AmpDocSingle} from '#service/ampdoc-impl'; import {Services} from '#service'; import {Toolbar} from '../toolbar'; import {adopt} from '../../../../src/runtime'; -import {createIframePromise} from '../../../../testing/iframe'; +import {createIframePromise} from '#testing/iframe'; import {toArray} from '#core/types/array'; adopt(window); diff --git a/extensions/amp-sidebar/0.2/test/integration/test-amp-sidebar.js b/extensions/amp-sidebar/0.2/test/integration/test-amp-sidebar.js index b3eab341cce72..1ca14cf6736d3 100644 --- a/extensions/amp-sidebar/0.2/test/integration/test-amp-sidebar.js +++ b/extensions/amp-sidebar/0.2/test/integration/test-amp-sidebar.js @@ -14,7 +14,7 @@ * limitations under the License. */ -import {poll} from '../../../../../testing/iframe'; +import {poll} from '#testing/iframe'; describes.sandboxed .configure() diff --git a/extensions/amp-sidebar/0.2/test/test-amp-sidebar.js b/extensions/amp-sidebar/0.2/test/test-amp-sidebar.js index 98437f37887f2..c4b2af390ceb9 100644 --- a/extensions/amp-sidebar/0.2/test/test-amp-sidebar.js +++ b/extensions/amp-sidebar/0.2/test/test-amp-sidebar.js @@ -19,7 +19,7 @@ import * as fakeTimers from '@sinonjs/fake-timers'; import {ActionTrust} from '#core/constants/action-constants'; import {Keys} from '#core/constants/key-codes'; import {Services} from '#service'; -import {assertScreenReaderElement} from '../../../../testing/test-helper'; +import {assertScreenReaderElement} from '#testing/test-helper'; import {clearModalStack, getModalStackLength} from '../../../../src/modal'; import {createElementWithAttributes} from '#core/dom'; import {toggleExperiment} from '#experiments'; diff --git a/extensions/amp-sidebar/0.2/test/test-toolbar.js b/extensions/amp-sidebar/0.2/test/test-toolbar.js index b7b85fdb4bf12..ea1a8a0e113b7 100644 --- a/extensions/amp-sidebar/0.2/test/test-toolbar.js +++ b/extensions/amp-sidebar/0.2/test/test-toolbar.js @@ -17,7 +17,7 @@ import {AmpDocSingle} from '#service/ampdoc-impl'; import {Services} from '#service'; import {Toolbar} from '../toolbar'; -import {createIframePromise} from '../../../../testing/iframe'; +import {createIframePromise} from '#testing/iframe'; import {toArray} from '#core/types/array'; describes.realWin('amp-sidebar - toolbar', {}, (env) => { diff --git a/extensions/amp-sidebar/1.0/test/test-amp-sidebar.js b/extensions/amp-sidebar/1.0/test/test-amp-sidebar.js index 49aa85b49fafe..01e49473b3826 100644 --- a/extensions/amp-sidebar/1.0/test/test-amp-sidebar.js +++ b/extensions/amp-sidebar/1.0/test/test-amp-sidebar.js @@ -19,7 +19,7 @@ import {ActionTrust} from '#core/constants/action-constants'; import {createElementWithAttributes} from '#core/dom'; import {htmlFor} from '#core/dom/static-template'; import {toggleExperiment} from '#experiments'; -import {waitFor, whenCalled} from '../../../../testing/test-helper'; +import {waitFor, whenCalled} from '#testing/test-helper'; describes.realWin( 'amp-sidebar:1.0', diff --git a/extensions/amp-social-share/1.0/test/test-amp-social-share.js b/extensions/amp-social-share/1.0/test/test-amp-social-share.js index e64b1a9129ebe..85836a75fd0a7 100644 --- a/extensions/amp-social-share/1.0/test/test-amp-social-share.js +++ b/extensions/amp-social-share/1.0/test/test-amp-social-share.js @@ -16,7 +16,7 @@ import '../amp-social-share'; import {toggleExperiment} from '#experiments'; -import {waitFor, whenCalled} from '../../../../testing/test-helper.js'; +import {waitFor, whenCalled} from '#testing/test-helper.js'; import {waitForChildPromise} from '#core/dom'; const BUTTON_SELECTOR = 'div[role="button"]'; diff --git a/extensions/amp-sticky-ad/1.0/test/test-amp-sticky-ad.js b/extensions/amp-sticky-ad/1.0/test/test-amp-sticky-ad.js index e4528b1f11b54..78a34efea16a3 100644 --- a/extensions/amp-sticky-ad/1.0/test/test-amp-sticky-ad.js +++ b/extensions/amp-sticky-ad/1.0/test/test-amp-sticky-ad.js @@ -18,8 +18,8 @@ import '../../../amp-ad/0.1/amp-ad'; import '../amp-sticky-ad'; import {Services} from '#service'; import {createElementWithAttributes} from '#core/dom'; -import {macroTask} from '../../../../testing/yield'; -import {poll} from '../../../../testing/iframe'; +import {macroTask} from '#testing/yield'; +import {poll} from '#testing/iframe'; describes.realWin( 'amp-sticky-ad 1.0 version', diff --git a/extensions/amp-story-auto-ads/0.1/test/test-algorithm-count-pages.js b/extensions/amp-story-auto-ads/0.1/test/test-algorithm-count-pages.js index e029147e850b2..e567dd046711e 100644 --- a/extensions/amp-story-auto-ads/0.1/test/test-algorithm-count-pages.js +++ b/extensions/amp-story-auto-ads/0.1/test/test-algorithm-count-pages.js @@ -21,7 +21,7 @@ import { import {AmpStory} from '../../../amp-story/1.0/amp-story'; import {CountPagesAlgorithm} from '../algorithm-count-pages'; import {InsertionState, StoryAdPageManager} from '../story-ad-page-manager'; -import {macroTask} from '../../../../testing/yield'; +import {macroTask} from '#testing/yield'; describes.realWin('CountPagesAlgorithm', {amp: true}, (env) => { let storeService; diff --git a/extensions/amp-story-auto-ads/0.1/test/test-amp-story-auto-ads.js b/extensions/amp-story-auto-ads/0.1/test/test-amp-story-auto-ads.js index 738cc4cfac527..1c8a4da22b03d 100644 --- a/extensions/amp-story-auto-ads/0.1/test/test-amp-story-auto-ads.js +++ b/extensions/amp-story-auto-ads/0.1/test/test-amp-story-auto-ads.js @@ -32,7 +32,7 @@ import { import {NavigationDirection} from '../../../amp-story/1.0/amp-story-page'; import {Services} from '#service'; import {StoryAdPage} from '../story-ad-page'; -import {macroTask} from '../../../../testing/yield'; +import {macroTask} from '#testing/yield'; import {registerServiceBuilder} from '../../../../src/service-helpers'; import {toggleExperiment} from '#experiments'; diff --git a/extensions/amp-story-auto-ads/0.1/test/test-story-ad-page-manager.js b/extensions/amp-story-auto-ads/0.1/test/test-story-ad-page-manager.js index 73497e797b95f..752d35e354e41 100644 --- a/extensions/amp-story-auto-ads/0.1/test/test-story-ad-page-manager.js +++ b/extensions/amp-story-auto-ads/0.1/test/test-story-ad-page-manager.js @@ -19,7 +19,7 @@ import {AmpStory} from '../../../amp-story/1.0/amp-story'; import {InsertionState, StoryAdPageManager} from '../story-ad-page-manager'; import {StoryAdPage} from '../story-ad-page'; import {getServiceForDoc} from '../../../../src/service-helpers'; -import {macroTask} from '../../../../testing/yield'; +import {macroTask} from '#testing/yield'; // TODO(ccordry): add tests for analytics events. describes.realWin('StoryAdPageManager', {amp: true}, (env) => { diff --git a/extensions/amp-story-auto-ads/0.1/test/test-story-ad-page.js b/extensions/amp-story-auto-ads/0.1/test/test-story-ad-page.js index c1b7bd2931df9..245a67b4faf34 100644 --- a/extensions/amp-story-auto-ads/0.1/test/test-story-ad-page.js +++ b/extensions/amp-story-auto-ads/0.1/test/test-story-ad-page.js @@ -29,7 +29,7 @@ import {StoryAdAutoAdvance} from '#experiments/story-ad-auto-advance'; import {StoryAdLocalization} from '../story-ad-localization'; import {StoryAdPage} from '../story-ad-page'; import {forceExperimentBranch} from '#experiments'; -import {macroTask} from '../../../../testing/yield'; +import {macroTask} from '#testing/yield'; const NOOP = () => {}; diff --git a/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-binary-poll.js b/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-binary-poll.js index 6a194b6a38601..fee5d6ade0754 100644 --- a/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-binary-poll.js +++ b/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-binary-poll.js @@ -23,7 +23,7 @@ import { addConfigToInteractive, getMockInteractiveData, } from './test-amp-story-interactive'; -import {measureMutateElementStub} from '../../../../testing/test-helper'; +import {measureMutateElementStub} from '#testing/test-helper'; import {registerServiceBuilder} from '../../../../src/service-helpers'; describes.realWin( diff --git a/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-poll.js b/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-poll.js index 07f443080998d..b5ebf4a5c2a8e 100644 --- a/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-poll.js +++ b/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive-poll.js @@ -23,7 +23,7 @@ import { addConfigToInteractive, getMockInteractiveData, } from './test-amp-story-interactive'; -import {measureMutateElementStub} from '../../../../testing/test-helper'; +import {measureMutateElementStub} from '#testing/test-helper'; import {registerServiceBuilder} from '../../../../src/service-helpers'; describes.realWin( diff --git a/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive.js b/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive.js index a98677464e5db..941f564267a7a 100644 --- a/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive.js +++ b/extensions/amp-story-interactive/0.1/test/test-amp-story-interactive.js @@ -33,7 +33,7 @@ import {StoryAnalyticsService} from '../../../amp-story/1.0/story-analytics'; import {dict} from '#core/types/object'; import {getBackendSpecs} from '../interactive-disclaimer'; import {htmlFor} from '#core/dom/static-template'; -import {measureMutateElementStub} from '../../../../testing/test-helper'; +import {measureMutateElementStub} from '#testing/test-helper'; import {registerServiceBuilder} from '../../../../src/service-helpers'; import {toggleExperiment} from '#experiments'; diff --git a/extensions/amp-story/1.0/test/integration/test-amp-story-affiliate-link.js b/extensions/amp-story/1.0/test/integration/test-amp-story-affiliate-link.js index 8378f89d412a0..33ed4f83d3af3 100644 --- a/extensions/amp-story/1.0/test/integration/test-amp-story-affiliate-link.js +++ b/extensions/amp-story/1.0/test/integration/test-amp-story-affiliate-link.js @@ -14,10 +14,7 @@ * limitations under the License. */ -import { - BrowserController, - RequestBank, -} from '../../../../../testing/test-helper'; +import {BrowserController, RequestBank} from '#testing/test-helper'; const t = describes.sandboxed.configure().skipSafari().skipEdge(); diff --git a/extensions/amp-story/1.0/test/test-amp-story-media-query-service.js b/extensions/amp-story/1.0/test/test-amp-story-media-query-service.js index 294982dc8d276..347162dc21b1f 100644 --- a/extensions/amp-story/1.0/test/test-amp-story-media-query-service.js +++ b/extensions/amp-story/1.0/test/test-amp-story-media-query-service.js @@ -15,7 +15,7 @@ */ import {AmpStoryMediaQueryService} from '../amp-story-media-query-service'; -import {poll} from '../../../../testing/iframe'; +import {poll} from '#testing/iframe'; describes.realWin('amp-story-media-query-service', {amp: true}, (env) => { let mediaQueryService; diff --git a/extensions/amp-story/1.0/test/test-amp-story.js b/extensions/amp-story/1.0/test/test-amp-story.js index 441f29799fe3e..66a2d8da38ba0 100644 --- a/extensions/amp-story/1.0/test/test-amp-story.js +++ b/extensions/amp-story/1.0/test/test-amp-story.js @@ -36,7 +36,7 @@ import {VisibilityState} from '#core/constants/visibility-state'; import {createElementWithAttributes} from '#core/dom'; import {registerServiceBuilder} from '../../../../src/service-helpers'; import {toggleExperiment} from '#experiments'; -import {waitFor} from '../../../../testing/test-helper'; +import {waitFor} from '#testing/test-helper'; // Represents the correct value of KeyboardEvent.which for the Right Arrow const KEYBOARD_EVENT_WHICH_RIGHT_ARROW = 39; diff --git a/extensions/amp-stream-gallery/1.0/test/test-amp-stream-gallery.js b/extensions/amp-stream-gallery/1.0/test/test-amp-stream-gallery.js index b2b825bdbf1a3..ffa4018c7a9b3 100644 --- a/extensions/amp-stream-gallery/1.0/test/test-amp-stream-gallery.js +++ b/extensions/amp-stream-gallery/1.0/test/test-amp-stream-gallery.js @@ -18,12 +18,12 @@ import '../amp-stream-gallery'; import {ActionInvocation} from '#service/action-impl'; import {ActionTrust} from '#core/constants/action-constants'; import {createElementWithAttributes, waitForChildPromise} from '#core/dom'; -import {poll} from '../../../../testing/iframe'; +import {poll} from '#testing/iframe'; import {setStyles} from '#core/dom/style'; import {toArray} from '#core/types/array'; import {toggleExperiment} from '#experiments'; import {useStyles} from '../../../amp-base-carousel/1.0/component.jss'; -import {waitFor} from '../../../../testing/test-helper'; +import {waitFor} from '#testing/test-helper'; describes.realWin( 'amp-stream-gallery', diff --git a/extensions/amp-timeago/1.0/test/test-amp-timeago.js b/extensions/amp-timeago/1.0/test/test-amp-timeago.js index 6dcd6a8a0fcb1..bfc4bc00d39f4 100644 --- a/extensions/amp-timeago/1.0/test/test-amp-timeago.js +++ b/extensions/amp-timeago/1.0/test/test-amp-timeago.js @@ -15,7 +15,7 @@ */ import '../amp-timeago'; import {toggleExperiment} from '#experiments'; -import {waitFor} from '../../../../testing/test-helper.js'; +import {waitFor} from '#testing/test-helper.js'; describes.realWin( 'amp-timeago 1.0', diff --git a/extensions/amp-timeago/1.0/test/test-component.js b/extensions/amp-timeago/1.0/test/test-component.js index 5c1f2024b3c4c..73f51dc952113 100644 --- a/extensions/amp-timeago/1.0/test/test-component.js +++ b/extensions/amp-timeago/1.0/test/test-component.js @@ -17,7 +17,7 @@ import * as Preact from '#preact'; import {Timeago} from '../component'; import {mount} from 'enzyme'; -import {waitFor} from '../../../../testing/test-helper'; +import {waitFor} from '#testing/test-helper'; describes.realWin('Timeago 1.0 preact component', {}, (env) => { function getTime(wrapper) { diff --git a/extensions/amp-twitter/1.0/test/test-amp-twitter.js b/extensions/amp-twitter/1.0/test/test-amp-twitter.js index 526fc3dc2996a..eed71423b540e 100644 --- a/extensions/amp-twitter/1.0/test/test-amp-twitter.js +++ b/extensions/amp-twitter/1.0/test/test-amp-twitter.js @@ -16,10 +16,10 @@ import '../amp-twitter'; import {createElementWithAttributes} from '#core/dom'; -import {doNotLoadExternalResourcesInTest} from '../../../../testing/iframe'; +import {doNotLoadExternalResourcesInTest} from '#testing/iframe'; import {serializeMessage} from '../../../../src/3p-frame-messaging'; import {toggleExperiment} from '#experiments'; -import {waitFor} from '../../../../testing/test-helper'; +import {waitFor} from '#testing/test-helper'; describes.realWin( 'amp-twitter-v1.0', diff --git a/extensions/amp-twitter/1.0/test/test-component.js b/extensions/amp-twitter/1.0/test/test-component.js index ac30cb94e7c8a..9facfeb281af8 100644 --- a/extensions/amp-twitter/1.0/test/test-component.js +++ b/extensions/amp-twitter/1.0/test/test-component.js @@ -20,7 +20,7 @@ import {WithAmpContext} from '#preact/context'; import {createRef} from '#preact'; import {mount} from 'enzyme'; import {serializeMessage} from '../../../../src/3p-frame-messaging'; -import {waitFor} from '../../../../testing/test-helper'; +import {waitFor} from '#testing/test-helper'; describes.sandboxed('Twitter preact component v1.0', {}, (env) => { it('should render', () => { diff --git a/extensions/amp-user-notification/0.1/test/test-amp-user-notification.js b/extensions/amp-user-notification/0.1/test/test-amp-user-notification.js index 58984a251fc7a..b50cb5294914c 100644 --- a/extensions/amp-user-notification/0.1/test/test-amp-user-notification.js +++ b/extensions/amp-user-notification/0.1/test/test-amp-user-notification.js @@ -20,7 +20,7 @@ import { } from '../amp-user-notification'; import {GEO_IN_GROUP} from '../../../amp-geo/0.1/amp-geo-in-group'; import {Services} from '#service'; -import {macroTask} from '../../../../testing/yield'; +import {macroTask} from '#testing/yield'; import { registerServiceBuilder, resetServiceForTesting, diff --git a/extensions/amp-video-iframe/0.1/test/test-amp-video-iframe.js b/extensions/amp-video-iframe/0.1/test/test-amp-video-iframe.js index 9358f7bd36f8a..4b15ae77ae9c0 100644 --- a/extensions/amp-video-iframe/0.1/test/test-amp-video-iframe.js +++ b/extensions/amp-video-iframe/0.1/test/test-amp-video-iframe.js @@ -18,9 +18,9 @@ import '../amp-video-iframe'; import {Services} from '#service'; import {VideoEvents} from '../../../../src/video-interface'; import {createElementWithAttributes} from '#core/dom'; -import {installResizeObserverStub} from '../../../../testing/resize-observer-stub'; +import {installResizeObserverStub} from '#testing/resize-observer-stub'; import {listenOncePromise} from '../../../../src/event-helper'; -import {macroTask} from '../../../../testing/yield'; +import {macroTask} from '#testing/yield'; import {whenUpgradedToCustomElement} from '../../../../src/amp-element-helpers'; describes.realWin( diff --git a/extensions/amp-video-iframe/1.0/test/test-amp-video-iframe.js b/extensions/amp-video-iframe/1.0/test/test-amp-video-iframe.js index 5bd91a50360f6..94105576d3a13 100644 --- a/extensions/amp-video-iframe/1.0/test/test-amp-video-iframe.js +++ b/extensions/amp-video-iframe/1.0/test/test-amp-video-iframe.js @@ -18,7 +18,7 @@ import '../amp-video-iframe'; import {dispatchCustomEvent} from '#core/dom'; import {htmlFor} from '#core/dom/static-template'; import {toggleExperiment} from '#experiments'; -import {waitFor} from '../../../../testing/test-helper'; +import {waitFor} from '#testing/test-helper'; describes.realWin( 'amp-video-iframe-v1.0', diff --git a/extensions/amp-video/0.1/test/test-amp-video.js b/extensions/amp-video/0.1/test/test-amp-video.js index 8bf252ff6abd6..f747f9a95fd01 100644 --- a/extensions/amp-video/0.1/test/test-amp-video.js +++ b/extensions/amp-video/0.1/test/test-amp-video.js @@ -20,7 +20,7 @@ import {VideoEvents} from '../../../../src/video-interface'; import {VisibilityState} from '#core/constants/visibility-state'; import {dispatchCustomEvent} from '#core/dom'; import {installPerformanceService} from '#service/performance-impl'; -import {installResizeObserverStub} from '../../../../testing/resize-observer-stub'; +import {installResizeObserverStub} from '#testing/resize-observer-stub'; import {listenOncePromise} from '../../../../src/event-helper'; import {toggleExperiment} from '#experiments'; diff --git a/extensions/amp-video/1.0/test/test-amp-video.js b/extensions/amp-video/1.0/test/test-amp-video.js index 3449d21283cc3..296f08d10509b 100644 --- a/extensions/amp-video/1.0/test/test-amp-video.js +++ b/extensions/amp-video/1.0/test/test-amp-video.js @@ -18,7 +18,7 @@ import '../amp-video'; import {dispatchCustomEvent} from '#core/dom'; import {htmlFor} from '#core/dom/static-template'; import {toggleExperiment} from '#experiments'; -import {waitFor} from '../../../../testing/test-helper'; +import {waitFor} from '#testing/test-helper'; describes.realWin( 'amp-video-v1.0', diff --git a/extensions/amp-vimeo/1.0/test/test-amp-vimeo.js b/extensions/amp-vimeo/1.0/test/test-amp-vimeo.js index 24d20cf7cec61..e5d62a1b1dd25 100644 --- a/extensions/amp-vimeo/1.0/test/test-amp-vimeo.js +++ b/extensions/amp-vimeo/1.0/test/test-amp-vimeo.js @@ -17,7 +17,7 @@ import '../amp-vimeo'; import {htmlFor} from '#core/dom/static-template'; import {toggleExperiment} from '#experiments'; -import {waitFor} from '../../../../testing/test-helper'; +import {waitFor} from '#testing/test-helper'; describes.realWin( 'amp-vimeo-v1.0', diff --git a/extensions/amp-youtube/0.1/test/test-amp-youtube.js b/extensions/amp-youtube/0.1/test/test-amp-youtube.js index 0a46a924b771c..2e5aa76c4b776 100644 --- a/extensions/amp-youtube/0.1/test/test-amp-youtube.js +++ b/extensions/amp-youtube/0.1/test/test-amp-youtube.js @@ -17,7 +17,7 @@ import '../amp-youtube'; import {Services} from '#service'; import {VideoEvents} from '../../../../src/video-interface'; -import {installResizeObserverStub} from '../../../../testing/resize-observer-stub'; +import {installResizeObserverStub} from '#testing/resize-observer-stub'; import {listenOncePromise} from '../../../../src/event-helper'; const EXAMPLE_VIDEOID = 'mGENRKrdoGY'; diff --git a/extensions/amp-youtube/1.0/test/test-amp-youtube.js b/extensions/amp-youtube/1.0/test/test-amp-youtube.js index cab11f5131492..88a5352be893a 100644 --- a/extensions/amp-youtube/1.0/test/test-amp-youtube.js +++ b/extensions/amp-youtube/1.0/test/test-amp-youtube.js @@ -17,9 +17,9 @@ import '../amp-youtube'; import {createElementWithAttributes} from '#core/dom'; -import {doNotLoadExternalResourcesInTest} from '../../../../testing/iframe'; +import {doNotLoadExternalResourcesInTest} from '#testing/iframe'; import {toggleExperiment} from '#experiments'; -import {waitFor} from '../../../../testing/test-helper'; +import {waitFor} from '#testing/test-helper'; describes.realWin( 'amp-youtube-v1.0', diff --git a/test/integration/test-actions.js b/test/integration/test-actions.js index f4e89b706871d..76ec9260dc0c3 100644 --- a/test/integration/test-actions.js +++ b/test/integration/test-actions.js @@ -14,8 +14,8 @@ * limitations under the License. */ -import {BrowserController} from '../../testing/test-helper'; -import {poll} from '../../testing/iframe.js'; +import {BrowserController} from '#testing/test-helper'; +import {poll} from '#testing/iframe.js'; describes.integration( 'on="..."', diff --git a/test/integration/test-amp-ad-3p.js b/test/integration/test-amp-ad-3p.js index 8d7a6497b259e..f5b25543dee32 100644 --- a/test/integration/test-amp-ad-3p.js +++ b/test/integration/test-amp-ad-3p.js @@ -17,7 +17,7 @@ import {ADS_INITIAL_INTERSECTION_EXP} from '#experiments/ads-initial-intersection-exp'; import {Services} from '#service'; import {createCustomEvent} from '../../src/event-helper'; -import {createFixtureIframe, poll} from '../../testing/iframe'; +import {createFixtureIframe, poll} from '#testing/iframe'; import {forceExperimentBranch} from '#experiments'; import {installPlatformService} from '#service/platform-impl'; import {layoutRectLtwh} from '#core/math/layout-rect'; diff --git a/test/integration/test-amp-ad-doubleclick.js b/test/integration/test-amp-ad-doubleclick.js index f6e3bcc06d625..94f6634952f08 100644 --- a/test/integration/test-amp-ad-doubleclick.js +++ b/test/integration/test-amp-ad-doubleclick.js @@ -14,7 +14,7 @@ * limitations under the License. */ -import {createFixtureIframe, poll, pollForLayout} from '../../testing/iframe'; +import {createFixtureIframe, poll, pollForLayout} from '#testing/iframe'; describes.sandboxed .configure() diff --git a/test/integration/test-amp-ad-type-custom.js b/test/integration/test-amp-ad-type-custom.js index bc6df2d7d9baf..c4e0863c5f901 100644 --- a/test/integration/test-amp-ad-type-custom.js +++ b/test/integration/test-amp-ad-type-custom.js @@ -14,7 +14,7 @@ * limitations under the License. */ -import {BrowserController} from '../../testing/test-helper'; +import {BrowserController} from '#testing/test-helper'; describes.integration( 'amp-ad type=custom', diff --git a/test/integration/test-amp-analytics.js b/test/integration/test-amp-analytics.js index 525390a41661b..e2b9d978521b9 100644 --- a/test/integration/test-amp-analytics.js +++ b/test/integration/test-amp-analytics.js @@ -14,7 +14,7 @@ * limitations under the License. */ -import {BrowserController, RequestBank} from '../../testing/test-helper'; +import {BrowserController, RequestBank} from '#testing/test-helper'; import {parseQueryString} from '#core/types/string/url'; // TODO(wg-analytics): These tests time out on Firefox and Safari. diff --git a/test/integration/test-amp-bind.js b/test/integration/test-amp-bind.js index d6727cde6f597..5472e61a5d6ef 100644 --- a/test/integration/test-amp-bind.js +++ b/test/integration/test-amp-bind.js @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {BrowserController} from '../../testing/test-helper'; -import {poll as classicPoll} from '../../testing/iframe'; +import {BrowserController} from '#testing/test-helper'; +import {poll as classicPoll} from '#testing/iframe'; const TIMEOUT = 10000; diff --git a/test/integration/test-amp-img.js b/test/integration/test-amp-img.js index 863082b52bc91..0dd8d71e5721b 100644 --- a/test/integration/test-amp-img.js +++ b/test/integration/test-amp-img.js @@ -20,7 +20,7 @@ import { createFixtureIframe, expectBodyToBecomeVisible, poll, -} from '../../testing/iframe.js'; +} from '#testing/iframe.js'; describes.sandboxed .configure() diff --git a/test/integration/test-amp-pixel.js b/test/integration/test-amp-pixel.js index c5c5c69d168b7..461240078d250 100644 --- a/test/integration/test-amp-pixel.js +++ b/test/integration/test-amp-pixel.js @@ -15,7 +15,7 @@ */ import {AmpPixel} from '#builtins/amp-pixel/amp-pixel'; -import {BrowserController, RequestBank} from '../../testing/test-helper'; +import {BrowserController, RequestBank} from '#testing/test-helper'; import {createElementWithAttributes} from '#core/dom'; describes.sandboxed('amp-pixel', {}, function () { diff --git a/test/integration/test-amp-recaptcha-input.js b/test/integration/test-amp-recaptcha-input.js index 3c4a844b4e80c..e9c1a9df04f81 100644 --- a/test/integration/test-amp-recaptcha-input.js +++ b/test/integration/test-amp-recaptcha-input.js @@ -14,9 +14,9 @@ * limitations under the License. */ -import {BrowserController, RequestBank} from '../../testing/test-helper'; +import {BrowserController, RequestBank} from '#testing/test-helper'; import {Deferred} from '#core/data-structures/promise'; -import {poll} from '../../testing/iframe'; +import {poll} from '#testing/iframe'; // TODO(wg-components): These tests are broken on Firefox (as of v77). They // also fail on Safari. diff --git a/test/integration/test-amp-skimlinks.js b/test/integration/test-amp-skimlinks.js index 2b6b7be513e56..edb8e70eaed97 100644 --- a/test/integration/test-amp-skimlinks.js +++ b/test/integration/test-amp-skimlinks.js @@ -14,7 +14,7 @@ * limitations under the License. */ -import {BrowserController, RequestBank} from '../../testing/test-helper'; +import {BrowserController, RequestBank} from '#testing/test-helper'; import {PLATFORM_NAME} from '../../extensions/amp-skimlinks/0.1/constants'; import {parseQueryString} from '#core/types/string/url'; diff --git a/test/integration/test-amp-story-analytics.js b/test/integration/test-amp-story-analytics.js index 7b4b5fbb6fbfa..7f00c3df85fa0 100644 --- a/test/integration/test-amp-story-analytics.js +++ b/test/integration/test-amp-story-analytics.js @@ -14,7 +14,7 @@ * limitations under the License. */ -import {BrowserController, RequestBank} from '../../testing/test-helper'; +import {BrowserController, RequestBank} from '#testing/test-helper'; import {parseQueryString} from '#core/types/string/url'; const config = describes.sandboxed.configure().skipEdge().skipSafari(); diff --git a/test/integration/test-amphtml-ads.js b/test/integration/test-amphtml-ads.js index f0e2ccb9c28b2..b8bc0e16351bb 100644 --- a/test/integration/test-amphtml-ads.js +++ b/test/integration/test-amphtml-ads.js @@ -14,8 +14,8 @@ * limitations under the License. */ -import {RequestBank} from '../../testing/test-helper'; -import {maybeSwitchToCompiledJs} from '../../testing/iframe'; +import {RequestBank} from '#testing/test-helper'; +import {maybeSwitchToCompiledJs} from '#testing/iframe'; import {parseQueryString} from '#core/types/string/url'; import {xhrServiceForTesting} from '#service/xhr-impl'; diff --git a/test/integration/test-boilerplates.js b/test/integration/test-boilerplates.js index 43ca30ff46d8b..b183ed008f2e8 100644 --- a/test/integration/test-boilerplates.js +++ b/test/integration/test-boilerplates.js @@ -14,12 +14,9 @@ * limitations under the License. */ -import { - createFixtureIframe, - expectBodyToBecomeVisible, -} from '../../testing/iframe'; +import {createFixtureIframe, expectBodyToBecomeVisible} from '#testing/iframe'; import {getStyle} from '#core/dom/style'; -import {isAnimationNone} from '../../testing/test-helper'; +import {isAnimationNone} from '#testing/test-helper'; const timeout = window.ampTestRuntimeConfig.mochaTimeout; diff --git a/test/integration/test-configuration.js b/test/integration/test-configuration.js index 304938a44c347..cb865670d685b 100644 --- a/test/integration/test-configuration.js +++ b/test/integration/test-configuration.js @@ -15,7 +15,7 @@ */ import {AmpEvents} from '#core/constants/amp-events'; -import {createFixtureIframe} from '../../testing/iframe.js'; +import {createFixtureIframe} from '#testing/iframe.js'; describes.sandboxed('Configuration', {}, function () { let fixture; diff --git a/test/integration/test-css.js b/test/integration/test-css.js index 7e4e12c0c6be1..112810ea2ad64 100644 --- a/test/integration/test-css.js +++ b/test/integration/test-css.js @@ -19,7 +19,7 @@ import {computedStyle} from '#core/dom/style.js'; import { createFixtureIframe, expectBodyToBecomeVisible, -} from '../../testing/iframe.js'; +} from '#testing/iframe.js'; describes.sandboxed.configure().run('CSS', {}, () => { it('should include height of [overflow] child in size before build', async () => { diff --git a/test/integration/test-double-loading.js b/test/integration/test-double-loading.js index fadb094378949..4675ccbdd1cbf 100644 --- a/test/integration/test-double-loading.js +++ b/test/integration/test-double-loading.js @@ -15,7 +15,7 @@ */ import {AmpEvents} from '#core/constants/amp-events.js'; -import {createFixtureIframe} from '../../testing/iframe.js'; +import {createFixtureIframe} from '#testing/iframe.js'; function checkElementUpgrade(element) { expect(element).to.have.class('i-amphtml-element'); diff --git a/test/integration/test-errors.js b/test/integration/test-errors.js index 2ace5725cc786..fd84cad94e38c 100644 --- a/test/integration/test-errors.js +++ b/test/integration/test-errors.js @@ -18,7 +18,7 @@ import { createFixtureIframe, expectBodyToBecomeVisible, poll, -} from '../../testing/iframe.js'; +} from '#testing/iframe.js'; /** @const {number} */ const TIMEOUT = window.ampTestRuntimeConfig.mochaTimeout; diff --git a/test/integration/test-extensions-loading.js b/test/integration/test-extensions-loading.js index 5242ca1282100..705a964e27ede 100644 --- a/test/integration/test-extensions-loading.js +++ b/test/integration/test-extensions-loading.js @@ -15,7 +15,7 @@ */ import {AmpEvents} from '#core/constants/amp-events'; -import {createFixtureIframe} from '../../testing/iframe'; +import {createFixtureIframe} from '#testing/iframe'; // Checks if an amp element gets upgraded. function checkElementUpgrade(element) { diff --git a/test/integration/test-position-observer.js b/test/integration/test-position-observer.js index d1aece798f5a2..b70bce2fd5a96 100644 --- a/test/integration/test-position-observer.js +++ b/test/integration/test-position-observer.js @@ -14,7 +14,7 @@ * limitations under the License. */ -import {poll} from '../../testing/iframe'; +import {poll} from '#testing/iframe'; //TODO(aghassemi,#10878): Run in all platforms. //TODO(aghasemi, #10877): in-a-box, FIE integration tests. diff --git a/test/integration/test-released.js b/test/integration/test-released.js index 8a21167f72f1f..30a71bddd674d 100644 --- a/test/integration/test-released.js +++ b/test/integration/test-released.js @@ -18,7 +18,7 @@ import { createFixtureIframe, expectBodyToBecomeVisible, pollForLayout, -} from '../../testing/iframe.js'; +} from '#testing/iframe.js'; describes.sandboxed('released components: ', {}, function () { runTest.call(this, false); diff --git a/test/integration/test-shadow-amp.js b/test/integration/test-shadow-amp.js index d31ab24bc1289..6726e8380a2d0 100644 --- a/test/integration/test-shadow-amp.js +++ b/test/integration/test-shadow-amp.js @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import {BrowserController} from '../../testing/test-helper'; +import {BrowserController} from '#testing/test-helper'; describes.integration( 'AMP shadow v0', diff --git a/test/integration/test-shadow-dom-element.js b/test/integration/test-shadow-dom-element.js index 574be16cf6b5e..0305a5c33b670 100644 --- a/test/integration/test-shadow-dom-element.js +++ b/test/integration/test-shadow-dom-element.js @@ -14,7 +14,7 @@ * limitations under the License. */ -import {createFixtureIframe} from '../../testing/iframe'; +import {createFixtureIframe} from '#testing/iframe'; import {toggleExperiment} from '#experiments'; import {whenUpgradedToCustomElement} from '../../src/amp-element-helpers'; diff --git a/test/integration/test-toggle-display.js b/test/integration/test-toggle-display.js index 9ff8d41954c25..a12649c89ee13 100644 --- a/test/integration/test-toggle-display.js +++ b/test/integration/test-toggle-display.js @@ -14,7 +14,7 @@ * limitations under the License. */ -import {BrowserController} from '../../testing/test-helper'; +import {BrowserController} from '#testing/test-helper'; import {setInitialDisplay, toggle} from '#core/dom/style'; describes.integration diff --git a/test/integration/test-user-error-reporting.js b/test/integration/test-user-error-reporting.js index 37a3492898364..29e7626ac8ad1 100644 --- a/test/integration/test-user-error-reporting.js +++ b/test/integration/test-user-error-reporting.js @@ -14,7 +14,7 @@ * limitations under the License. */ -import {BrowserController, RequestBank} from '../../testing/test-helper'; +import {BrowserController, RequestBank} from '#testing/test-helper'; // TODO(zhouyx, #11459): Unskip the test on Safari and Firefox. const t = describes.sandboxed.configure().skipSafari().skipFirefox().skipEdge(); diff --git a/test/integration/test-video-players-helper.js b/test/integration/test-video-players-helper.js index 61c50b7524326..4c830f23660fc 100644 --- a/test/integration/test-video-players-helper.js +++ b/test/integration/test-video-players-helper.js @@ -24,7 +24,7 @@ import { createFixtureIframe, expectBodyToBecomeVisible, poll, -} from '../../testing/iframe'; +} from '#testing/iframe'; import {detectIsAutoplaySupported} from '#core/dom/video'; import {getData, listenOncePromise} from '../../src/event-helper'; import {removeElement} from '#core/dom'; diff --git a/test/unit/3p/test-3p-messaging.js b/test/unit/3p/test-3p-messaging.js index f4a923d04e0a0..3a8a8cc681d63 100644 --- a/test/unit/3p/test-3p-messaging.js +++ b/test/unit/3p/test-3p-messaging.js @@ -15,7 +15,7 @@ */ import {Services} from '#service'; -import {createIframePromise} from '../../../testing/iframe'; +import {createIframePromise} from '#testing/iframe'; import {listenParent} from '#3p/messaging'; import {postMessage} from '../../../src/iframe-helper'; diff --git a/test/unit/ads/test-adplugg.js b/test/unit/ads/test-adplugg.js index 40ee296128987..82ef7ca651df4 100644 --- a/test/unit/ads/test-adplugg.js +++ b/test/unit/ads/test-adplugg.js @@ -15,7 +15,7 @@ */ import {adplugg} from '#ads/vendors/adplugg'; -import {createIframePromise} from '../../../testing/iframe'; +import {createIframePromise} from '#testing/iframe'; describes.fakeWin('amp-ad-adplugg-impl', {}, (env) => { let win; diff --git a/test/unit/ads/test-aduptech.js b/test/unit/ads/test-aduptech.js index 1a5e93d34b518..76b85ab7109e7 100644 --- a/test/unit/ads/test-aduptech.js +++ b/test/unit/ads/test-aduptech.js @@ -19,7 +19,7 @@ import { ADUPTECH_ELEMENT_ID, aduptech, } from '#ads/vendors/aduptech'; -import {createIframePromise} from '../../../testing/iframe'; +import {createIframePromise} from '#testing/iframe'; describes.fakeWin('amp-ad-aduptech-impl', {}, (env) => { let win; diff --git a/test/unit/ads/test-csa.js b/test/unit/ads/test-csa.js index 03295c0847657..d179a8eb8de9a 100644 --- a/test/unit/ads/test-csa.js +++ b/test/unit/ads/test-csa.js @@ -22,7 +22,7 @@ import { csa, resizeIframe, } from '#ads/vendors/csa'; -import {createIframePromise} from '../../../testing/iframe'; +import {createIframePromise} from '#testing/iframe'; function getAds(type) { const generic = {ampSlotIndex: '0', height: 300, type: 'csa'}; diff --git a/test/unit/ads/test-ssp.js b/test/unit/ads/test-ssp.js index 6b098fccb20d7..8f2274fef06fb 100644 --- a/test/unit/ads/test-ssp.js +++ b/test/unit/ads/test-ssp.js @@ -15,7 +15,7 @@ */ import * as _3p from '#3p/3p'; -import {createIframePromise} from '../../../testing/iframe'; +import {createIframePromise} from '#testing/iframe'; import { handlePosition, handlePositionResponsive, diff --git a/test/unit/core/dom/stream/test-response.js b/test/unit/core/dom/stream/test-response.js index f9e538dfcf7b5..29b4a40880787 100644 --- a/test/unit/core/dom/stream/test-response.js +++ b/test/unit/core/dom/stream/test-response.js @@ -14,7 +14,7 @@ * limitations under the License. */ -import {macroTask} from '../../../../../testing/yield'; +import {macroTask} from '#testing/yield'; import {streamResponseToWriter} from '#core/dom/stream'; const chunk1 = ` diff --git a/test/unit/core/dom/test-media-query-props.js b/test/unit/core/dom/test-media-query-props.js index 351b3e2c571bb..d43286f86db26 100644 --- a/test/unit/core/dom/test-media-query-props.js +++ b/test/unit/core/dom/test-media-query-props.js @@ -15,7 +15,7 @@ */ import {MediaQueryProps} from '#core/dom/media-query-props'; -import {waitFor} from '../../../../testing/test-helper'; +import {waitFor} from '#testing/test-helper'; describes.realWin( 'DOM - MediaQueryProps', diff --git a/test/unit/core/dom/video/test-pause-helper.js b/test/unit/core/dom/video/test-pause-helper.js index b0f1a57b13a20..04cb06b89fbf5 100644 --- a/test/unit/core/dom/video/test-pause-helper.js +++ b/test/unit/core/dom/video/test-pause-helper.js @@ -15,7 +15,7 @@ */ import {PauseHelper} from '#core/dom/video/pause-helper'; -import {installResizeObserverStub} from '../../../../../testing/resize-observer-stub'; +import {installResizeObserverStub} from '#testing/resize-observer-stub'; describes.realWin('DOM - video - PauseHelper', {}, (env) => { let win, doc; diff --git a/test/unit/inabox/test-inabox-resources.js b/test/unit/inabox/test-inabox-resources.js index 3c8e3b6e06698..f0c011321c382 100644 --- a/test/unit/inabox/test-inabox-resources.js +++ b/test/unit/inabox/test-inabox-resources.js @@ -16,7 +16,7 @@ import {Deferred} from '#core/data-structures/promise'; import {InaboxResources} from '#inabox/inabox-resources'; import {ResourceState} from '#service/resource'; -import {macroTask} from '../../../testing/yield'; +import {macroTask} from '#testing/yield'; import {toggleExperiment} from '#experiments'; describes.realWin('inabox-resources', {amp: true}, (env) => { diff --git a/test/unit/preact/test-base-element-mapping.js b/test/unit/preact/test-base-element-mapping.js index ad9357d555f67..8ef5c2cf96db7 100644 --- a/test/unit/preact/test-base-element-mapping.js +++ b/test/unit/preact/test-base-element-mapping.js @@ -20,9 +20,9 @@ import {Slot} from '#preact/slot'; import {createElementWithAttributes} from '#core/dom'; import {htmlFor} from '#core/dom/static-template'; import {omit} from '#core/types/object'; -import {testElementR1} from '../../../testing/element-v1'; +import {testElementR1} from '#testing/element-v1'; import {upgradeOrRegisterElement} from '#service/custom-element-registry'; -import {waitFor} from '../../../testing/test-helper'; +import {waitFor} from '#testing/test-helper'; const spec = {amp: true, frameStyle: {width: '300px'}}; diff --git a/test/unit/preact/test-base-element-runtime.js b/test/unit/preact/test-base-element-runtime.js index 6efe6390e093e..163dc810dc690 100644 --- a/test/unit/preact/test-base-element-runtime.js +++ b/test/unit/preact/test-base-element-runtime.js @@ -21,12 +21,12 @@ import {Slot} from '#preact/slot'; import {forwardRef} from '#preact/compat'; import {getSchedulerForDoc} from '#service/scheduler'; import {htmlFor} from '#core/dom/static-template'; -import {installResizeObserverStub} from '../../../testing/resize-observer-stub'; +import {installResizeObserverStub} from '#testing/resize-observer-stub'; import {removeElement} from '#core/dom'; import {subscribe} from '../../../src/context'; import {upgradeOrRegisterElement} from '#service/custom-element-registry'; import {useAmpContext, useLoading} from '#preact/context'; -import {waitFor} from '../../../testing/test-helper'; +import {waitFor} from '#testing/test-helper'; describes.realWin('PreactBaseElement', {amp: true}, (env) => { let win, doc, html; diff --git a/test/unit/test-3p-environment.js b/test/unit/test-3p-environment.js index 41240d96b1ca8..02a595ce6eef2 100644 --- a/test/unit/test-3p-environment.js +++ b/test/unit/test-3p-environment.js @@ -16,7 +16,7 @@ import * as fakeTimers from '@sinonjs/fake-timers'; import {Services} from '#service'; -import {createIframePromise} from '../../testing/iframe'; +import {createIframePromise} from '#testing/iframe'; import {loadPromise} from '../../src/event-helper'; import {manageWin, setInViewportForTesting} from '#3p/environment'; diff --git a/test/unit/test-action.js b/test/unit/test-action.js index 264987541f2d4..f349b883d702f 100644 --- a/test/unit/test-action.js +++ b/test/unit/test-action.js @@ -30,7 +30,7 @@ import {AmpDocSingle} from '#service/ampdoc-impl'; import {Keys} from '#core/constants/key-codes'; import {createCustomEvent} from '../../src/event-helper'; import {htmlFor} from '#core/dom/static-template'; -import {whenCalled} from '../../testing/test-helper.js'; +import {whenCalled} from '#testing/test-helper.js'; /** * @return {!ActionService} diff --git a/test/unit/test-ad-helper.js b/test/unit/test-ad-helper.js index 94c6a2527658a..88d8b6bf48fac 100644 --- a/test/unit/test-ad-helper.js +++ b/test/unit/test-ad-helper.js @@ -15,7 +15,7 @@ */ import {computedStyle} from '#core/dom/style'; -import {createIframePromise} from '../../testing/iframe'; +import {createIframePromise} from '#testing/iframe'; import {getAdContainer, isAdPositionAllowed} from '../../src/ad-helper'; describes.sandboxed('ad-helper', {}, () => { diff --git a/test/unit/test-amp-img-intrinsic.js b/test/unit/test-amp-img-intrinsic.js index 3c91e504e073d..e5fd3c6b96633 100644 --- a/test/unit/test-amp-img-intrinsic.js +++ b/test/unit/test-amp-img-intrinsic.js @@ -14,10 +14,10 @@ * limitations under the License. */ -import {BrowserController} from '../../testing/test-helper'; +import {BrowserController} from '#testing/test-helper'; import {applyStaticLayout} from '../../src/static-layout'; import {createElementWithAttributes} from '#core/dom'; -import {createIframePromise} from '../../testing/iframe'; +import {createIframePromise} from '#testing/iframe'; import {installImg} from '#builtins/amp-img/amp-img'; import {toArray} from '#core/types/array'; diff --git a/test/unit/test-amp-img-v1.js b/test/unit/test-amp-img-v1.js index b93f8fb8f85d2..59edb20fc6504 100644 --- a/test/unit/test-amp-img-v1.js +++ b/test/unit/test-amp-img-v1.js @@ -18,7 +18,7 @@ import {AmpImg} from '#builtins/amp-img/amp-img'; import {BaseElement} from '../../src/base-element'; import {Layout, LayoutPriority} from '#core/dom/layout'; import {createElementWithAttributes, dispatchCustomEvent} from '#core/dom'; -import {testElementR1} from '../../testing/element-v1'; +import {testElementR1} from '#testing/element-v1'; describes.realWin('amp-img R1', {amp: true}, (env) => { let win, doc; diff --git a/test/unit/test-amp-img.js b/test/unit/test-amp-img.js index 6d0ee4fec5aa6..a49760f381dfb 100644 --- a/test/unit/test-amp-img.js +++ b/test/unit/test-amp-img.js @@ -19,7 +19,7 @@ import {BaseElement} from '../../src/base-element'; import {Layout, LayoutPriority} from '#core/dom/layout'; import {Services} from '#service'; import {createCustomEvent} from '../../src/event-helper'; -import {createIframePromise} from '../../testing/iframe'; +import {createIframePromise} from '#testing/iframe'; describes.sandboxed('amp-img', {}, (env) => { let sandbox; diff --git a/test/unit/test-amp-story-player.js b/test/unit/test-amp-story-player.js index 5a2d0fc5af4f0..58c566b705f6b 100644 --- a/test/unit/test-amp-story-player.js +++ b/test/unit/test-amp-story-player.js @@ -20,7 +20,7 @@ import {Messaging} from '@ampproject/viewer-messaging'; import {PageScroller} from '../../src/amp-story-player/page-scroller'; import {expect} from 'chai'; import {listenOncePromise} from '../../src/event-helper'; -import {macroTask} from '../../testing/yield'; +import {macroTask} from '#testing/yield'; describes.realWin('AmpStoryPlayer', {amp: false}, (env) => { let win; diff --git a/test/unit/test-ampdoc.js b/test/unit/test-ampdoc.js index 18102f3e58519..17633c05686f6 100644 --- a/test/unit/test-ampdoc.js +++ b/test/unit/test-ampdoc.js @@ -35,7 +35,7 @@ import { registerServiceBuilderForDoc, setParentWindow, } from '../../src/service-helpers'; -import {waitFor} from '../../testing/test-helper'; +import {waitFor} from '#testing/test-helper'; describes.realWin('AmpDocService', {}, (env) => { let doc, win; diff --git a/test/unit/test-cache-cid-api.js b/test/unit/test-cache-cid-api.js index 7179e7e0962fa..dc36a6bcc6d87 100644 --- a/test/unit/test-cache-cid-api.js +++ b/test/unit/test-cache-cid-api.js @@ -17,7 +17,7 @@ import * as fakeTimers from '@sinonjs/fake-timers'; import {CacheCidApi} from '#service/cache-cid-api'; import {installTimerService} from '#service/timer-impl'; -import {mockServiceForDoc, stubService} from '../../testing/test-helper'; +import {mockServiceForDoc, stubService} from '#testing/test-helper'; describes.realWin('cacheCidApi', {amp: true}, (env) => { let ampdoc; diff --git a/test/unit/test-cid-api.js b/test/unit/test-cid-api.js index 9675db338d266..25945aa76123b 100644 --- a/test/unit/test-cid-api.js +++ b/test/unit/test-cid-api.js @@ -16,7 +16,7 @@ import {GoogleCidApi} from '#service/cid-api'; import {getCookie, setCookie} from '../../src/cookies'; -import {mockWindowInterface, stubService} from '../../testing/test-helper'; +import {mockWindowInterface, stubService} from '#testing/test-helper'; describes.realWin('test-cid-api', {amp: true}, (env) => { let win; diff --git a/test/unit/test-cid.js b/test/unit/test-cid.js index 16cd6f222fb21..42887c688aba6 100644 --- a/test/unit/test-cid.js +++ b/test/unit/test-cid.js @@ -33,13 +33,13 @@ import {installExtensionsService} from '#service/extensions-impl'; import {installPlatformService} from '#service/platform-impl'; import {installTimerService} from '#service/timer-impl'; import {installViewerServiceForDoc} from '#service/viewer-impl'; -import {macroTask} from '../../testing/yield'; +import {macroTask} from '#testing/yield'; import {parseUrlDeprecated} from '../../src/url'; import { registerServiceBuilder, resetServiceForTesting, } from '../../src/service-helpers'; -import {stubServiceForDoc} from '../../testing/test-helper'; +import {stubServiceForDoc} from '#testing/test-helper'; const DAY = 24 * 3600 * 1000; diff --git a/test/unit/test-document-info.js b/test/unit/test-document-info.js index df51954dea473..6fa14ad78a1cb 100644 --- a/test/unit/test-document-info.js +++ b/test/unit/test-document-info.js @@ -17,7 +17,7 @@ import * as CID from '#service/cid-impl'; import {Services} from '#service'; -import {createIframePromise} from '../../testing/iframe'; +import {createIframePromise} from '#testing/iframe'; import {installDocService} from '#service/ampdoc-impl'; import {installDocumentInfoServiceForDoc} from '#service/document-info-impl'; diff --git a/test/unit/test-element-service.js b/test/unit/test-element-service.js index 93eebb99aca29..ed013c6b5eb8f 100644 --- a/test/unit/test-element-service.js +++ b/test/unit/test-element-service.js @@ -15,7 +15,7 @@ */ import * as fakeTimers from '@sinonjs/fake-timers'; -import {FakeWindow} from '../../testing/fake-dom'; +import {FakeWindow} from '#testing/fake-dom'; import {Services} from '#service'; import {createElementWithAttributes} from '#core/dom'; import { diff --git a/test/unit/test-extension-analytics.js b/test/unit/test-extension-analytics.js index 54cb324dab104..b379c8a3fd567 100644 --- a/test/unit/test-extension-analytics.js +++ b/test/unit/test-extension-analytics.js @@ -26,7 +26,7 @@ import { registerServiceBuilderForDoc, resetServiceForTesting, } from '../../src/service-helpers'; -import {macroTask} from '../../testing/yield'; +import {macroTask} from '#testing/yield'; import {registerElement} from '#service/custom-element-registry'; /* eslint-disable react-hooks/rules-of-hooks */ diff --git a/test/unit/test-fixed-layer.js b/test/unit/test-fixed-layer.js index 1ba353fb28b1e..b11776b0d258f 100644 --- a/test/unit/test-fixed-layer.js +++ b/test/unit/test-fixed-layer.js @@ -16,7 +16,7 @@ import {AmpDocSingle, installDocService} from '#service/ampdoc-impl'; import {Animation} from '../../src/animation'; -import {FakeMutationObserver, FakeWindow} from '../../testing/fake-dom'; +import {FakeMutationObserver, FakeWindow} from '#testing/fake-dom'; import {FixedLayer} from '#service/fixed-layer'; import {Services} from '#service'; import {endsWith} from '#core/types/string'; diff --git a/test/unit/test-friendly-iframe-embed.js b/test/unit/test-friendly-iframe-embed.js index a8318ae9dc8c4..329ebf4fc0519 100644 --- a/test/unit/test-friendly-iframe-embed.js +++ b/test/unit/test-friendly-iframe-embed.js @@ -18,7 +18,7 @@ import {AmpDocFie} from '#service/ampdoc-impl'; import {BaseElement} from '../../src/base-element'; import {Deferred} from '#core/data-structures/promise'; import {ElementStub} from '../../src/element-stub'; -import {FakeWindow} from '../../testing/fake-dom'; +import {FakeWindow} from '#testing/fake-dom'; import { FriendlyIframeEmbed, Installers, @@ -37,7 +37,7 @@ import { setParentWindow, } from '../../src/service-helpers'; import {installExtensionsService} from '#service/extensions-impl'; -import {isAnimationNone} from '../../testing/test-helper'; +import {isAnimationNone} from '#testing/test-helper'; import {layoutRectLtwh} from '#core/math/layout-rect'; import {loadPromise} from '../../src/event-helper'; import {resetScheduledElementForTesting} from '#service/custom-element-registry'; diff --git a/test/unit/test-hidden-observer.js b/test/unit/test-hidden-observer.js index 29ca3e15c30ed..61ee47fdc3188 100644 --- a/test/unit/test-hidden-observer.js +++ b/test/unit/test-hidden-observer.js @@ -14,7 +14,7 @@ * limitations under the License. */ -import {FakeMutationObserver} from '../../testing/fake-dom'; +import {FakeMutationObserver} from '#testing/fake-dom'; import {Services} from '#service'; describes.fakeWin( diff --git a/test/unit/test-iframe-helper.js b/test/unit/test-iframe-helper.js index 062f344ee8c76..90b818c377cf3 100644 --- a/test/unit/test-iframe-helper.js +++ b/test/unit/test-iframe-helper.js @@ -14,7 +14,7 @@ * limitations under the License. */ import * as IframeHelper from '../../src/iframe-helper'; -import {createIframePromise} from '../../testing/iframe'; +import {createIframePromise} from '#testing/iframe'; import {generateSentinel} from '../../src/3p-frame'; describes.sandboxed diff --git a/test/unit/test-iframe-stub.js b/test/unit/test-iframe-stub.js index 6bf11f889648c..54555f076bf80 100644 --- a/test/unit/test-iframe-stub.js +++ b/test/unit/test-iframe-stub.js @@ -14,10 +14,7 @@ * limitations under the License. */ -import { - createIframeWithMessageStub, - expectPostMessage, -} from '../../testing/iframe'; +import {createIframeWithMessageStub, expectPostMessage} from '#testing/iframe'; describes.sandboxed .configure() diff --git a/test/unit/test-impression.js b/test/unit/test-impression.js index 9a3a27cf087a4..2d9c50da344fe 100644 --- a/test/unit/test-impression.js +++ b/test/unit/test-impression.js @@ -26,7 +26,7 @@ import { resetTrackImpressionPromiseForTesting, shouldAppendExtraParams, } from '../../src/impression'; -import {macroTask} from '../../testing/yield'; +import {macroTask} from '#testing/yield'; import {toggleExperiment} from '#experiments'; describes.realWin('impression', {amp: true}, (env) => { diff --git a/test/unit/test-input.js b/test/unit/test-input.js index 9ced9dfbf3952..a1e8bfb663805 100644 --- a/test/unit/test-input.js +++ b/test/unit/test-input.js @@ -16,7 +16,7 @@ import {Input} from '../../src/input'; import {installTimerService} from '#service/timer-impl.js'; -import {stubService} from '../../testing/test-helper'; +import {stubService} from '#testing/test-helper'; describes.sandboxed('Input', {}, (env) => { let clock; diff --git a/test/unit/test-navigation.js b/test/unit/test-navigation.js index d900b9721c4d1..172208b26cc07 100644 --- a/test/unit/test-navigation.js +++ b/test/unit/test-navigation.js @@ -19,7 +19,7 @@ import {Services} from '#service'; import {addParamToUrl} from '../../src/url'; import {createElementWithAttributes} from '#core/dom'; import {installUrlReplacementsServiceForDoc} from '#service/url-replacements-impl'; -import {macroTask} from '../../testing/yield'; +import {macroTask} from '#testing/yield'; import {maybeExpandUrlParamsForTesting} from '#service/navigation'; describes.sandboxed('Navigation', {}, () => { diff --git a/test/unit/test-notification-ui-manager.js b/test/unit/test-notification-ui-manager.js index da9dcbe3f4000..2250884daaf11 100644 --- a/test/unit/test-notification-ui-manager.js +++ b/test/unit/test-notification-ui-manager.js @@ -14,7 +14,7 @@ * limitations under the License. */ import {NotificationUiManager} from '#service/notification-ui-manager'; -import {macroTask} from '../../testing/yield'; +import {macroTask} from '#testing/yield'; describes.realWin('NotificationUiManager', {amp: 1}, (env) => { describe('Notification UI Manager', () => { diff --git a/test/unit/test-position-observer.js b/test/unit/test-position-observer.js index 4f1a5e5d928b9..daff2aa9f0da7 100644 --- a/test/unit/test-position-observer.js +++ b/test/unit/test-position-observer.js @@ -19,7 +19,7 @@ import {PositionObserver} from '#service/position-observer/position-observer-imp import {PositionObserverFidelity} from '#service/position-observer/position-observer-worker'; import {Services} from '#service'; import {layoutRectLtwh} from '#core/math/layout-rect'; -import {macroTask} from '../../testing/yield'; +import {macroTask} from '#testing/yield'; import {setStyles} from '#core/dom/style'; describes.realWin('PositionObserver', {amp: 1}, (env) => { diff --git a/test/unit/test-preconnect.js b/test/unit/test-preconnect.js index e78706e447fbf..9c764ea784810 100644 --- a/test/unit/test-preconnect.js +++ b/test/unit/test-preconnect.js @@ -16,7 +16,7 @@ import * as fakeTimers from '@sinonjs/fake-timers'; import {Services} from '#service'; -import {createIframePromise} from '../../testing/iframe'; +import {createIframePromise} from '#testing/iframe'; import { installPreconnectService, preconnectToOrigin, diff --git a/test/unit/test-render-delaying-services.js b/test/unit/test-render-delaying-services.js index ef9fc7fba567b..08b21be88ee55 100644 --- a/test/unit/test-render-delaying-services.js +++ b/test/unit/test-render-delaying-services.js @@ -16,12 +16,12 @@ import * as fakeTimers from '@sinonjs/fake-timers'; import * as service from '../../src/service-helpers'; -import {createIframePromise} from '../../testing/iframe'; +import {createIframePromise} from '#testing/iframe'; import { hasRenderDelayingServices, waitForServices, } from '../../src/render-delaying-services'; -import {macroTask} from '../../testing/yield'; +import {macroTask} from '#testing/yield'; describes.sandboxed('waitForServices', {}, (env) => { let win; diff --git a/test/unit/test-scheduler.js b/test/unit/test-scheduler.js index 1fedbc28a6edd..a4d3c52e72d16 100644 --- a/test/unit/test-scheduler.js +++ b/test/unit/test-scheduler.js @@ -19,7 +19,7 @@ import {LayoutPriority} from '#core/dom/layout'; import {READY_SCAN_SIGNAL} from '#service/resources-interface'; import {Scheduler} from '#service/scheduler'; import {createElementWithAttributes} from '#core/dom'; -import {installIntersectionObserverStub} from '../../testing/intersection-observer-stub'; +import {installIntersectionObserverStub} from '#testing/intersection-observer-stub'; describes.realWin('Scheduler', {amp: true}, (env) => { let win, doc, ampdoc; diff --git a/test/unit/test-standard-actions.js b/test/unit/test-standard-actions.js index 5f9acef7390a7..d146d95ccd00d 100644 --- a/test/unit/test-standard-actions.js +++ b/test/unit/test-standard-actions.js @@ -24,7 +24,7 @@ import { import {cidServiceForDocForTesting} from '#service/cid-impl'; import {htmlFor} from '#core/dom/static-template'; import {installHistoryServiceForDoc} from '#service/history-impl'; -import {macroTask} from '../../testing/yield'; +import {macroTask} from '#testing/yield'; import {toggle} from '#core/dom/style'; import {user} from '../../src/log'; diff --git a/test/unit/test-style-installer.js b/test/unit/test-style-installer.js index ccd5ca1d9c614..9ea25dfd925bb 100644 --- a/test/unit/test-style-installer.js +++ b/test/unit/test-style-installer.js @@ -22,7 +22,7 @@ import {createShadowRoot} from '../../src/shadow-embed'; import {getStyle} from '#core/dom/style'; import {installPerformanceService} from '#service/performance-impl'; import {installPlatformService} from '#service/platform-impl'; -import {isAnimationNone} from '../../testing/test-helper'; +import {isAnimationNone} from '#testing/test-helper'; import {setShadowDomSupportedVersionForTesting} from '#core/dom/web-components'; describes.sandboxed('Styles', {}, () => { diff --git a/test/unit/test-url-replacements.js b/test/unit/test-url-replacements.js index 8fa6c338c7945..5d49b918a6739 100644 --- a/test/unit/test-url-replacements.js +++ b/test/unit/test-url-replacements.js @@ -24,15 +24,12 @@ import { markElementScheduledForTesting, resetScheduledElementForTesting, } from '#service/custom-element-registry'; -import { - mockWindowInterface, - stubServiceForDoc, -} from '../../testing/test-helper'; +import {mockWindowInterface, stubServiceForDoc} from '#testing/test-helper'; import {Observable} from '#core/data-structures/observable'; import {Services} from '#service'; import {cidServiceForDocForTesting} from '#service/cid-impl'; -import {createIframePromise} from '../../testing/iframe'; +import {createIframePromise} from '#testing/iframe'; import {installActivityServiceForTesting} from '../../extensions/amp-analytics/0.1/activity-impl'; import {installCryptoService} from '#service/crypto-impl'; import {installDocService} from '#service/ampdoc-impl'; diff --git a/test/unit/test-viewer-cid-api.js b/test/unit/test-viewer-cid-api.js index c78e6012b0aff..0139db6e650e7 100644 --- a/test/unit/test-viewer-cid-api.js +++ b/test/unit/test-viewer-cid-api.js @@ -16,7 +16,7 @@ import {ViewerCidApi} from '#service/viewer-cid-api'; import {dict} from '#core/types/object'; -import {mockServiceForDoc} from '../../testing/test-helper'; +import {mockServiceForDoc} from '#testing/test-helper'; describes.realWin('viewerCidApi', {amp: true}, (env) => { let ampdoc; diff --git a/test/unit/test-yield.js b/test/unit/test-yield.js index 4d3207e26944c..94b4d0984891f 100644 --- a/test/unit/test-yield.js +++ b/test/unit/test-yield.js @@ -14,7 +14,7 @@ * limitations under the License. */ import * as fakeTimers from '@sinonjs/fake-timers'; -import {macroTask} from '../../testing/yield'; +import {macroTask} from '#testing/yield'; describes.realWin('yield', {}, (env) => { let win; diff --git a/test/unit/url-expander/test-expander.js b/test/unit/url-expander/test-expander.js index e195f2ce8e6d6..e0f591bd73fdf 100644 --- a/test/unit/url-expander/test-expander.js +++ b/test/unit/url-expander/test-expander.js @@ -16,7 +16,7 @@ import {Expander} from '#service/url-expander/expander'; import {GlobalVariableSource} from '#service/url-replacements-impl'; -import {macroTask} from '../../../testing/yield'; +import {macroTask} from '#testing/yield'; describes.realWin( 'Expander', diff --git a/test/unit/utils/test-dom-transform-stream.js b/test/unit/utils/test-dom-transform-stream.js index 88fb5752a8673..6ceee571e481c 100644 --- a/test/unit/utils/test-dom-transform-stream.js +++ b/test/unit/utils/test-dom-transform-stream.js @@ -15,7 +15,7 @@ */ import {DomTransformStream} from '../../../src/utils/dom-tranform-stream'; -import {macroTask} from '../../../testing/yield'; +import {macroTask} from '#testing/yield'; describes.fakeWin('DomTransformStream', {amp: true}, (env) => { async function flush() {