Skip to content

Commit

Permalink
autofix
Browse files Browse the repository at this point in the history
  • Loading branch information
rcebulko committed Jun 15, 2021
1 parent e22b426 commit 25b9f58
Show file tree
Hide file tree
Showing 179 changed files with 209 additions and 233 deletions.
2 changes: 1 addition & 1 deletion ads/google/a4a/test/test-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-3d-gltf/0.1/test/test-amp-3d-gltf.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

import '../amp-3d-gltf';
import {createIframeWithMessageStub} from '../../../../testing/iframe';
import {createIframeWithMessageStub} from '#testing/iframe';

describes.realWin(
'amp-3d-gltf',
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-3q-player/0.1/test/test-amp-3q-player.js
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-a4a/0.1/test/test-a4a-integration.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-a4a/0.1/test/test-a4a-var-source.js
Original file line number Diff line number Diff line change
Expand Up @@ -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', {}, () => {
Expand Down
4 changes: 2 additions & 2 deletions extensions/amp-a4a/0.1/test/test-amp-a4a.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ 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,
is3pThrottled,
} 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';
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-accordion/0.1/test/test-amp-accordion.js
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-accordion/1.0/test/test-amp-accordion.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-accordion/1.0/test/test-component.js
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-ad/0.1/test/test-amp-ad-3p-impl.js
Original file line number Diff line number Diff line change
Expand Up @@ -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', {
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-ad/0.1/test/test-amp-ad-ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-ad/0.1/test/test-amp-ad.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-ad/0.1/test/test-concurrent-load.js
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {
Expand Down
7 changes: 2 additions & 5 deletions extensions/amp-analytics/0.1/test/test-amp-analytics.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-analytics/0.1/test/test-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-analytics/0.1/test/test-cookie-writer.js
Original file line number Diff line number Diff line change
Expand Up @@ -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]';

Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-analytics/0.1/test/test-events.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-analytics/0.1/test/test-iframe-transport.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-analytics/0.1/test/test-linker-manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-analytics/0.1/test/test-linker-reader.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-analytics/0.1/test/test-linker.js
Original file line number Diff line number Diff line change
Expand Up @@ -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]';

Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-analytics/0.1/test/test-requests.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 1 addition & 4 deletions extensions/amp-analytics/0.1/test/test-transport.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
7 changes: 2 additions & 5 deletions extensions/amp-analytics/0.1/test/test-vendors.js
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-animation/0.1/test/test-web-animations.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-brightcove/0.1/test/test-amp-brightcove.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-carousel/0.1/test/test-slidescroll.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-consent/0.1/test/test-amp-consent.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions extensions/amp-consent/0.1/test/test-consent-ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-consent/0.1/test/test-linker-reader.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-consent/0.1/test/test-linker.js
Original file line number Diff line number Diff line change
Expand Up @@ -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]';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Loading

0 comments on commit 25b9f58

Please sign in to comment.