Validator rollup (#16972)

* cl/205296221 Add validator test for amp-anim. * cl/205299294 Minor cleanup to recent test addition * cl/205299388 Add validator test for amp-yotpo. * cl/205300941 Rename ExtensionSpec.allowed_versions * cl/205304241 Add validator test for amp-dynamic-cs * Fix lint errors. * More lint fix * Fix test after #16954
ampproject · Jul 20, 2018 · f34a8b5 · f34a8b5
1 parent caf1f10
commit f34a8b5
Show file tree

Hide file tree

Showing 106 changed files with 631 additions and 230 deletions.
diff --git a/extensions/amp-3d-gltf/validator-amp-3d-gltf.protoascii b/extensions/amp-3d-gltf/validator-amp-3d-gltf.protoascii
@@ -19,8 +19,8 @@ tags: {  # amp-3d-gltf
   tag_name: "SCRIPT"
   extension_spec: {
     name: "amp-3d-gltf"
-    allowed_versions: "0.1"
-    allowed_versions: "latest"
+    version: "0.1"
+    version: "latest"
   }
   attr_lists: "common-extension-attrs"
 }

diff --git a/extensions/amp-3q-player/validator-amp-3q-player.protoascii b/extensions/amp-3q-player/validator-amp-3q-player.protoascii
@@ -19,8 +19,8 @@ tags: {  # amp-3q-player
   tag_name: "SCRIPT"
   extension_spec: {
     name: "amp-3q-player"
-    allowed_versions: "0.1"
-    allowed_versions: "latest"
+    version: "0.1"
+    version: "latest"
   }
   attr_lists: "common-extension-attrs"
 }

diff --git a/extensions/amp-access-laterpay/validator-amp-access-laterpay.protoascii b/extensions/amp-access-laterpay/validator-amp-access-laterpay.protoascii
@@ -20,9 +20,9 @@ tags: {  # amp-access-laterpay
   requires_extension: "amp-access"
   extension_spec: {
     name: "amp-access-laterpay"
-    allowed_versions: "0.1"
-    allowed_versions: "0.2"
-    allowed_versions: "latest"
+    version: "0.1"
+    version: "0.2"
+    version: "latest"
     requires_usage: NONE
   }
   attr_lists: "common-extension-attrs"

diff --git a/extensions/amp-access-scroll/validator-amp-access-scroll.protoascii b/extensions/amp-access-scroll/validator-amp-access-scroll.protoascii
@@ -20,8 +20,8 @@ tags: {  # amp-access-scroll
   requires_extension: "amp-access"
   extension_spec: {
     name: "amp-access-scroll"
-    allowed_versions: "0.1"
-    allowed_versions: "latest"
+    version: "0.1"
+    version: "latest"
     requires_usage: NONE
   }
   attr_lists: "common-extension-attrs"

diff --git a/extensions/amp-access/validator-amp-access.protoascii b/extensions/amp-access/validator-amp-access.protoascii
@@ -18,8 +18,8 @@ tags: {  # amp-access
   tag_name: "SCRIPT"
   extension_spec: {
     name: "amp-access"
-    allowed_versions: "0.1"
-    allowed_versions: "latest"
+    version: "0.1"
+    version: "latest"
     requires_usage: GRANDFATHERED
     deprecated_allow_duplicates: true
   }

diff --git a/extensions/amp-accordion/validator-amp-accordion.protoascii b/extensions/amp-accordion/validator-amp-accordion.protoascii
@@ -21,8 +21,8 @@ tags: {  # amp-accordion
   tag_name: "SCRIPT"
   extension_spec: {
     name: "amp-accordion"
-    allowed_versions: "0.1"
-    allowed_versions: "latest"
+    version: "0.1"
+    version: "latest"
     requires_usage: GRANDFATHERED
     deprecated_allow_duplicates: true
   }

diff --git a/extensions/amp-ad-exit/validator-amp-ad-exit.protoascii b/extensions/amp-ad-exit/validator-amp-ad-exit.protoascii
@@ -19,8 +19,8 @@ tags: {  # amp-ad-exit
   tag_name: "SCRIPT"
   extension_spec {
     name: "amp-ad-exit"
-    allowed_versions: "0.1"
-    allowed_versions: "latest"
+    version: "0.1"
+    version: "latest"
   }
   attr_lists: "common-extension-attrs"
 }

diff --git a/extensions/amp-ad/validator-amp-ad.protoascii b/extensions/amp-ad/validator-amp-ad.protoascii
@@ -36,8 +36,8 @@ tags: {  # amp-ad
   spec_name: "amp-ad extension .js script"
   extension_spec: {
     name: "amp-ad"
-    allowed_versions: "0.1"
-    allowed_versions: "latest"
+    version: "0.1"
+    version: "latest"
     requires_usage: GRANDFATHERED
     deprecated_allow_duplicates: true
   }

diff --git a/extensions/amp-addthis/validator-amp-addthis.protoascii b/extensions/amp-addthis/validator-amp-addthis.protoascii
@@ -18,8 +18,8 @@ tags: {  # amp-addthis
   html_format: AMP
   tag_name: "SCRIPT"
   extension_spec: {
-    allowed_versions: "0.1"
-    allowed_versions: "latest"
+    version: "0.1"
+    version: "latest"
     name: "amp-addthis"
   }
   attr_lists: "common-extension-attrs"

diff --git a/extensions/amp-analytics/validator-amp-analytics.protoascii b/extensions/amp-analytics/validator-amp-analytics.protoascii
@@ -22,8 +22,8 @@ tags: {  # amp-analytics
   tag_name: "SCRIPT"
   extension_spec: {
     name: "amp-analytics"
-    allowed_versions: "0.1"
-    allowed_versions: "latest"
+    version: "0.1"
+    version: "latest"
     requires_usage: NONE
     deprecated_allow_duplicates: true
   }

diff --git a/extensions/amp-anim/0.1/test/validator-amp-anim.html b/extensions/amp-anim/0.1/test/validator-amp-anim.html
@@ -0,0 +1,64 @@
+<!--
+  Copyright 2018 The AMP HTML Authors. All Rights Reserved.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS-IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the license.
+-->
+<!--
+  Test Description:
+  Tests for the amp-anim tag. See the inline comments.
+-->
+<!doctype html>
+<html ⚡>
+<head>
+  <meta charset="utf-8">
+  <link rel="canonical" href="./regular-html-version.html">
+  <meta name="viewport" content="width=device-width,minimum-scale=1">
+  <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+  <script async custom-element="amp-anim" src="https://cdn.ampproject.org/v0/amp-anim-latest.js"></script>
+  <script async src="https://cdn.ampproject.org/v0.js"></script>
+</head>
+<body>
+  <!-- Valid: Runtime-managed animated image. -->
+  <amp-anim
+    layout="responsive"
+    height="300"
+    width="400"
+    src="lemur.gif">
+  </amp-anim>
+
+  <!-- Valid: Runtime-managed animated image with optional attributes. -->
+  <amp-anim
+    alt="Lemurs"
+    attribution="National Geographic Channel"
+    layout="responsive"
+    height="300"
+    width="400"
+    src="lemur.gif">
+  </amp-anim>
+
+  <!-- Invalid: Missing src attribute. -->
+  <amp-anim
+    layout="responsive"
+    height="300"
+    width="400">
+  </amp-anim>
+
+  <!-- Invalid: illegal layout. -->
+  <amp-anim
+    layout="container"
+    height="300"
+    width="400"
+    src="lemur.gif">
+  </amp-anim>
+</body>
+</html>
diff --git a/extensions/amp-anim/0.1/test/validator-amp-anim.out b/extensions/amp-anim/0.1/test/validator-amp-anim.out
@@ -0,0 +1,69 @@
+FAIL
+|  <!--
+|    Copyright 2018 The AMP HTML Authors. All Rights Reserved.
+|
+|    Licensed under the Apache License, Version 2.0 (the "License");
+|    you may not use this file except in compliance with the License.
+|    You may obtain a copy of the License at
+|
+|        http://www.apache.org/licenses/LICENSE-2.0
+|
+|    Unless required by applicable law or agreed to in writing, software
+|    distributed under the License is distributed on an "AS-IS" BASIS,
+|    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+|    See the License for the specific language governing permissions and
+|    limitations under the license.
+|  -->
+|  <!--
+|    Test Description:
+|    Tests for the amp-anim tag. See the inline comments.
+|  -->
+|  <!doctype html>
+|  <html ⚡>
+|  <head>
+|    <meta charset="utf-8">
+|    <link rel="canonical" href="./regular-html-version.html">
+|    <meta name="viewport" content="width=device-width,minimum-scale=1">
+|    <style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>
+|    <script async custom-element="amp-anim" src="https://cdn.ampproject.org/v0/amp-anim-latest.js"></script>
+|    <script async src="https://cdn.ampproject.org/v0.js"></script>
+|  </head>
+|  <body>
+|    <!-- Valid: Runtime-managed animated image. -->
+|    <amp-anim
+|      layout="responsive"
+|      height="300"
+|      width="400"
+|      src="lemur.gif">
+|    </amp-anim>
+|
+|    <!-- Valid: Runtime-managed animated image with optional attributes. -->
+|    <amp-anim
+|      alt="Lemurs"
+|      attribution="National Geographic Channel"
+|      layout="responsive"
+|      height="300"
+|      width="400"
+|      src="lemur.gif">
+|    </amp-anim>
+|
+|    <!-- Invalid: Missing src attribute. -->
+|    <amp-anim
+>>   ^~~~~~~~~
+amp-anim/0.1/test/validator-amp-anim.html:50:2 The mandatory attribute 'src' is missing in tag 'amp-anim'. (see https://www.ampproject.org/docs/reference/components/amp-anim) [AMP_TAG_PROBLEM]
+|      layout="responsive"
+|      height="300"
+|      width="400">
+|    </amp-anim>
+|
+|    <!-- Invalid: illegal layout. -->
+|    <amp-anim
+>>   ^~~~~~~~~
+amp-anim/0.1/test/validator-amp-anim.html:57:2 The specified layout 'CONTAINER' is not supported by tag 'amp-anim'. (see https://www.ampproject.org/docs/reference/components/amp-anim) [AMP_LAYOUT_PROBLEM]
+|      layout="container"
+|      height="300"
+|      width="400"
+|      src="lemur.gif">
+|    </amp-anim>
+|  </body>
+|  </html>
diff --git a/extensions/amp-anim/validator-amp-anim.protoascii b/extensions/amp-anim/validator-amp-anim.protoascii
@@ -21,8 +21,8 @@ tags: {  # amp-anim
   tag_name: "SCRIPT"
   extension_spec: {
     name: "amp-anim"
-    allowed_versions: "0.1"
-    allowed_versions: "latest"
+    version: "0.1"
+    version: "latest"
     requires_usage: GRANDFATHERED
     deprecated_allow_duplicates: true
   }
@@ -34,8 +34,8 @@ tags: {  # amp-anim
   spec_name: "amp-anim extension .js script (AMP4EMAIL)"
   extension_spec: {
     name: "amp-anim"
-    allowed_versions: "0.1"
-    allowed_versions: "latest"
+    version: "0.1"
+    version: "latest"
   }
   attr_lists: "common-extension-attrs"
 }

diff --git a/extensions/amp-animation/validator-amp-animation.protoascii b/extensions/amp-animation/validator-amp-animation.protoascii
@@ -21,8 +21,8 @@ tags: {  # amp-animation
   tag_name: "SCRIPT"
   extension_spec: {
     name: "amp-animation"
-    allowed_versions: "0.1"
-    allowed_versions: "latest"
+    version: "0.1"
+    version: "latest"
   }
   attr_lists: "common-extension-attrs"
 }

diff --git a/extensions/amp-apester-media/validator-amp-apester-media.protoascii b/extensions/amp-apester-media/validator-amp-apester-media.protoascii
@@ -19,8 +19,8 @@ tags: {  # amp-apester-media
   tag_name: "SCRIPT"
   extension_spec: {
     name: "amp-apester-media"
-    allowed_versions: "0.1"
-    allowed_versions: "latest"
+    version: "0.1"
+    version: "latest"
     requires_usage: GRANDFATHERED
     deprecated_allow_duplicates: true
   }

diff --git a/extensions/amp-app-banner/validator-amp-app-banner.protoascii b/extensions/amp-app-banner/validator-amp-app-banner.protoascii
@@ -18,8 +18,8 @@ tags: {  # <script custom-element="amp-sticky-ad">
   tag_name: "SCRIPT"
   extension_spec: {
     name: "amp-app-banner"
-    allowed_versions: "0.1"
-    allowed_versions: "latest"
+    version: "0.1"
+    version: "latest"
     deprecated_allow_duplicates: true
   }
   attr_lists: "common-extension-attrs"

diff --git a/extensions/amp-audio/validator-amp-audio.protoascii b/extensions/amp-audio/validator-amp-audio.protoascii
@@ -19,8 +19,8 @@ tags: {  # amp-audio
   tag_name: "SCRIPT"
   extension_spec: {
     name: "amp-audio"
-    allowed_versions: "0.1"
-    allowed_versions: "latest"
+    version: "0.1"
+    version: "latest"
     deprecated_allow_duplicates: true
     requires_usage: GRANDFATHERED
   }

diff --git a/extensions/amp-auto-ads/validator-amp-auto-ads.protoascii b/extensions/amp-auto-ads/validator-amp-auto-ads.protoascii
@@ -18,8 +18,8 @@ tags: {  # amp-auto-ads
   tag_name: "SCRIPT"
   extension_spec: {
     name: "amp-auto-ads"
-    allowed_versions: "0.1"
-    allowed_versions: "latest"
+    version: "0.1"
+    version: "latest"
   }
   attr_lists: "common-extension-attrs"
 }

diff --git a/extensions/amp-beopinion/validator-amp-beopinion.protoascii b/extensions/amp-beopinion/validator-amp-beopinion.protoascii
@@ -19,8 +19,8 @@ tags: {  # amp-beopinion
   tag_name: "SCRIPT"
   extension_spec: {
     name: "amp-beopinion"
-    allowed_versions: "0.1"
-    allowed_versions: "latest"
+    version: "0.1"
+    version: "latest"
   }
   attr_lists: "common-extension-attrs"
 }

diff --git a/extensions/amp-bind/validator-amp-bind.protoascii b/extensions/amp-bind/validator-amp-bind.protoascii
@@ -21,8 +21,8 @@ tags: {  # amp-bind
   tag_name: "SCRIPT"
   extension_spec: {
     name: "amp-bind"
-    allowed_versions: "0.1"
-    allowed_versions: "latest"
+    version: "0.1"
+    version: "latest"
     # amp-bind has no associated tag which indicates usage of the extension.
     # TODO(gregable): Implement a mechanism to associate attributes with
     # extension usage and then set this to GRANDFATHERED or ERROR.

diff --git a/extensions/amp-bodymovin-animation/validator-amp-bodymovin-animation.protoascii b/extensions/amp-bodymovin-animation/validator-amp-bodymovin-animation.protoascii
@@ -19,8 +19,8 @@ tags: {  # amp-bodymovin-animation
   tag_name: "SCRIPT"
   extension_spec: {
     name: "amp-bodymovin-animation"
-    allowed_versions: "0.1"
-    allowed_versions: "latest"
+    version: "0.1"
+    version: "latest"
   }
   attr_lists: "common-extension-attrs"
 }

diff --git a/extensions/amp-brid-player/validator-amp-brid-player.protoascii b/extensions/amp-brid-player/validator-amp-brid-player.protoascii
@@ -19,8 +19,8 @@ tags: {  # amp-brid-player
   tag_name: "SCRIPT"
   extension_spec: {
     name: "amp-brid-player"
-    allowed_versions: "0.1"
-    allowed_versions: "latest"
+    version: "0.1"
+    version: "latest"
     requires_usage: GRANDFATHERED
     deprecated_allow_duplicates: true
   }

diff --git a/extensions/amp-brightcove/validator-amp-brightcove.protoascii b/extensions/amp-brightcove/validator-amp-brightcove.protoascii
@@ -19,8 +19,8 @@ tags: {  # amp-brightcove
   tag_name: "SCRIPT"
   extension_spec: {
     name: "amp-brightcove"
-    allowed_versions: "0.1"
-    allowed_versions: "latest"
+    version: "0.1"
+    version: "latest"
     requires_usage: GRANDFATHERED
     deprecated_allow_duplicates: true
   }

diff --git a/extensions/amp-byside-content/validator-amp-byside-content.protoascii b/extensions/amp-byside-content/validator-amp-byside-content.protoascii
@@ -19,8 +19,8 @@ tags: {  # amp-byside-content
   tag_name: "SCRIPT"
   extension_spec: {
     name: "amp-byside-content"
-    allowed_versions: "0.1"
-    allowed_versions: "latest"
+    version: "0.1"
+    version: "latest"
   }
   attr_lists: "common-extension-attrs"
 }