[amp-ad] Add validator rules for always-serve-npa & block-rtc (#3…

…2066) * Validator rules + test * update validator tests
ampproject · Jan 22, 2021 · 363f962 · 363f962
1 parent e5a682e
commit 363f962
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 0 deletions.
diff --git a/extensions/amp-ad/validator-amp-ad.protoascii b/extensions/amp-ad/validator-amp-ad.protoascii
@@ -65,6 +65,8 @@ tags: {  # <amp-ad>
   attrs: { name: "template" }
   attrs: { name: "type" mandatory: true }
   attrs: { name: "sticky" value: "" }
+  attrs: { name: "always-serve-npa" }
+  attrs: { name: "block-rtc" }
   attr_lists: "extended-amp-global"
   spec_url: "https://amp.dev/documentation/components/amp-ad/"
   amp_layout: {
@@ -146,6 +148,8 @@ tags: {  # <amp-ad data-multi-size>
     }
     disallowed_value_regex: "__amp_source_origin"
   }
+  attrs: { name: "always-serve-npa" }
+  attrs: { name: "block-rtc" }
   attrs: { name: "type" mandatory: true }
   attr_lists: "extended-amp-global"
   spec_url: "https://amp.dev/documentation/components/amp-ad/"
@@ -223,6 +227,8 @@ tags: {  # <amp-embed>
     disallowed_value_regex: "__amp_source_origin"
   }
   attrs: { name: "type" mandatory: true }
+  attrs: { name: "always-serve-npa" }
+  attrs: { name: "block-rtc" }
   attr_lists: "extended-amp-global"
   spec_url: "https://amp.dev/documentation/components/amp-ad/"
   amp_layout: {
@@ -258,6 +264,8 @@ tags: {  # <amp-embed data-multi-size>
   }
   attrs: { name: "json" }
   attrs: { name: "rtc-config" }
+  attrs: { name: "always-serve-npa" }
+  attrs: { name: "block-rtc" }
   attrs: {
     name: "src"
     value_url: {

diff --git a/validator/testdata/feature_tests/ads.html b/validator/testdata/feature_tests/ads.html
@@ -650,6 +650,21 @@ <h2>Doubleclick with RTC config</h2>
       rtc-config="{foo: bar}">
   </amp-ad>
 
+  <h2>Doubleclick with block-rtc attribute</h2>
+  <amp-ad width="320" height="50"
+      type="doubleclick"
+      data-slot="/4119129/mobile_ad_banner"
+      block-rtc="gdpr"
+      rtc-config="{foo: bar}">
+  </amp-ad>
+
+  <h2>Doubleclick with always-serve-npa attribute</h2>
+  <amp-ad width="320" height="50"
+      type="doubleclick"
+      data-slot="/4119129/mobile_ad_banner"
+      always-serve-npa="gdpr">
+  </amp-ad>
+
   <h2>Doubleclick with JSON based parameters</h2>
   <amp-ad width="320" height="50"
       type="doubleclick"

diff --git a/validator/testdata/feature_tests/ads.out b/validator/testdata/feature_tests/ads.out
@@ -651,6 +651,21 @@ PASS
 |        rtc-config="{foo: bar}">
 |    </amp-ad>
 |
+|    <h2>Doubleclick with block-rtc attribute</h2>
+|    <amp-ad width="320" height="50"
+|        type="doubleclick"
+|        data-slot="/4119129/mobile_ad_banner"
+|        block-rtc="gdpr"
+|        rtc-config="{foo: bar}">
+|    </amp-ad>
+|
+|    <h2>Doubleclick with always-serve-npa attribute</h2>
+|    <amp-ad width="320" height="50"
+|        type="doubleclick"
+|        data-slot="/4119129/mobile_ad_banner"
+|        always-serve-npa="gdpr">
+|    </amp-ad>
+|
 |    <h2>Doubleclick with JSON based parameters</h2>
 |    <amp-ad width="320" height="50"
 |        type="doubleclick"