validate-website 1.9.0 → 1.11.0

data/test/static_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('test_helper', __dir__)
 
 # rubocop:disable Metrics/BlockLength
@@ -17,7 +19,7 @@ describe ValidateWebsite::Static do
                               not_found: false,
                               exclude: /data|example/)
     end
-    @validate_website.history_count.must_equal 0
+    _(@validate_website.history_count).must_equal 0
   end
 
   it 'no space in directory name' do
@@ -28,7 +30,7 @@ describe ValidateWebsite::Static do
                               markup: false,
                               not_found: false)
     end
-    @validate_website.not_founds_count.must_equal 0
+    _(@validate_website.not_founds_count).must_equal 0
   end
 
   it 'not found' do
@@ -40,7 +42,25 @@ describe ValidateWebsite::Static do
                                 markup: false,
                                 not_found: true)
       end
-      @validate_website.not_founds_count.must_equal 213
+      _(@validate_website.not_founds_count).must_equal 213
+    end
+  end
+
+  it 'can change validator' do
+    validator_res = File.join('test', 'data', 'validator.nu-failure.json')
+    stub_request(:any,
+                 /#{ValidateWebsite::Validator.html5_validator_service_url}/)
+      .to_return(body: File.open(validator_res).read)
+    pattern = File.join(File.dirname(__FILE__), 'data',
+                        'html5-fail.html')
+    Dir.chdir('test/data') do
+      _out, _err = capture_io do
+        @validate_website.crawl(pattern: pattern,
+                                site: 'http://w3.org/',
+                                ignore: /Warning/,
+                                html5_validator: :nu)
+      end
+      _(@validate_website.errors_count).must_equal 1
     end
   end
 
@@ -53,7 +73,7 @@ describe ValidateWebsite::Static do
                                 site: 'http://w3.org/',
                                 ignore: /height|width|Length/)
       end
-      @validate_website.errors_count.must_equal 0
+      _(@validate_website.errors_count).must_equal 0
     end
   end
 
@@ -67,7 +87,7 @@ describe ValidateWebsite::Static do
                                   markup: false,
                                   css_syntax: true)
         end
-        @validate_website.errors_count.must_equal 1
+        _(@validate_website.errors_count).must_equal 1
       end
     end
   end

data/test/test_helper.rb

@@ -1,19 +1,18 @@
 # frozen_string_literal: true
 
 begin
-  require 'coveralls'
-  Coveralls.wear!
+  require 'simplecov'
+  SimpleCov.start
 rescue LoadError
-  STDERR.puts 'coveralls not loaded'
+  warn 'simplecov not loaded'
 end
 
 require 'minitest/autorun'
-require 'minitest/focus'
 require 'spidr'
 
 require 'validate_website/core'
 
 require File.expand_path('webmock_helper', __dir__)
 
-TEST_DOMAIN = 'http://www.example.com/'.freeze
+TEST_DOMAIN = 'http://www.example.com/'
 ENV['LC_ALL'] = 'C.UTF-8' if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'

data/test/validator_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('test_helper', __dir__)
 
 # rubocop:disable Metrics/BlockLength
@@ -14,15 +16,15 @@ describe ValidateWebsite::Validator do
       name = 'w3.org-xhtml1-strict-errors'
       file = File.join('test', 'data', "#{name}.html")
       page = FakePage.new(name,
-                          body: open(file).read,
+                          body: File.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,
                               ignore: ignore)
-      validator.valid?.must_equal true
-      validator.errors.must_equal []
+      _(validator.valid?).must_equal true
+      _(validator.errors).must_equal []
     end
 
     it 'xhtml1-strict should be valid' do
@@ -30,17 +32,17 @@ describe ValidateWebsite::Validator do
       dtd_uri = 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'
       file = File.join('test', 'data', "#{name}.html")
       page = FakePage.new(name,
-                          body: open(file).read,
+                          body: File.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,
                               ignore: ignore)
-      validator.dtd.system_id.must_equal dtd_uri
-      validator.namespace.must_equal name
-      validator.valid?.must_equal true
-      validator.errors.must_equal []
+      _(validator.dtd.system_id).must_equal dtd_uri
+      _(validator.namespace).must_equal name
+      _(validator.valid?).must_equal true
+      _(validator.errors).must_equal []
     end
   end
 
@@ -49,18 +51,18 @@ describe ValidateWebsite::Validator do
       before do
         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)
+          .to_return(body: File.open(validator_res).read)
       end
       it 'html5 should be valid' do
         name = 'html5'
         file = File.join('test', 'data', "#{name}.html")
         page = FakePage.new(name,
-                            body: open(file).read,
+                            body: File.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
+        _(validator.valid?).must_equal true
       end
     end
 
@@ -68,11 +70,11 @@ describe ValidateWebsite::Validator do
       before do
         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)
+          .to_return(body: File.open(validator_res).read)
         name = 'html5-fail'
         file = File.join('test', 'data', "#{name}.html")
         page = FakePage.new(name,
-                            body: open(file).read,
+                            body: File.open(file).read,
                             content_type: 'text/html')
         @html5_page = @http.get_page(page.url)
       end
@@ -82,8 +84,8 @@ describe ValidateWebsite::Validator do
           validator = subject.new(@html5_page.doc,
                                   @html5_page.body,
                                   html5_validator: :nu)
-          validator.valid?.must_equal false
-          validator.errors.size.must_equal 3
+          _(validator.valid?).must_equal false
+          _(validator.errors.size).must_equal 3
         end
 
         it 'should exclude errors ignored by :ignore option' do
@@ -92,8 +94,8 @@ describe ValidateWebsite::Validator do
                                   @html5_page.body,
                                   ignore: ignore,
                                   html5_validator: :nu)
-          validator.valid?.must_equal false
-          validator.errors.size.must_equal 1
+          _(validator.valid?).must_equal false
+          _(validator.errors.size).must_equal 1
         end
       end
 
@@ -101,8 +103,8 @@ describe ValidateWebsite::Validator do
         it 'should have an array of errors' do
           validator = subject.new(@html5_page.doc,
                                   @html5_page.body)
-          validator.valid?.must_equal false
-          validator.errors.size.must_equal 4
+          _(validator.valid?).must_equal false
+          _(validator.errors.size).must_equal 3
         end
 
         it 'should exclude errors ignored by :ignore option' do
@@ -110,8 +112,8 @@ describe ValidateWebsite::Validator do
           validator = subject.new(@html5_page.doc,
                                   @html5_page.body,
                                   ignore: ignore)
-          validator.valid?.must_equal false
-          validator.errors.size.must_equal 2
+          _(validator.valid?).must_equal false
+          _(validator.errors.size).must_equal 2
         end
       end
     end
@@ -122,13 +124,13 @@ describe ValidateWebsite::Validator do
       name = 'html4-strict'
       file = File.join('test', 'data', "#{name}.html")
       page = FakePage.new(name,
-                          body: open(file).read,
+                          body: File.open(file).read,
                           content_type: 'text/html')
       @html4_strict_page = @http.get_page(page.url)
       validator = subject.new(@html4_strict_page.doc,
                               @html4_strict_page.body)
       validator.valid?
-      validator.errors.must_equal []
+      _(validator.errors).must_equal []
     end
   end
 end

data/test/webmock_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'webmock/minitest'
 
 # FakePage html helper for webmock
@@ -27,8 +29,8 @@ class FakePage
 
   def create_body
     @body = '<html><body>'
-    @links.each { |l| @body += "<a href=\"#{TEST_DOMAIN}#{l}\"></a>" } if @links
-    @hrefs.each { |h| @body += "<a href=\"#{h}\"></a>" } if @hrefs
+    @links&.each { |l| @body += "<a href=\"#{TEST_DOMAIN}#{l}\"></a>" }
+    @hrefs&.each { |h| @body += "<a href=\"#{h}\"></a>" }
     @body += '</body></html>'
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validate-website
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Laurent Arnoud
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-25 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: crass
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: w3c_validators
   requirement: !ruby/object:Gem::Requirement
@@ -95,47 +95,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: asciidoctor
+  name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
+        version: '1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: asciidoctor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: minitest-focus
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.58.0
+        version: 0.76.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.58.0
+        version: 0.76.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -273,15 +273,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.2.0.rc.2
 signing_key: 
 specification_version: 4
 summary: Web crawler for checking the validity of your documents