Disallow amp-youtube in amp4ads (#24864)

* Disallow amp-youtube in amp4ads * Update test
ampproject · Oct 3, 2019 · 46b05c1 · 46b05c1
1 parent 40ab7a7
commit 46b05c1
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 10 deletions.
diff --git a/extensions/amp-youtube/validator-amp-youtube.protoascii b/extensions/amp-youtube/validator-amp-youtube.protoascii
@@ -16,7 +16,6 @@
 
 tags: {  # amp-youtube
   html_format: AMP
-  html_format: AMP4ADS
   html_format: ACTIONS
   tag_name: "SCRIPT"
   extension_spec: {
@@ -30,7 +29,6 @@ tags: {  # amp-youtube
 }
 tags: {  # <amp-youtube>
   html_format: AMP
-  html_format: AMP4ADS
   html_format: ACTIONS
   tag_name: "AMP-YOUTUBE"
   requires_extension: "amp-youtube"

diff --git a/validator/engine/validator_test.js b/validator/engine/validator_test.js
@@ -1300,7 +1300,6 @@ describe('ValidatorRulesMakeSense', () => {
         'amp-position-observer': ['0.1', 'latest'],
         'amp-social-share': ['0.1', 'latest'],
         'amp-video': ['0.1', 'latest'],
-        'amp-youtube': ['0.1', 'latest'],
       };
       // Verify extension is approved.
       const extension = tagSpec.extensionSpec.name;

diff --git a/validator/testdata/amp4ads_feature_tests/extensions.html b/validator/testdata/amp4ads_feature_tests/extensions.html
@@ -114,8 +114,6 @@
      src="https://cdn.ampproject.org/v0/amp-vimeo-0.1.js"></script>
   <script async custom-element="amp-vine"
      src="https://cdn.ampproject.org/v0/amp-vine-0.1.js"></script>
-  <script async custom-element="amp-youtube"
-     src="https://cdn.ampproject.org/v0/amp-youtube-0.1.js"></script>
 
   <script async custom-template="amp-mustache"
      src="https://cdn.ampproject.org/v0/amp-mustache-0.2.js"></script>

diff --git a/validator/testdata/amp4ads_feature_tests/extensions.out b/validator/testdata/amp4ads_feature_tests/extensions.out
@@ -175,16 +175,14 @@ amp4ads_feature_tests/extensions.html:113:2 Custom JavaScript is not allowed. (s
 >>   ^~~~~~~~~
 amp4ads_feature_tests/extensions.html:115:2 Custom JavaScript is not allowed. (see https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml#html-tags) [CUSTOM_JAVASCRIPT_DISALLOWED]
 |       src="https://cdn.ampproject.org/v0/amp-vine-0.1.js"></script>
-|    <script async custom-element="amp-youtube"
-|       src="https://cdn.ampproject.org/v0/amp-youtube-0.1.js"></script>
 |
 |    <script async custom-template="amp-mustache"
 |       src="https://cdn.ampproject.org/v0/amp-mustache-0.2.js"></script>
 |  </head>
 |  <body></body></html>
 >>                    ^~~~~~~~~
-amp4ads_feature_tests/extensions.html:123:19 The extension 'amp-animation' was found on this page, but is unused. Please remove this extension. [AMP_TAG_PROBLEM]
+amp4ads_feature_tests/extensions.html:121:19 The extension 'amp-animation' was found on this page, but is unused. Please remove this extension. [AMP_TAG_PROBLEM]
 >>                    ^~~~~~~~~
-amp4ads_feature_tests/extensions.html:123:19 The extension 'amp-lightbox' was found on this page, but is unused. Please remove this extension. [AMP_TAG_PROBLEM]
+amp4ads_feature_tests/extensions.html:121:19 The extension 'amp-lightbox' was found on this page, but is unused. Please remove this extension. [AMP_TAG_PROBLEM]
 >>                    ^~~~~~~~~
-amp4ads_feature_tests/extensions.html:123:19 The extension 'amp-mustache' was found on this page, but is unused. Please remove this extension. [AMP_TAG_PROBLEM]
+amp4ads_feature_tests/extensions.html:121:19 The extension 'amp-mustache' was found on this page, but is unused. Please remove this extension. [AMP_TAG_PROBLEM]