🏗 Enable import/order eslint rule in test/ and testing/ (#35601)

* Enable import/order throughout test+testing * Autofix test/ * Autofix testing/
ampproject · Aug 10, 2021 · 0587fd2 · 0587fd2
1 parent 7dc536f
commit 0587fd2
Show file tree

Hide file tree

Showing 162 changed files with 664 additions and 387 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -462,7 +462,7 @@ module.exports = {
       },
     },
     {
-      'files': ['3p/**/*.js', 'src/**/*.js'],
+      'files': ['3p/**/*.js', 'src/**/*.js', 'test/**/*.js', 'testing/**/*.js'],
       'rules': {'import/order': 2},
     },
   ],

diff --git a/test/e2e/test-controller-promise.js b/test/e2e/test-controller-promise.js
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-import {ControllerPromise} from '../../build-system/tasks/e2e/controller-promise';
 import sinon from /*OK*/ 'sinon';
 
+import {ControllerPromise} from '../../build-system/tasks/e2e/controller-promise';
+
 /**
  * This is a unit test that is located with the E2E tests because it
  * only tests the E2E features itself. It is not written like other E2E tests

diff --git a/test/integration/builtins/test-amp-img.js b/test/integration/builtins/test-amp-img.js
@@ -15,13 +15,15 @@
  */
 
 import {AmpEvents} from '#core/constants/amp-events';
-import {createCustomEvent} from '../../../src/event-helper';
+
 import {
   createFixtureIframe,
   expectBodyToBecomeVisible,
   poll,
 } from '#testing/iframe';
 
+import {createCustomEvent} from '../../../src/event-helper';
+
 describes.sandboxed
   .configure()
   .enableIe()

diff --git a/test/integration/builtins/test-amp-pixel.js b/test/integration/builtins/test-amp-pixel.js
@@ -15,9 +15,11 @@
  */
 
 import {AmpPixel} from '#builtins/amp-pixel/amp-pixel';
-import {BrowserController, RequestBank} from '#testing/test-helper';
+
 import {createElementWithAttributes} from '#core/dom';
 
+import {BrowserController, RequestBank} from '#testing/test-helper';
+
 describes.sandboxed('amp-pixel', {}, function () {
   describes.integration(
     'amp-pixel macro integration test',

diff --git 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';
+import {BrowserController} from '#testing/test-helper';
 
 describes.integration(
   'on="..."',

diff --git a/test/integration/test-amp-ad-3p.js b/test/integration/test-amp-ad-3p.js
@@ -14,13 +14,17 @@
  * limitations under the License.
  */
 
+import {layoutRectLtwh} from '#core/dom/layout/rect';
+
+import {forceExperimentBranch} from '#experiments';
 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 {forceExperimentBranch} from '#experiments';
 import {installPlatformService} from '#service/platform-impl';
-import {layoutRectLtwh} from '#core/dom/layout/rect';
+
+import {createFixtureIframe, poll} from '#testing/iframe';
+
+import {createCustomEvent} from '../../src/event-helper';
 
 const IFRAME_HEIGHT = 3000;
 function createFixture() {

diff --git a/test/integration/test-amp-analytics.js b/test/integration/test-amp-analytics.js
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-import {BrowserController, RequestBank} from '#testing/test-helper';
 import {parseQueryString} from '#core/types/string/url';
 
+import {BrowserController, RequestBank} from '#testing/test-helper';
+
 // TODO(wg-analytics): These tests time out on Firefox and Safari.
 describes.sandboxed
   .configure()

diff --git 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';
 
 const TIMEOUT = 10000;
 

diff --git a/test/integration/test-amp-carousel.js b/test/integration/test-amp-carousel.js
@@ -15,6 +15,7 @@
  */
 
 import {CommonSignals} from '#core/constants/common-signals';
+
 import {whenUpgradedToCustomElement} from '../../src/amp-element-helpers';
 
 const t = describes.sandboxed.configure().ifChrome();

diff --git a/test/integration/test-amp-recaptcha-input.js b/test/integration/test-amp-recaptcha-input.js
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-import {BrowserController, RequestBank} from '#testing/test-helper';
 import {Deferred} from '#core/data-structures/promise';
+
 import {poll} from '#testing/iframe';
+import {BrowserController, RequestBank} from '#testing/test-helper';
 
 // 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
@@ -14,9 +14,11 @@
  * limitations under the License.
  */
 
+import {parseQueryString} from '#core/types/string/url';
+
 import {BrowserController, RequestBank} from '#testing/test-helper';
+
 import {PLATFORM_NAME} from '../../extensions/amp-skimlinks/0.1/constants';
-import {parseQueryString} from '#core/types/string/url';
 
 // Create fake test urls to replace skimlinks API urls.
 // RequestBank allow us to check if an API request has been made

diff --git a/test/integration/test-amp-story-analytics.js b/test/integration/test-amp-story-analytics.js
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-import {BrowserController, RequestBank} from '#testing/test-helper';
 import {parseQueryString} from '#core/types/string/url';
 
+import {BrowserController, RequestBank} from '#testing/test-helper';
+
 const config = describes.sandboxed.configure().skipEdge().skipSafari();
 
 config.run('amp-story analytics', {}, () => {

diff --git a/test/integration/test-amphtml-ads.js b/test/integration/test-amphtml-ads.js
@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
-import {RequestBank} from '#testing/test-helper';
-import {maybeSwitchToCompiledJs} from '#testing/iframe';
 import {parseQueryString} from '#core/types/string/url';
+
 import {xhrServiceForTesting} from '#service/xhr-impl';
 
+import {maybeSwitchToCompiledJs} from '#testing/iframe';
+import {RequestBank} from '#testing/test-helper';
+
 // TODO(wg-monetization, #29112): Unskip on Safari.
 const t = describes.sandboxed.configure().skipSafari();
 

diff --git a/test/integration/test-boilerplates.js b/test/integration/test-boilerplates.js
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-import {createFixtureIframe, expectBodyToBecomeVisible} from '#testing/iframe';
 import {getStyle} from '#core/dom/style';
+
+import {createFixtureIframe, expectBodyToBecomeVisible} from '#testing/iframe';
 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
@@ -15,6 +15,7 @@
  */
 
 import {AmpEvents} from '#core/constants/amp-events';
+
 import {createFixtureIframe} from '#testing/iframe';
 
 describes.sandboxed('Configuration', {}, function () {

diff --git a/test/integration/test-css.js b/test/integration/test-css.js
@@ -16,6 +16,7 @@
 
 import {AmpEvents} from '#core/constants/amp-events';
 import {computedStyle} from '#core/dom/style';
+
 import {createFixtureIframe, expectBodyToBecomeVisible} from '#testing/iframe';
 
 describes.sandboxed.configure().run('CSS', {}, () => {

diff --git a/test/integration/test-double-loading.js b/test/integration/test-double-loading.js
@@ -15,6 +15,7 @@
  */
 
 import {AmpEvents} from '#core/constants/amp-events';
+
 import {createFixtureIframe} from '#testing/iframe';
 
 function checkElementUpgrade(element) {

diff --git a/test/integration/test-extensions-loading.js b/test/integration/test-extensions-loading.js
@@ -15,6 +15,7 @@
  */
 
 import {AmpEvents} from '#core/constants/amp-events';
+
 import {createFixtureIframe} from '#testing/iframe';
 
 // Checks if an amp element gets upgraded.

diff --git a/test/integration/test-shadow-dom-element.js b/test/integration/test-shadow-dom-element.js
@@ -14,8 +14,10 @@
  * limitations under the License.
  */
 
-import {createFixtureIframe} from '#testing/iframe';
 import {toggleExperiment} from '#experiments';
+
+import {createFixtureIframe} from '#testing/iframe';
+
 import {whenUpgradedToCustomElement} from '../../src/amp-element-helpers';
 
 describes.sandboxed

diff --git a/test/integration/test-toggle-display.js b/test/integration/test-toggle-display.js
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-import {BrowserController} from '#testing/test-helper';
 import {setInitialDisplay, toggle} from '#core/dom/style';
 
+import {BrowserController} from '#testing/test-helper';
+
 describes.integration
   .configure()
   .enableIe()

diff --git a/test/integration/test-video-manager.js b/test/integration/test-video-manager.js
@@ -14,16 +14,19 @@
  * limitations under the License.
  */
 
-import {PlayingStates, VideoEvents} from '../../src/video-interface';
-import {Services} from '#service';
 import {dispatchCustomEvent, waitForChildPromise} from '#core/dom';
-import {installVideoManagerForDoc} from '#service/video-manager-impl';
-import {isAutoplaySupported, resetIsAutoplaySupported} from '#core/dom/video';
 import {isLayoutSizeDefined} from '#core/dom/layout';
-import {listenOncePromise} from '../../src/event-helper';
-import {runVideoPlayerIntegrationTests} from './test-video-players-helper';
+import {isAutoplaySupported, resetIsAutoplaySupported} from '#core/dom/video';
 import {toArray} from '#core/types/array';
 
+import {Services} from '#service';
+import {installVideoManagerForDoc} from '#service/video-manager-impl';
+
+import {runVideoPlayerIntegrationTests} from './test-video-players-helper';
+
+import {listenOncePromise} from '../../src/event-helper';
+import {PlayingStates, VideoEvents} from '../../src/video-interface';
+
 // TODO(dvoytenko): These tests time out when run with the prod AMP config.
 // See #11588.
 describes.sandboxed

diff --git a/test/integration/test-video-players-helper.js b/test/integration/test-video-players-helper.js
@@ -14,21 +14,25 @@
  * limitations under the License.
  */
 
+import {removeElement} from '#core/dom';
+import {detectIsAutoplaySupported} from '#core/dom/video';
+
+import {toggleExperiment} from '#experiments';
+
 import {Services} from '#service';
-import {
-  VideoAnalyticsEvents,
-  VideoEvents,
-  VideoInterface,
-} from '../../src/video-interface';
+
 import {
   createFixtureIframe,
   expectBodyToBecomeVisible,
   poll,
 } from '#testing/iframe';
-import {detectIsAutoplaySupported} from '#core/dom/video';
+
 import {getData, listenOncePromise} from '../../src/event-helper';
-import {removeElement} from '#core/dom';
-import {toggleExperiment} from '#experiments';
+import {
+  VideoAnalyticsEvents,
+  VideoEvents,
+  VideoInterface,
+} from '../../src/video-interface';
 
 function skipIfAutoplayUnsupported(win) {
   return detectIsAutoplaySupported(win).then((isSupported) => {

diff --git a/test/integration/test-visibility-states.js b/test/integration/test-visibility-states.js
@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
-import {Services} from '#service';
 import {VisibilityState} from '#core/constants/visibility-state';
-import {createCustomEvent} from '../../src/event-helper';
 import {getVendorJsPropertyName} from '#core/dom/style';
+
+import {Services} from '#service';
+
 import {whenUpgradedToCustomElement} from '../../src/amp-element-helpers';
+import {createCustomEvent} from '../../src/event-helper';
 
 const t = describes.sandboxed
   .configure()

diff --git a/test/unit/3p/test-3p-frame.js b/test/unit/3p/test-3p-frame.js
@@ -15,8 +15,12 @@
  */
 
 import {DomFingerprint} from '#core/dom/fingerprint';
-import {Services} from '#service';
 import {WindowInterface} from '#core/window/interface';
+
+import {toggleExperiment} from '#experiments';
+
+import {Services} from '#service';
+
 import {
   addDataAndJsonAttributes_,
   applySandbox,
@@ -33,7 +37,6 @@ import {
   serializeMessage,
 } from '../../../src/3p-frame-messaging';
 import {dev} from '../../../src/log';
-import {toggleExperiment} from '#experiments';
 
 describes.realWin('3p-frame', {amp: true}, (env) => {
   let window, document;

diff --git a/test/unit/3p/test-3p-messaging.js b/test/unit/3p/test-3p-messaging.js
@@ -16,9 +16,12 @@
 
 /* eslint-disable import/no-deprecated */
 
+import {listenParent} from '#3p/messaging';
+
 import {Services} from '#service';
+
 import {createIframePromise} from '#testing/iframe';
-import {listenParent} from '#3p/messaging';
+
 import {postMessage} from '../../../src/iframe-helper';
 
 describes.sandboxed('3p messaging', {}, () => {

diff --git a/test/unit/3p/test-iframe-messaging-client.js b/test/unit/3p/test-iframe-messaging-client.js
@@ -15,6 +15,7 @@
  */
 
 import {IframeMessagingClient} from '#3p/iframe-messaging-client';
+
 import {serializeMessage} from '../../../src/3p-frame-messaging';
 
 describes.realWin('iframe-messaging-client', {}, (env) => {

diff --git a/test/unit/3p/test-recaptcha.js b/test/unit/3p/test-recaptcha.js
@@ -15,8 +15,9 @@
  */
 
 import {doesOriginDomainMatchIframeSrc, initRecaptcha} from '#3p/recaptcha';
-import {parseUrlDeprecated} from '../../../src/url';
+
 import {urls} from '../../../src/config';
+import {parseUrlDeprecated} from '../../../src/url';
 
 describes.sandboxed('3p recaptcha.js', {}, () => {
   it('should require a window.name', () => {

diff --git a/test/unit/ads/test-adplugg.js b/test/unit/ads/test-adplugg.js
@@ -15,6 +15,7 @@
  */
 
 import {adplugg} from '#ads/vendors/adplugg';
+
 import {createIframePromise} from '#testing/iframe';
 
 describes.fakeWin('amp-ad-adplugg-impl', {}, (env) => {

diff --git a/test/unit/ads/test-aduptech.js b/test/unit/ads/test-aduptech.js
@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 import * as _3p from '#3p/3p';
+
 import {
   ADUPTECH_API_URL,
   ADUPTECH_ELEMENT_ID,
   aduptech,
 } from '#ads/vendors/aduptech';
+
 import {createIframePromise} from '#testing/iframe';
 
 describes.fakeWin('amp-ad-aduptech-impl', {}, (env) => {