Skip to content

Commit

Permalink
Validator rollup (#23158)
Browse files Browse the repository at this point in the history 
* cl/255021843 Add a test file illustrating the issue in #18091

* cl/255463519 Revision bump for #22679

* cl/256058522 Revision bump for #23043

* cl/256067928 Revision bump for #23135

* cl/256199406 Revision bump for #23147
  • Loading branch information
Greg Grothaus authored Jul 2, 2019
1 parent 4c70e9c commit 50102cc
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 1 deletion.
35 changes: 35 additions & 0 deletions extensions/amp-carousel/0.1/test/validator-amp-carousel-error-msg.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<!--
Copyright 2016 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-carousel tag. There are multiple tagspecs for each carousel
and we want to see if the error messages are any good at distinguishing.
-->
<!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 src="https://cdn.ampproject.org/v0.js"></script>
</head>
<body>
<!-- Invalid: Missing script, test is to see if the error message is OK. -->
<amp-carousel layout=fill></amp-carousel>
<amp-carousel width="600" height="522" layout="responsive" type="slides" controls></amp-carousel>
</body>
</html>
50 changes: 50 additions & 0 deletions extensions/amp-carousel/0.1/test/validator-amp-carousel-error-msg.out
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
FAIL
| <!--
| Copyright 2016 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-carousel tag. There are multiple tagspecs for each carousel
| and we want to see if the error messages are any good at distinguishing.
| -->
| <!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 src="https://cdn.ampproject.org/v0.js"></script>
| </head>
| <body>
| <!-- Invalid: Missing script, test is to see if the error message is OK. -->
| <amp-carousel layout=fill></amp-carousel>
>> ^~~~~~~~~
amp-carousel/0.1/test/validator-amp-carousel-error-msg.html:32:2 The specified layout 'FILL' is not supported by tag 'AMP-CAROUSEL [lightbox] [type=carousel]'. (see https://amp.dev/documentation/components/amp-carousel) [AMP_LAYOUT_PROBLEM]
>> ^~~~~~~~~
amp-carousel/0.1/test/validator-amp-carousel-error-msg.html:32:2 The tag 'AMP-CAROUSEL [lightbox] [type=carousel]' requires including the 'amp-carousel' extension JavaScript. (see https://amp.dev/documentation/components/amp-carousel) [MANDATORY_AMP_TAG_MISSING_OR_INCORRECT]
>> ^~~~~~~~~
amp-carousel/0.1/test/validator-amp-carousel-error-msg.html:32:2 The tag 'AMP-CAROUSEL [lightbox] [type=carousel]' requires including the 'amp-lightbox-gallery' extension JavaScript. (see https://amp.dev/documentation/components/amp-carousel) [MANDATORY_AMP_TAG_MISSING_OR_INCORRECT]
| <amp-carousel width="600" height="522" layout="responsive" type="slides" controls></amp-carousel>
>> ^~~~~~~~~
amp-carousel/0.1/test/validator-amp-carousel-error-msg.html:33:2 The specified layout 'RESPONSIVE' is not supported by tag 'AMP-CAROUSEL [lightbox] [type=carousel]'. (see https://amp.dev/documentation/components/amp-carousel) [AMP_LAYOUT_PROBLEM]
>> ^~~~~~~~~
amp-carousel/0.1/test/validator-amp-carousel-error-msg.html:33:2 The attribute 'type' in tag 'AMP-CAROUSEL [lightbox] [type=carousel]' is set to the invalid value 'slides'. (see https://amp.dev/documentation/components/amp-carousel) [DISALLOWED_HTML]
>> ^~~~~~~~~
amp-carousel/0.1/test/validator-amp-carousel-error-msg.html:33:2 The tag 'AMP-CAROUSEL [lightbox] [type=carousel]' requires including the 'amp-carousel' extension JavaScript. (see https://amp.dev/documentation/components/amp-carousel) [MANDATORY_AMP_TAG_MISSING_OR_INCORRECT]
>> ^~~~~~~~~
amp-carousel/0.1/test/validator-amp-carousel-error-msg.html:33:2 The tag 'AMP-CAROUSEL [lightbox] [type=carousel]' requires including the 'amp-lightbox-gallery' extension JavaScript. (see https://amp.dev/documentation/components/amp-carousel) [MANDATORY_AMP_TAG_MISSING_OR_INCORRECT]
| </body>
| </html>
2 changes: 1 addition & 1 deletion validator/validator-main.protoascii
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ min_validator_revision_required: 375
# newer versions of the spec file. This is currently a Google internal
# mechanism, validator.js does not use this facility. However, any
# change to this file (validator-main.js) requires updating this revision id.
spec_file_revision: 901
spec_file_revision: 905

styles_spec_url: "https://amp.dev/documentation/guides-and-tutorials/develop/style_and_layout/style_pages"
script_spec_url: "https://amp.dev/documentation/guides-and-tutorials/learn/spec/amphtml#html-tags"
Expand Down

0 comments on commit 50102cc

Please sign in to comment.