validate-website 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc00f175061211e02bfbc9e52efab65576ed699e
-  data.tar.gz: 7f5580e8e11c11922e43cf293e4900fde67ac28f
+  metadata.gz: ba01cfb0d05bb3670aecfb1afcc94bc72dd02088
+  data.tar.gz: 8f8259c854e992e72c18e48141509475378e3a91
 SHA512:
-  metadata.gz: f14177d2cf4c192575cbe5d6435842ced3c2b84c7057b212e86d74f14dfafb5f704bb0d4043fd2ece596007a67c96858cdcf6c423f31e7e718e42945e4d63027
-  data.tar.gz: 27901ac698b0b29739bb5ab1f7bfa710ca56cec65a26f2fca4533800e2cb1187c3a914f45e963afa4306a36c6962eb97817cce12a9c698b695136684db2e2ad2
+  metadata.gz: 8585f39f42b34a667c34f760c96b6c1dbeba03ab4d1adefc1bb26aa8a846038e26fba3e48f657007fb1973f10b4173e86e84e16b8b13f7bd20809adbd40e7f2e
+  data.tar.gz: 620cf747186ef3518b9bec8f248cf8d78d4c73510ff745117fbbecdad66f24816124a26287485b77396043574e48aa5878bcc61c123f8a2c9b0d00502b83761f

data/History.md

@@ -1,4 +1,12 @@
 
+v1.7.0 / 2017-04-08
+===================
+
+  * Use w3c_validators and remove multipart_body gem
+  * Drop Ruby 2.0.0
+  * Update webmock to 2.3
+  * Load xsd on init to avoid conflicting chdir
+
 v1.6.0 / 2016-09-24
 ===================
 

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2009-2016 Laurent Arnoud <laurent@spkdev.net>
+Copyright (c) 2009-2017 Laurent Arnoud <laurent@spkdev.net>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -122,7 +122,7 @@ See [GitHub](https://github.com/spk/validate-website/graphs/contributors).
 
 The MIT License
 
-Copyright (c) 2009-2016 Laurent Arnoud <laurent@spkdev.net>
+Copyright (c) 2009-2017 Laurent Arnoud <laurent@spkdev.net>
 
 ---
 [![Build](https://img.shields.io/travis-ci/spk/validate-website.svg)](https://travis-ci.org/spk/validate-website)

data/lib/validate_website/core.rb

@@ -13,6 +13,7 @@ require 'crass'
 module ValidateWebsite
   autoload :Crawl, 'validate_website/crawl'
   autoload :Static, 'validate_website/static'
+  autoload :StaticLink, 'validate_website/static_link'
 
   # Core class for static or website validation
   class Core

data/lib/validate_website/static.rb

@@ -60,75 +60,16 @@ module ValidateWebsite
       check_static_not_found(page.links) if options[:not_found]
     end
 
-    StaticLink = Struct.new(:link, :site) do
-      def link_uri
-        @link_uri = URI.parse(URI.encode(link))
-        @link_uri = URI.join(site, @link_uri) if @link_uri.host.nil?
-        @link_uri
-      end
-
-      def in_static_domain?
-        URI.parse(site).host == link_uri.host
-      end
-
-      def content_types
-        if css?
-          ['text/css']
-        else
-          CONTENT_TYPES
-        end
-      end
-
-      def body
-        if File.exist?(link)
-          open(link).read
-        else
-          open(file_path).read
-        end
-      end
-
-      def response
-        @response ||= ValidateWebsite::Static.fake_httpresponse(
-          body,
-          content_types
-        )
-      end
-
-      def page
-        @page ||= Spidr::Page.new(link_uri, response)
-      end
-
-      def extract_urls_from_fake_css_response
-        ValidateWebsite::Utils.extract_urls_from_css(page)
-      end
-
-      def file_path
-        @file_path ||= URI.parse(
-          File.join(Dir.getwd, link_uri.path || '/')
-        ).path
-      end
-
-      def extname
-        @extname ||= File.extname(file_path)
-      end
-
-      def css?
-        extname == '.css'
-      end
-
-      def check?
-        !link.include?('#') && in_static_domain?
-      end
-    end
-
     # check files linked on static document
     # see lib/validate_website/runner.rb
     def check_static_not_found(links)
       static_links = links.map { |l| StaticLink.new(l, @site) }
       static_links.each do |static_link|
         next unless static_link.check?
-        not_found_error(static_link.file_path) &&
-          next unless File.exist?(static_link.file_path)
+        unless File.exist?(static_link.file_path)
+          not_found_error(static_link.file_path)
+          next
+        end
         next unless static_link.css?
         check_static_not_found static_link.extract_urls_from_fake_css_response
       end

data/lib/validate_website/static_link.rb

@@ -0,0 +1,65 @@
+require 'uri'
+require 'validate_website/utils'
+require 'validate_website/static'
+require 'spidr'
+
+StaticLink = Struct.new(:link, :site) do
+  def link_uri
+    @link_uri = URI.parse(URI.encode(link))
+    @link_uri = URI.join(site, @link_uri) if @link_uri.host.nil?
+    @link_uri
+  end
+
+  def in_static_domain?
+    URI.parse(site).host == link_uri.host
+  end
+
+  def content_types
+    if css?
+      ['text/css']
+    else
+      ValidateWebsite::Static::CONTENT_TYPES
+    end
+  end
+
+  def body
+    if File.exist?(link)
+      open(link).read
+    else
+      open(file_path).read
+    end
+  end
+
+  def response
+    @response ||= ValidateWebsite::Static.fake_httpresponse(
+      body,
+      content_types
+    )
+  end
+
+  def page
+    @page ||= Spidr::Page.new(link_uri, response)
+  end
+
+  def extract_urls_from_fake_css_response
+    ValidateWebsite::Utils.extract_urls_from_css(page)
+  end
+
+  def file_path
+    @file_path ||= URI.parse(
+      File.join(Dir.getwd, link_uri.path || '/')
+    ).path
+  end
+
+  def extname
+    @extname ||= File.extname(file_path)
+  end
+
+  def css?
+    extname == '.css'
+  end
+
+  def check?
+    !link.include?('#') && in_static_domain?
+  end
+end

data/lib/validate_website/validator.rb

@@ -1,17 +1,39 @@
-# encoding: utf-8
 require 'uri'
 require 'nokogiri'
-require 'net/http'
-require 'multipart_body'
+require 'w3c_validators'
 
 module ValidateWebsite
   # Document validation from DTD or XSD (webservice for html5)
   class Validator
-    XHTML_PATH = File.expand_path('../../../data/schemas', __FILE__)
+    @html5_validator_service_url = 'https://checker.html5.org/'
 
-    @html5_validator_service_url = 'http://checker.html5.org:443/'
     class << self
       attr_accessor :html5_validator_service_url
+
+      def validator_uri
+        @validator_uri ||=
+          ENV['VALIDATOR_NU_URL'] || @html5_validator_service_url
+      end
+    end
+
+    XHTML_PATH = File.expand_path('../../../data/schemas', __FILE__)
+
+    @xsd_schemas = {}
+    class << self
+      attr_reader :xsd_schemas
+    end
+    # `Dir.chdir` is needed by `Nokogiri::XML::Schema` to validate with local
+    # files and cannot use file absolute path.
+    Dir.glob(File.join(XHTML_PATH, '*.xsd')).each do |schema|
+      Dir.chdir(XHTML_PATH) do
+        schema_name = File.basename(schema, '.xsd')
+        schema_content = File.read(File.basename(schema))
+        begin
+          @xsd_schemas[schema_name] = Nokogiri::XML::Schema(schema_content)
+        rescue Nokogiri::XML::SyntaxError
+          STDERR.puts "XSD SCHEMA: #{schema} cannot be loaded"
+        end
+      end
     end
 
     attr_reader :original_doc, :body, :dtd, :doc, :namespace
@@ -28,7 +50,7 @@ module ValidateWebsite
       @body = body
       @ignore = ignore
       @dtd = @original_doc.internal_subset
-      @namespace = init_namespace(@dtd)
+      @namespace = find_namespace(@dtd)
     end
 
     ##
@@ -44,14 +66,20 @@ module ValidateWebsite
       @ignore ? @errors.reject { |e| @ignore =~ e } : @errors
     end
 
+    # http://www.w3.org/TR/xhtml1-schema/
+    def self.xsd(namespace)
+      return unless namespace
+      @xsd_schemas[namespace] if @xsd_schemas.key? namespace
+    end
+
     private
 
-    def init_namespace(dtd)
+    # http://www.w3.org/TR/xhtml1/#dtds
+    def find_namespace(dtd)
       return unless dtd.system_id
       dtd_uri = URI.parse(dtd.system_id)
       return unless dtd_uri.path
       @dtd_uri = dtd_uri
-      # http://www.w3.org/TR/xhtml1/#dtds
       File.basename(@dtd_uri.path, '.dtd')
     end
 
@@ -64,19 +92,10 @@ module ValidateWebsite
                   end
     end
 
-    # http://www.w3.org/TR/xhtml1-schema/
-    def xsd
-      @xsd ||= Dir.chdir(XHTML_PATH) do
-        if @namespace && File.exist?(@namespace + '.xsd')
-          Nokogiri::XML::Schema(File.read(@namespace + '.xsd'))
-        end
-      end
-    end
-
     # @return [Array] contain result errors
     def validate(xml_doc, document_body)
-      if !xsd.nil?
-        xsd.validate(xml_doc)
+      if self.class.xsd(@namespace)
+        self.class.xsd(@namespace).validate(xml_doc)
       elsif document_body =~ /^\<!DOCTYPE html\>/i
         html5_validate(document_body)
       else
@@ -97,27 +116,12 @@ module ValidateWebsite
       @errors << e
     end
 
-    def html5_headers(multipart)
-      {
-        'Content-Type' => "multipart/form-data; boundary=#{multipart.boundary}",
-        'Content-Length' => multipart.to_s.bytesize.to_s
-      }
-    end
-
-    def html5_body(document)
-      url = ENV['VALIDATOR_NU_URL'] || self.class.html5_validator_service_url
-      uri = URI.parse(url)
-      multipart = MultipartBody.new(content: document)
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.start do |con|
-        con.post(uri.path, multipart.to_s, html5_headers(multipart))
-      end.body
-    end
-
     def html5_validate(document)
-      validator_document = Nokogiri::HTML(html5_body(document))
-      errors = validator_document.css('h2.invalid').map(&:content)
-      errors.concat validator_document.css('ol li.error').map(&:content)
+      validator = W3CValidators::NuValidator.new(
+        validator_uri: self.class.validator_uri
+      )
+      results = validator.validate_text(document)
+      errors.concat results.errors
     end
   end
 end

data/lib/validate_website/version.rb

@@ -2,5 +2,5 @@
 
 # Version file for ValidateWebsite
 module ValidateWebsite
-  VERSION = '1.6.0'.freeze
+  VERSION = '1.7.0'.freeze
 end

data/man/man1/validate-website-static.1

@@ -2,12 +2,12 @@
 .\"     Title: validate-website-static
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/19/2016
+.\"      Date: 01/04/2017
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "VALIDATE\-WEBSITE\-S" "1" "06/19/2016" "\ \&" "\ \&"
+.TH "VALIDATE\-WEBSITE\-S" "1" "01/04/2017" "\ \&" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -122,4 +122,4 @@ Laurent Arnoud <laurent@spkdev\&.net>
 .sp
 The MIT License
 .sp
-Copyright (c) 2009\-2015 Laurent Arnoud <laurent@spkdev\&.net>
+Copyright (c) 2009\-2017 Laurent Arnoud <laurent@spkdev\&.net>

data/man/man1/validate-website.1

@@ -2,12 +2,12 @@
 .\"     Title: validate-website
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 06/19/2016
+.\"      Date: 01/04/2017
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "VALIDATE\-WEBSITE" "1" "06/19/2016" "\ \&" "\ \&"
+.TH "VALIDATE\-WEBSITE" "1" "01/04/2017" "\ \&" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -127,4 +127,4 @@ Laurent Arnoud <laurent@spkdev\&.net>
 .sp
 The MIT License
 .sp
-Copyright (c) 2009\-2015 Laurent Arnoud <laurent@spkdev\&.net>
+Copyright (c) 2009\-2017 Laurent Arnoud <laurent@spkdev\&.net>

data/test/crawler_test.rb

@@ -9,6 +9,10 @@ describe ValidateWebsite::Crawl do
     end
   end
 
+  def validator
+    ValidateWebsite::Validator
+  end
+
   describe 'options' do
     it 'can change user-agent' do
       ua = %{Linux / Firefox 29: Mozilla/5.0 (X11; Linux x86_64; rv:29.0) \
@@ -21,13 +25,13 @@ describe ValidateWebsite::Crawl do
     end
 
     it 'can change html5 validator service url' do
-      original = ValidateWebsite::Validator.html5_validator_service_url
+      original = validator.html5_validator_service_url
       new = 'http://localhost:8888/'
       _out, _err = capture_io do
         ValidateWebsite::Crawl.new(site: TEST_DOMAIN,
                                    html5_validator_service_url: new)
-        ValidateWebsite::Validator.html5_validator_service_url.must_equal new
-        ValidateWebsite::Validator.html5_validator_service_url = original
+        validator.html5_validator_service_url.must_equal new
+        validator.html5_validator_service_url = original
       end
     end
   end
@@ -76,8 +80,8 @@ describe ValidateWebsite::Crawl do
       page = FakePage.new(name,
                           body: open(file).read,
                           content_type: 'text/html')
-      validator_res = File.join('test', 'data', 'validator.nu-success.html')
-      stub_request(:any, ValidateWebsite::Validator.html5_validator_service_url)
+      validator_res = File.join('test', 'data', 'validator.nu-failure.json')
+      stub_request(:any, /#{validator.html5_validator_service_url}/)
         .to_return(body: open(validator_res).read)
       @validate_website.site = page.url
       _out, _err = capture_io do

data/test/data/validator.nu-failure.json

@@ -0,0 +1 @@
+{"url":"https://linuxfr.org/","messages":[{"type":"info","lastLine":198,"lastColumn":40,"firstColumn":1,"subType":"warning","message":"Consider using the “h1” element as a top-level heading only (all “h1” elements are treated as top-level headings by many screen readers and other tools).","extract":"\n<header>\n<h1 class=\"entry-title\" itemprop=\"name\"><a hre","hiliteStart":10,"hiliteLength":40},{"type":"info","lastLine":195,"lastColumn":20,"firstColumn":1,"subType":"warning","message":"Section lacks heading. Consider using “h2”-“h6” elements to add identifying headings to all sections.","extract":"eil\"</h1>\n<section id=\"phare\">\n<arti","hiliteStart":10,"hiliteLength":20},{"type":"info","lastLine":313,"lastColumn":38,"firstColumn":7,"subType":"warning","message":"The “main” role is unnecessary for element “main”.","extract":"av>\n</nav><main id=\"contents\" role=\"main\">\n<arti","hiliteStart":10,"hiliteLength":32},{"type":"info","lastLine":316,"lastColumn":40,"firstColumn":1,"subType":"warning","message":"Consider using the “h1” element as a top-level heading only (all “h1” elements are treated as top-level headings by many screen readers and other tools).","extract":"\n<header>\n<h1 class=\"entry-title\" itemprop=\"name\"><a hre","hiliteStart":10,"hiliteLength":40},{"type":"info","lastLine":374,"lastColumn":40,"firstColumn":1,"subType":"warning","message":"Consider using the “h1” element as a top-level heading only (all “h1” elements are treated as top-level headings by many screen readers and other tools).","extract":"\n<header>\n<h1 class=\"entry-title\" itemprop=\"name\"><a hre","hiliteStart":10,"hiliteLength":40},{"type":"info","lastLine":429,"lastColumn":40,"firstColumn":1,"subType":"warning","message":"Consider using the “h1” element as a top-level heading only (all “h1” elements are treated as top-level headings by many screen readers and other tools).","extract":"\n<header>\n<h1 class=\"entry-title\" itemprop=\"name\"><a hre","hiliteStart":10,"hiliteLength":40},{"type":"info","lastLine":488,"lastColumn":40,"firstColumn":1,"subType":"warning","message":"Consider using the “h1” element as a top-level heading only (all “h1” elements are treated as top-level headings by many screen readers and other tools).","extract":"\n<header>\n<h1 class=\"entry-title\" itemprop=\"name\"><a hre","hiliteStart":10,"hiliteLength":40},{"type":"info","lastLine":546,"lastColumn":40,"firstColumn":1,"subType":"warning","message":"Consider using the “h1” element as a top-level heading only (all “h1” elements are treated as top-level headings by many screen readers and other tools).","extract":"\n<header>\n<h1 class=\"entry-title\" itemprop=\"name\"><a hre","hiliteStart":10,"hiliteLength":40},{"type":"info","lastLine":624,"lastColumn":40,"firstColumn":1,"subType":"warning","message":"Consider using the “h1” element as a top-level heading only (all “h1” elements are treated as top-level headings by many screen readers and other tools).","extract":"\n<header>\n<h1 class=\"entry-title\" itemprop=\"name\"><a hre","hiliteStart":10,"hiliteLength":40},{"type":"info","lastLine":663,"lastColumn":40,"firstColumn":1,"subType":"warning","message":"Consider using the “h1” element as a top-level heading only (all “h1” elements are treated as top-level headings by many screen readers and other tools).","extract":"\n<header>\n<h1 class=\"entry-title\" itemprop=\"name\"><a hre","hiliteStart":10,"hiliteLength":40},{"type":"info","lastLine":739,"lastColumn":40,"firstColumn":1,"subType":"warning","message":"Consider using the “h1” element as a top-level heading only (all “h1” elements are treated as top-level headings by many screen readers and other tools).","extract":"\n<header>\n<h1 class=\"entry-title\" itemprop=\"name\"><a hre","hiliteStart":10,"hiliteLength":40},{"type":"info","lastLine":781,"lastColumn":40,"firstColumn":1,"subType":"warning","message":"Consider using the “h1” element as a top-level heading only (all “h1” elements are treated as top-level headings by many screen readers and other tools).","extract":"\n<header>\n<h1 class=\"entry-title\" itemprop=\"name\"><a hre","hiliteStart":10,"hiliteLength":40},{"type":"info","lastLine":845,"lastColumn":40,"firstColumn":1,"subType":"warning","message":"Consider using the “h1” element as a top-level heading only (all “h1” elements are treated as top-level headings by many screen readers and other tools).","extract":"\n<header>\n<h1 class=\"entry-title\" itemprop=\"name\"><a hre","hiliteStart":10,"hiliteLength":40},{"type":"info","lastLine":908,"lastColumn":40,"firstColumn":1,"subType":"warning","message":"Consider using the “h1” element as a top-level heading only (all “h1” elements are treated as top-level headings by many screen readers and other tools).","extract":"\n<header>\n<h1 class=\"entry-title\" itemprop=\"name\"><a hre","hiliteStart":10,"hiliteLength":40},{"type":"info","lastLine":967,"lastColumn":40,"firstColumn":1,"subType":"warning","message":"Consider using the “h1” element as a top-level heading only (all “h1” elements are treated as top-level headings by many screen readers and other tools).","extract":"\n<header>\n<h1 class=\"entry-title\" itemprop=\"name\"><a hre","hiliteStart":10,"hiliteLength":40},{"type":"info","lastLine":1015,"lastColumn":40,"firstColumn":1,"subType":"warning","message":"Consider using the “h1” element as a top-level heading only (all “h1” elements are treated as top-level headings by many screen readers and other tools).","extract":"\n<header>\n<h1 class=\"entry-title\" itemprop=\"name\"><a hre","hiliteStart":10,"hiliteLength":40},{"type":"info","lastLine":1079,"lastColumn":40,"firstColumn":1,"subType":"warning","message":"Consider using the “h1” element as a top-level heading only (all “h1” elements are treated as top-level headings by many screen readers and other tools).","extract":"\n<header>\n<h1 class=\"entry-title\" itemprop=\"name\"><a hre","hiliteStart":10,"hiliteLength":40},{"type":"error","lastLine":1098,"lastColumn":18,"firstColumn":1,"message":"Duplicate ID “sommaire”.","extract":"ibre.</p>\n<h2 id=\"sommaire\">Sommai","hiliteStart":10,"hiliteLength":18},{"type":"info","lastLine":507,"lastColumn":18,"firstColumn":1,"subType":"warning","message":"The first occurrence of ID “sommaire” was here.","extract":"ibre.</p>\n<h2 id=\"sommaire\">Sommai","hiliteStart":10,"hiliteLength":18},{"type":"info","lastLine":1138,"lastColumn":40,"firstColumn":1,"subType":"warning","message":"Consider using the “h1” element as a top-level heading only (all “h1” elements are treated as top-level headings by many screen readers and other tools).","extract":"\n<header>\n<h1 class=\"entry-title\" itemprop=\"name\"><a hre","hiliteStart":10,"hiliteLength":40}],"language":"fr"}

data/test/data/validator.nu-success.json

@@ -0,0 +1 @@
+{"url":"https://example.org/","messages":[],"language":"fr"}

data/test/static_test.rb

@@ -39,7 +39,7 @@ describe ValidateWebsite::Static do
                                 markup: false,
                                 not_found: true)
       end
-      @validate_website.not_founds_count.must_equal 518
+      @validate_website.not_founds_count.must_equal 193
     end
   end
 

data/test/validator_test.rb

@@ -21,7 +21,7 @@ describe ValidateWebsite::Validator do
                               @xhtml1_page.body,
                               ignore)
       validator.valid?.must_equal true
-      validator.errors.size.must_equal 0
+      validator.errors.must_equal []
     end
 
     it 'xhtml1-strict should be valid' do
@@ -32,19 +32,22 @@ describe ValidateWebsite::Validator do
                           body: open(file).read,
                           content_type: 'text/html')
       @xhtml1_page = @http.get_page(page.url)
+      ignore = /width|height|Length/
       validator = subject.new(@xhtml1_page.doc,
-                              @xhtml1_page.body)
+                              @xhtml1_page.body,
+                              ignore)
       validator.dtd.system_id.must_equal dtd_uri
       validator.namespace.must_equal name
       validator.valid?.must_equal true
+      validator.errors.must_equal []
     end
   end
 
   describe('html5') do
     describe('when valid') do
       before do
-        validator_res = File.join('test', 'data', 'validator.nu-success.html')
-        stub_request(:any, subject.html5_validator_service_url)
+        validator_res = File.join('test', 'data', 'validator.nu-success.json')
+        stub_request(:any, /#{subject.html5_validator_service_url}/)
           .to_return(body: open(validator_res).read)
       end
       it 'html5 should be valid' do
@@ -58,25 +61,14 @@ describe ValidateWebsite::Validator do
                                 @html5_page.body)
         validator.valid?.must_equal true
       end
-      it 'with DLFP' do
-        name = 'html5'
-        file = File.join('test', 'data', "#{name}-linuxfr.html")
-        page = FakePage.new(name,
-                            body: open(file).read,
-                            content_type: 'text/html')
-        @html5_page = @http.get_page(page.url)
-        validator = subject.new(@html5_page.doc,
-                                @html5_page.body)
-        validator.valid?.must_equal true
-      end
     end
     describe('when not valid') do
       before do
-        validator_res = File.join('test', 'data', 'validator.nu-failure.html')
-        stub_request(:any, subject.html5_validator_service_url)
+        validator_res = File.join('test', 'data', 'validator.nu-failure.json')
+        stub_request(:any, /#{subject.html5_validator_service_url}/)
           .to_return(body: open(validator_res).read)
         name = 'html5'
-        file = File.join('test', 'data', "#{name}-linuxfr.html")
+        file = File.join('test', 'data', "#{name}.html")
         page = FakePage.new(name,
                             body: open(file).read,
                             content_type: 'text/html')
@@ -87,35 +79,16 @@ describe ValidateWebsite::Validator do
         validator = subject.new(@html5_page.doc,
                                 @html5_page.body)
         validator.valid?.must_equal false
-        validator.errors.size.must_equal 38
+        validator.errors.size.must_equal 1
       end
 
       it 'should exclude errors ignored by :ignore option' do
-        ignore = /The nowrap attribute on the td element is obsolete/
+        ignore = /Duplicate ID/
         validator = subject.new(@html5_page.doc,
                                 @html5_page.body,
                                 ignore)
-        validator.valid?.must_equal false
-        validator.errors.size.must_equal 36
-      end
-    end
-
-    describe('excessive') do
-      before do
-        validator_res = File.join('test', 'data', 'validator.nu-excessive.html')
-        stub_request(:any, subject.html5_validator_service_url)
-          .to_return(body: open(validator_res).read)
-      end
-      it 'html5 should have errors' do
-        name = 'html5'
-        file = File.join('test', 'data', "#{name}.html")
-        page = FakePage.new(name,
-                            body: open(file).read,
-                            content_type: 'text/html')
-        @html5_page = @http.get_page(page.url)
-        validator = subject.new(@html5_page.doc,
-                                @html5_page.body)
-        validator.valid?.must_equal false
+        validator.valid?.must_equal true
+        validator.errors.size.must_equal 0
       end
     end
   end