♻️ Organize polyfills in prep for type-checking and core extraction (#…

…34020) * Move rest of polyfills unit tests to test/unit/polyfills * Move polyfill stubs into polyfills/stubs and update imports * Revert debugging change
ampproject · Apr 26, 2021 · 4f69d04 · 4f69d04
1 parent 4cf3aac
commit 4f69d04
Show file tree

Hide file tree

Showing 19 changed files with 34 additions and 38 deletions.
diff --git a/build-system/test-configs/dep-check-config.js b/build-system/test-configs/dep-check-config.js
@@ -428,32 +428,32 @@ exports.rules = [
     mustNotDependOn: 'src/base-element.js',
   },
   {
-    filesMatching: 'src/polyfills/**/*.js',
+    filesMatching: 'src/polyfills/*.js',
     mustNotDependOn: '**/*.js',
     allowlist: [
       'src/polyfills/fetch.js->src/log.js',
       'src/polyfills/fetch.js->src/json.js',
       'src/polyfills/fetch.js->src/core/types/index.js',
       'src/polyfills/fetch.js->src/core/types/object.js',
       'src/polyfills/fetch.js->src/utils/bytes.js',
-      'src/polyfills/intersection-observer.js->src/polyfillstub/intersection-observer-stub.js',
-      'src/polyfills/resize-observer.js->src/polyfillstub/resize-observer-stub.js',
+      'src/polyfills/intersection-observer.js->src/polyfills/stubs/intersection-observer-stub.js',
+      'src/polyfills/resize-observer.js->src/polyfills/stubs/resize-observer-stub.js',
       'src/polyfills/custom-elements.js->src/resolved-promise.js',
     ],
   },
   {
-    filesMatching: 'src/polyfillstub/**/*.js',
+    filesMatching: 'src/polyfills/stubs/**/*.js',
     mustNotDependOn: '**/*.js',
     allowlist: [
-      'src/polyfillstub/intersection-observer-stub.js->src/services.js',
-      'src/polyfillstub/intersection-observer-stub.js->src/resolved-promise.js',
-      'src/polyfillstub/resize-observer-stub.js->src/services.js',
-      'src/polyfillstub/resize-observer-stub.js->src/resolved-promise.js',
+      'src/polyfills/stubs/intersection-observer-stub.js->src/services.js',
+      'src/polyfills/stubs/intersection-observer-stub.js->src/resolved-promise.js',
+      'src/polyfills/stubs/resize-observer-stub.js->src/services.js',
+      'src/polyfills/stubs/resize-observer-stub.js->src/resolved-promise.js',
     ],
   },
   {
     filesMatching: '**/*.js',
-    mustNotDependOn: 'src/polyfills/**/*.js',
+    mustNotDependOn: 'src/polyfills/*.js',
     allowlist: [
       // DO NOT add extensions/ files
       '3p/polyfills.js->src/polyfills/math-sign.js',

diff --git a/build-system/test-configs/forbidden-terms.js b/build-system/test-configs/forbidden-terms.js
@@ -804,10 +804,6 @@ const forbiddenTermsGlobal = {
       'test/unit/test-mustache.js',
       'test/unit/test-pass.js',
       'test/unit/test-platform.js',
-      'test/unit/test-polyfill-document-contains.js',
-      'test/unit/test-polyfill-math-sign.js',
-      'test/unit/test-polyfill-object-assign.js',
-      'test/unit/test-polyfill-object-values.js',
       'test/unit/test-pull-to-refresh.js',
       'test/unit/test-purifier.js',
       'test/unit/test-render-delaying-services.js',
@@ -954,8 +950,8 @@ const forbiddenTermsSrcInclusive = {
     message: bannedTermsHelpString,
     allowlist: [
       'src/friendly-iframe-embed.js',
-      'src/polyfillstub/intersection-observer-stub.js',
-      'src/polyfillstub/resize-observer-stub.js',
+      'src/polyfills/stubs/intersection-observer-stub.js',
+      'src/polyfills/stubs/resize-observer-stub.js',
       'src/service/extensions-impl.js',
       'src/service/crypto-impl.js',
     ],

diff --git a/extensions/amp-intersection-observer-polyfill/0.1/amp-intersection-observer-polyfill.js b/extensions/amp-intersection-observer-polyfill/0.1/amp-intersection-observer-polyfill.js
@@ -17,7 +17,7 @@
 import {installIntersectionObserver} from 'intersection-observer/intersection-observer.install';
 import {maybeSetupCrossOriginObserver} from './cross-origin-observer';
 import {registerServiceBuilder} from '../../../src/service';
-import {upgradePolyfill} from '../../../src/polyfillstub/intersection-observer-stub';
+import {upgradePolyfill} from '../../../src/polyfills/stubs/intersection-observer-stub';
 
 const TAG = 'amp-intersection-observer-polyfill';
 

diff --git a/extensions/amp-resize-observer-polyfill/0.1/amp-resize-observer-polyfill.js b/extensions/amp-resize-observer-polyfill/0.1/amp-resize-observer-polyfill.js
@@ -16,7 +16,7 @@
 
 import {installResizeObserver} from '../../../third_party/resize-observer-polyfill/ResizeObserver.install';
 import {registerServiceBuilder} from '../../../src/service';
-import {upgradePolyfill} from '../../../src/polyfillstub/resize-observer-stub';
+import {upgradePolyfill} from '../../../src/polyfills/stubs/resize-observer-stub';
 
 const TAG = 'amp-resize-observer-polyfill';
 

diff --git a/extensions/amp-resize-observer-polyfill/0.1/test/test-amp-resize-observer-polyfill.js b/extensions/amp-resize-observer-polyfill/0.1/test/test-amp-resize-observer-polyfill.js
@@ -17,7 +17,7 @@
 import {
   ResizeObserverStub,
   installStub,
-} from '../../../../src/polyfillstub/resize-observer-stub';
+} from '../../../../src/polyfills/stubs/resize-observer-stub';
 import {upgradeResizeObserverPolyfill} from '../amp-resize-observer-polyfill';
 
 describes.realWin('amp-resize-observer-polyfill', {amp: false}, (env) => {

diff --git a/src/polyfills/intersection-observer.js b/src/polyfills/intersection-observer.js
@@ -22,7 +22,7 @@
 import {
   installStub,
   shouldLoadPolyfill,
-} from '../polyfillstub/intersection-observer-stub';
+} from '../polyfills/stubs/intersection-observer-stub';
 
 /**
  * Installs the IntersectionObserver polyfill. There are a few different modes of operation.

diff --git a/src/polyfills/resize-observer.js b/src/polyfills/resize-observer.js
@@ -22,7 +22,7 @@
 import {
   installStub,
   shouldLoadPolyfill,
-} from '../polyfillstub/resize-observer-stub';
+} from '../polyfills/stubs/resize-observer-stub';
 
 /**
  * Installs the ResizeObserver polyfill. There are a few different modes of

diff --git a/...olyfillstub/intersection-observer-stub.js → ...fills/stubs/intersection-observer-stub.js b/...olyfillstub/intersection-observer-stub.js → ...fills/stubs/intersection-observer-stub.js
@@ -23,7 +23,7 @@
  * amp-intersection-observer-polyfill extension.
  */
 
-import {Services} from '../services';
+import {Services} from '../../services';
 
 const UPGRADERS = '_upgraders';
 const NATIVE = '_native';

diff --git a/src/polyfillstub/resize-observer-stub.js → src/polyfills/stubs/resize-observer-stub.js b/src/polyfillstub/resize-observer-stub.js → src/polyfills/stubs/resize-observer-stub.js
@@ -23,7 +23,7 @@
  * amp-resize-observer-polyfill extension.
  */
 
-import {Services} from '../services';
+import {Services} from '../../services';
 
 const UPGRADERS = '_upgraders';
 const STUB = '_stub';

diff --git a/src/runtime.js b/src/runtime.js
@@ -40,8 +40,8 @@ import {
 import {internalRuntimeVersion} from './internal-version';
 import {isExperimentOn, toggleExperiment} from './experiments';
 import {reportErrorForWin} from './error-reporting';
-import {scheduleUpgradeIfNeeded as scheduleInObUpgradeIfNeeded} from './polyfillstub/intersection-observer-stub';
-import {scheduleUpgradeIfNeeded as scheduleResObUpgradeIfNeeded} from './polyfillstub/resize-observer-stub';
+import {scheduleUpgradeIfNeeded as scheduleInObUpgradeIfNeeded} from './polyfills/stubs/intersection-observer-stub';
+import {scheduleUpgradeIfNeeded as scheduleResObUpgradeIfNeeded} from './polyfills/stubs/resize-observer-stub';
 import {setStyle} from './style';
 import {startupChunk} from './chunk';
 import {stubElementsForDoc} from './service/custom-element-registry';

diff --git a/test/unit/test-polyfill-array-includes.js → test/unit/polyfills/test-array-includes.js b/test/unit/test-polyfill-array-includes.js → test/unit/polyfills/test-array-includes.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {install} from '../../src/polyfills/array-includes';
+import {install} from '../src/polyfills/array-includes';
 
 describes.fakeWin('Array.includes', {}, (env) => {
   beforeEach(() => {

diff --git a/test/unit/test-polyfill-custom-elements.js → test/unit/polyfills/test-custom-elements.js b/test/unit/test-polyfill-custom-elements.js → test/unit/polyfills/test-custom-elements.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {copyProperties, install} from '../../src/polyfills/custom-elements';
+import {copyProperties, install} from '../src/polyfills/custom-elements';
 
 describes.realWin(
   'install patches',

diff --git a/test/unit/test-polyfill-document-contains.js → .../unit/polyfills/test-document-contains.js b/test/unit/test-polyfill-document-contains.js → .../unit/polyfills/test-document-contains.js
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import {install} from '../../src/polyfills/document-contains';
+import {install} from '../src/polyfills/document-contains';
 
-describe('HTMLDocument.contains', () => {
+describes.sandboxed('HTMLDocument.contains', {}, () => {
   let fakeWinWithContains;
   let fakeWinWithoutContains;
   let nativeContains;

diff --git a/...unit/test-polyfill-domtokenlist-toggle.js → ...nit/polyfills/test-domtokenlist-toggle.js b/...unit/test-polyfill-domtokenlist-toggle.js → ...nit/polyfills/test-domtokenlist-toggle.js
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-import {install} from '../../src/polyfills/domtokenlist';
-import {toArray} from '../../src/core/types/array';
+import {install} from '../src/polyfills/domtokenlist';
+import {toArray} from '../src/core/types/array';
 
 describes.fakeWin(
   'DOMTokenList.toggle/add on non-IE',

diff --git a/test/unit/polyfills/test-intersection-observer.js b/test/unit/polyfills/test-intersection-observer.js
@@ -20,7 +20,7 @@ import {
   resetStubsForTesting,
   shouldLoadPolyfill,
   upgradePolyfill,
-} from '../../../src/polyfillstub/intersection-observer-stub';
+} from '../../../src/polyfills/stubs/intersection-observer-stub';
 import {Services} from '../../../src/services';
 import {
   install,

diff --git a/test/unit/test-polyfill-math-sign.js → test/unit/polyfills/test-math-sign.js b/test/unit/test-polyfill-math-sign.js → test/unit/polyfills/test-math-sign.js
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import {sign} from '../../src/polyfills/math-sign';
+import {sign} from '../src/polyfills/math-sign';
 
-describe('Math.sign', () => {
+describes.sandboxed('Math.sign', {}, () => {
   it('returns 1 for positive x', () => {
     expect(sign(1)).to.equal(1);
     expect(sign(10)).to.equal(1);

diff --git a/test/unit/test-polyfill-object-assign.js → test/unit/polyfills/test-object-assign.js b/test/unit/test-polyfill-object-assign.js → test/unit/polyfills/test-object-assign.js
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import {assign} from '../../src/polyfills/object-assign';
+import {assign} from '../src/polyfills/object-assign';
 
-describe('Object.assign', () => {
+describes.sandboxed('Object.assign', {}, () => {
   it('should throw an error if target is null or undefined', () => {
     expect(() => assign(null, {a: 1})).to.throw(
       /Cannot convert undefined or null to object/

diff --git a/test/unit/test-polyfill-object-values.js → test/unit/polyfills/test-object-values.js b/test/unit/test-polyfill-object-values.js → test/unit/polyfills/test-object-values.js
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import {values} from '../../src/polyfills/object-values';
+import {values} from '../src/polyfills/object-values';
 
-describe('Object.values', () => {
+describes.sandboxed('Object.values', {}, () => {
   it('should disallow null and undefined', () => {
     expect(() => values(null)).to.throw();
     expect(() => values(undefined)).to.throw();

diff --git a/test/unit/polyfills/test-resize-observer.js b/test/unit/polyfills/test-resize-observer.js
@@ -20,7 +20,7 @@ import {
   resetStubsForTesting,
   shouldLoadPolyfill,
   upgradePolyfill,
-} from '../../../src/polyfillstub/resize-observer-stub';
+} from '../../../src/polyfills/stubs/resize-observer-stub';
 import {
   install,
   installForChildWin,