fdlint 0.2.0.pre → 0.2.0

data/test/html/rule/check_block_level_element_test.rb

@@ -1,47 +1,45 @@
 # encoding: utf-8
 
 require_relative '../../helper'
-require 'html/rule/check_tag_rule'
 
-module XRayTest
+module FdlintTest
   module HTML
     module Rule
       
       class CheckBlockLevelElementTest < Test::Unit::TestCase
 
-        include XRay::HTML
+        include FdlintTest::HTML
 
         def setup
-          @rule = XRay::HTML::Rule::CheckTagRule.new
+          @block_level_err = [:error, "行内标签不得包含块级标签，a标签例外"]
         end
 
         def test_check_normal
-          tag = Element.new('div', nil, [
-            Element.new('span', nil, [
-              TextElement.new('good day, commander!')
-            ])
-          ])
-          assert_equal [], @rule.check_html_tag(tag)
+          src = %Q{<div><span>good day, commander!</span></div>}
+          parse src do |results|
+            assert_not_has_result results, @block_level_err
+          end
         end
 
         def test_check_block_in_inline
-          tag = Element.new('span', nil, [
-            Element.new('div', nil, [
-              TextElement.new('good day, commander!')
-            ])
-          ])
-          assert_equal [["行内标签不得包含块级标签，a标签例外", :error]], @rule.check_html_tag(tag)
+          src = %Q{<span><div>good day, commander!</div></span>}
+          parse src do |results|
+            assert_has_result results, @block_level_err
+          end
         end
 
         def test_check_inline_inline_block
-          tag = Element.new('span', nil, [
-            Element.new('span', nil, [
-              Element.new('div', nil, [
-                TextElement.new('good day, commander!')
-              ])
-            ])
-          ])
-          assert_equal [], @rule.check_html_tag(tag)
+          src = %Q{<span><span>good day, commander!</span></span>}
+          parse src do |results|
+            assert_not_has_result results, @block_level_err
+          end
+        end
+
+        def test_check_block_in_a
+          src = %Q{<a><div>good day, commander!</div></a>}
+          parse src do |results|
+            assert_not_has_result results, @block_level_err
+          end
         end
 
       end

data/test/html/rule/check_button_test.rb

@@ -1,26 +1,25 @@
 # encoding: utf-8
 
 require_relative '../../helper'
-require 'html/rule/check_tag_rule'
 
-module XRayTest
+module FdlintTest
   module HTML
     module Rule
       
       class CheckButtonTest < Test::Unit::TestCase
 
-        include XRay::HTML
+        include FdlintTest::HTML
 
         def setup
-          @rule = XRay::HTML::Rule::CheckTagRule.new
+          @button_err = [:error, "所有按钮必须用button（button/submit/reset）"]
         end
 
         def test_check_normal
           src = %q(<button type="button" name="usernmae" />
             <button type="submit" name="male" />
             <button type="reset" name="food" />)
-          XRay::HTML::Parser.parse(src).each do |tag|
-            assert_equal [], @rule.check_html_tag(tag)
+          parse src do |results|
+            assert_not_has_result results, @button_err
           end
         end
 
@@ -28,9 +27,10 @@ module XRayTest
           src = %q(<input type="button" value="btn" />
             <input type="submit" name="submit" value="submit"/>
             <input type="reset" />)
-          XRay::HTML::Parser.parse(src).each do |tag|
-            unless tag.is_a? TextElement
-              assert_equal [["所有按钮必须用button（button/submit/reset）", :error]], @rule.check_html_tag(tag)
+
+          src.each_line do |src|
+            parse src do |results|
+              assert_has_result results, @button_err
             end
           end
         end

data/test/html/rule/check_css_in_head_test.rb

@@ -1,46 +1,28 @@
 # encoding: utf-8
 
 require_relative '../../helper'
-require 'html/rule/check_tag_rule'
 
-module XRayTest
+module FdlintTest
   module HTML
     module Rule
       
       class CheckCSSInHeadTest < Test::Unit::TestCase
 
-        def setup
-          @rule = XRay::HTML::Rule::CheckTagRule.new
-        end
+        include FdlintTest::HTML
 
-        def test_check_alone_css_tag
-          tag = css_link('test.css')
-          assert_equal [], @rule.check_html_tag(tag)
-        end
+        check_rule [:warn, '外链CSS置于head里(例外：应用里的footer样式)'] do
 
-        def test_check_css_tag_in_head
-          tag = css_link('test.css')
-          head = XRay::HTML::Element.new('head', nil, [tag])
-          assert_equal [], @rule.check_html_tag(tag)
-        end
-
-        def test_check_css_tag_in_body
-          tag = css_link('test.css')
-          body = XRay::HTML::Element.new('body', nil, [tag])
-          assert_equal [["外链CSS置于head里(例外：应用里的footer样式)", :warn]], @rule.check_html_tag(tag)
-        end
+          should_with_result do
+            [
+              %Q{<link rel="stylesheet" href="test.css"/>},
+              %Q{<body><link rel="stylesheet" href="test.css"/></body>}
+            ]
+          end
 
-        def test_from_fixture
-          results = XRay::Runner.new.check_html( fixture "html/css_out_of_head.html" )
-          found = results.find_all do |res|
-            res.message == "外链CSS置于head里(例外：应用里的footer样式)"
+          should_without_result do
+            %Q{<head><link rel="stylesheet" href="test.css"/></head>}
           end
-          assert_equal 1, found.size
-        end
 
-        protected
-        def css_link(src)
-          XRay::HTML::Element.new('link', {:rel => 'stylesheet', :href=>src}, [], :self)
         end
 
       end
@@ -48,6 +30,3 @@ module XRayTest
     end
   end
 end
-
-
-

data/test/html/rule/check_dtd_test.rb

@@ -1,39 +1,43 @@
 # encoding: utf-8
 
 require_relative '../../helper'
-require 'html/rule/check_tag_rule'
 
-module XRayTest
+module FdlintTest
   module HTML
     module Rule
       
       class CheckDTDTest < Test::Unit::TestCase
 
+        include FdlintTest::HTML
+
         def setup
-          @rule = XRay::HTML::Rule::CheckTagRule.new
         end
 
         def test_check_html5_dtd
-          tag = XRay::HTML::DTDElement.new('html')
-          assert_equal [], @rule.check_html_dtd(tag)
+          parse '<!DOCTYPE html>' do |results|
+            assert results.blank?
+          end
         end
 
         def test_check_xhtml_dtd
           src = %q(html 
              PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
              "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd")
-          tag = XRay::HTML::DTDElement.new(src)
-          assert_equal [['新页面统一使用HTML 5 DTD', :warn]], @rule.check_html_dtd(tag)
+          parse DTDElement.new(src).outer_html do |results|
+            assert_has_result results, [:warn, '推荐使用HTML 5 DTD']
+          end
         end
 
         def test_check_doctype_upcase
-          tag = XRay::HTML::DTDElement.new('html', 'doctype')
-          assert_equal [['必须使用大写的"DOCTYPE"', :warn]], @rule.check_html_dtd(tag)
+          parse '<!doctype html>' do |results|
+            assert_has_result results, [:warn, '必须使用大写的"DOCTYPE"']
+          end
         end
 
         def test_check_dtd_available
-          doc = XRay::HTML::Parser.new('<html><body></body></html>')
-          assert @rule.check_html_doc(doc).include?(['必须存在文档类型声明', :error])
+          parse '<html><body></body></html>' do |results|
+            assert_has_result results, [:error, '必须存在文档类型声明']
+          end
         end
 
       end

data/test/html/rule/check_form_element_name_test.rb

@@ -1,18 +1,17 @@
 # encoding: utf-8
 
 require_relative '../../helper'
-require 'html/rule/check_tag_rule'
 
-module XRayTest
+module FdlintTest
   module HTML
     module Rule
       
       class CheckFormElementNameTest < Test::Unit::TestCase
 
-        include XRay::HTML
+        include FdlintTest::HTML
 
         def setup
-          @rule = XRay::HTML::Rule::CheckTagRule.new
+          @err = [:error, 'text、radio、checkbox、textarea、select必须加name属性']
         end
 
         def test_check_normal
@@ -21,8 +20,10 @@ module XRayTest
             <input type="checkbox" name="food" />
             <textarea name="bio">test</textarea>
             <select name="city"></select>)
-          XRay::HTML::Parser.parse(src).each do |tag|
-            assert_equal [], @rule.check_html_tag(tag)
+          src.each_line do |src|
+            parse src do |results|
+              assert_not_has_result results, @err
+            end
           end
         end
 
@@ -32,9 +33,9 @@ module XRayTest
             <input type="checkbox" />
             <textarea>test</textarea>
             <select></select>)
-          XRay::HTML::Parser.parse(src).each do |tag|
-            unless tag.is_a? TextElement
-              assert_equal [["text、radio、checkbox、textarea、select必须加name属性", :error]], @rule.check_html_tag(tag)
+          src.each_line do |src|
+            parse src do |results|
+              assert_has_result results, @err
             end
           end
         end

data/test/html/rule/check_head_contain_meta_and_title_test.rb

@@ -1,48 +1,42 @@
 # encoding: utf-8
 
 require_relative '../../helper'
-require 'html/rule/check_tag_rule'
 
-module XRayTest
+module FdlintTest
   module HTML
     module Rule
       
       class CheckHeadTest < Test::Unit::TestCase
 
-        include XRay::HTML
-
-        def setup
-          @rule = XRay::HTML::Rule::CheckTagRule.new
-          @expect = ["head必须包含字符集meta和title", :error]
-        end
-
-        def test_check_right_tag
-          tag = XRay::HTML::Element.new('head',nil, [
-            Element.new('meta', {:charset => 'utf-8'}),
-            Element.new('title', nil, [TextElement.new('hello world!')]),
-            Element.new('meta', {:name => 'description'}),
-            Element.new('meta', {:name => 'keywords'})
-          ])
-          assert_equal [], @rule.check_html_tag(tag)
-        end
-
-        def test_check_simple_head
-          tag = XRay::HTML::Element.new('head')
-          assert @rule.check_html_tag(tag).include?(@expect)
-        end
-
-        def test_check_head_without_meta
-          tag = XRay::HTML::Element.new('head',nil, [
-            Element.new('title', nil, [TextElement.new('hello world!')])
-          ])
-          assert @rule.check_html_tag(tag).include?(@expect)
+        include FdlintTest::HTML
+
+        should_with_result [:error, "head必须包含字符集meta和title"] do
+          [
+            %Q{<head></head>},
+
+            %Q{<head>
+                <title>hello world!</title>
+                <meta name="description">
+                <meta name="keywords">
+              </head>},
+              
+            %Q{<head>
+                <meta charset="utf-8">
+                <meta name="description">
+                <meta name="keywords">
+              </head>}
+          ]
         end
 
-        def test_check_head_without_title
-          tag = XRay::HTML::Element.new('head',nil, [
-            Element.new('meta', {:charset => 'utf-8'})
-          ])
-          assert @rule.check_html_tag(tag).include?(@expect)
+        should_without_result [:error, "head必须包含字符集meta和title"] do
+          <<-SRC
+            <head>
+              <meta charset="utf-8">
+              <title>hello world!</title>
+              <meta name="description">
+              <meta name="keywords">
+            </head>
+          SRC
         end
 
       end

data/test/html/rule/check_hyperlink_with_target_test.rb

@@ -1,33 +1,39 @@
 # encoding: utf-8
 
 require_relative '../../helper'
-require 'html/rule/check_tag_rule'
 
-module XRayTest
+module FdlintTest
   module HTML
     module Rule
       
       class CheckHyperlinkWithTargetTest < Test::Unit::TestCase
 
-        def setup
-          @rule = XRay::HTML::Rule::CheckTagRule.new
-        end
+        include FdlintTest::HTML
 
-        def test_check_functional_a_with_target
-          tag = XRay::HTML::Element.new('a', {:href=>'#nogo', :target=>'_self'})
-          assert_equal [], @rule.check_html_tag(tag)
-        end
+        check_rule [:warn, '功能a必须加target="_self"，除非preventDefault过'] do
 
-        def test_check_functional_a_without_target
-          tag = XRay::HTML::Element.new('a', {:href=>'#nogo'})
-          assert_equal [['功能a必须加target="_self"，除非preventDefault过', :warn]], @rule.check_html_tag(tag)
-        end
+          should_with_result do
+            [
+              %Q{<a href="#nogo"></a>},
+
+              %Q{
+                <base target="_blank">
+                <a href="#nogo"></a>
+              }
+            ]
+          end
+
+          should_without_result do
+            [
+              %Q{<a href="#nogo" target="_self"></a>},
 
-        def test_when_html_has_base_tag
-          @rule.check_html_tag XRay::HTML::Element.new('base', {:target=>'_self'})
+              %Q{
+                <base target="_self">
+                <a href="#nogo"></a>
+              }
+            ]
+          end
 
-          tag = XRay::HTML::Element.new('a', {:href=>'#nogo'})
-          assert_equal [], @rule.check_html_tag(tag)
         end
 
       end

data/test/html/rule/check_hyperlink_with_title_test.rb

@@ -1,36 +1,29 @@
 # encoding: utf-8
 
 require_relative '../../helper'
-require 'html/rule/check_tag_rule'
 
-module XRayTest
+module FdlintTest
   module HTML
     module Rule
       
       class CheckHyperlinkWithTitleTest < Test::Unit::TestCase
 
-        def setup
-          @rule = XRay::HTML::Rule::CheckTagRule.new
-        end
+        include FdlintTest::HTML
 
-        def test_check_functional_a_with_title
-          tag = XRay::HTML::Element.new('a', {:href=>'#nogo', :title=>'it is a hyperlink', :target=>'_self'})
-          assert_equal [], @rule.check_html_tag(tag)
-        end
+        check_rule [:error, '非功能能点的a标签必须加上title属性'] do
 
-        def test_check_functional_a_without_title
-          tag = XRay::HTML::Element.new('a', {:href=>'#nogo', :target=>'_self'})
-          assert_equal [], @rule.check_html_tag(tag)
-        end
+          should_with_result do
+            %Q{<a href="new-page.html"></a>}
+          end
 
-        def test_check_normal_a_with_title
-          tag = XRay::HTML::Element.new('a', {:href=>'new-page.html', :title=>'new page'})
-          assert_equal [], @rule.check_html_tag(tag)
-        end
+          should_without_result do
+            [
+              %Q{<a href="new-page.html" title="new page"></a>},
+
+              %Q{<a href="#nogo"></a>}
+            ]
+          end
 
-        def test_check_normal_a_without_title
-          tag = XRay::HTML::Element.new('a', {:href=>'new-page.html'})
-          assert_equal [['非功能能点的a标签必须加上title属性', :error]], @rule.check_html_tag(tag)
         end
 
       end

data/test/html/rule/check_id_n_class_downcase_test.rb

@@ -1,36 +1,25 @@
 # encoding: utf-8
 
 require_relative '../../helper'
-require 'html/rule/check_tag_rule'
 
-module XRayTest
+module FdlintTest
   module HTML
     module Rule
       
       class CheckIDAndClassPropCaseTest < Test::Unit::TestCase
 
-        def setup
-          @rule = XRay::HTML::Rule::CheckTagRule.new
-        end
-
-        def test_check_downcase_id
-          prop = XRay::HTML::Property.new('id', 'uploader')
-          assert_equal [], @rule.check_html_property(prop)
-        end
+        include FdlintTest::HTML
 
-        def test_check_downcase_class
-          prop = XRay::HTML::Property.new('class', 'uploader info')
-          assert_equal [], @rule.check_html_property(prop)
+        should_with_result [:error, "id名称全部小写，单词分隔使用中横线"] do
+          %Q{<a id="Nogo" href="#nogo"></a>}
         end
 
-        def test_check_upcase_id
-          prop = XRay::HTML::Property.new('id', 'Nogo')
-          assert_equal [["id名称全部小写，单词分隔使用中横线", :error]], @rule.check_html_property(prop)
+        should_with_result [:error, "class名称全部小写"] do
+          %Q{<a class="Nogo" href="#nogo" target="_self"></a>}
         end
 
-        def test_check_upcase_class
-          prop = XRay::HTML::Property.new('class', 'Nogo')
-          assert_equal [["class名称全部小写，单词分隔使用中横线", :error]], @rule.check_html_property(prop)
+        should_with_result [:error, "class名称单词分隔使用中横线"] do
+          %Q{<a class="no_go" href="#nogo" target="_self"></a>}
         end
 
       end

data/test/html/rule/check_img_with_alt_prop_test.rb

@@ -1,26 +1,25 @@
 # encoding: utf-8
 
 require_relative '../../helper'
-require 'html/rule/check_tag_rule'
 
-module XRayTest
+module FdlintTest
   module HTML
     module Rule
       
       class CheckImgWithAltPropTest < Test::Unit::TestCase
 
-        def setup
-          @rule = XRay::HTML::Rule::CheckTagRule.new
-        end
+        include FdlintTest::HTML
 
-        def test_check_img_with_alt
-          tag = XRay::HTML::Element.new('img', {:src=>'http://pnq.cc/icon.png', :alt=>'图片'}, [], :self)
-          assert_equal [], @rule.check_html_tag(tag)
-        end
+        check_rule [:error, 'img标签必须加上alt属性'] do
+
+          should_with_result do
+            %Q{<img src="http://pnq.cc/icon.png" />}
+          end
+
+          should_without_result do
+            %Q{<img src="http://pnq.cc/icon.png" alt="test" />}
+          end
 
-        def test_check_img_without_alt
-          tag = XRay::HTML::Element.new('img', {:src=>'http://pnq.cc/icon.png'}, [], :self)
-          assert_equal [["img标签必须加上alt属性", :error]], @rule.check_html_tag(tag)
         end
 
       end

data/test/html/rule/check_no_import_css_test.rb

@@ -1,32 +1,32 @@
 # encoding: utf-8
 
 require_relative '../../helper'
-require 'html/rule/check_tag_rule'
 
-module XRayTest
+module FdlintTest
   module HTML
     module Rule
       
       class CheckNoCSSImportTest < Test::Unit::TestCase
 
-        include XRay::HTML
-
-        def setup
-          @rule = XRay::HTML::Rule::CheckTagRule.new
-        end
-
-        def test_check_normal
-          tag = XRay::HTML::Element.new('style', nil, [
-            TextElement.new('body { background-color:#fff; }')
-          ])
-          assert_equal [], @rule.check_html_tag(tag)
-        end
-
-        def test_check_style_with_import
-          tag = XRay::HTML::Element.new('style', nil, [
-            TextElement.new('@import style.css')
-          ])
-          assert_equal [["不通过@import在页面上引入CSS", :error]], @rule.check_html_tag(tag)
+        include FdlintTest::HTML
+
+        check_rule [:error, '不通过@import在页面上引入CSS'] do
+
+          should_with_result do
+            <<-SRC
+              <style>
+                @import "style.css"
+              </style>
+            SRC
+          end
+
+          should_without_result do
+            <<-SRC
+              <style>
+                body { background-color: #fff; }
+              </style>
+            SRC
+          end
         end
 
       end

data/test/html/rule/check_prop_have_value_test.rb

@@ -1,28 +1,24 @@
 # encoding: utf-8
 
 require_relative '../../helper'
-require 'html/rule/check_tag_rule'
 
-module XRayTest
+module FdlintTest
   module HTML
     module Rule
       
       class CheckPropHaveValueTest < Test::Unit::TestCase
 
-        include XRay::HTML
+        include FdlintTest::HTML
 
-        def setup
-          @rule = XRay::HTML::Rule::CheckTagRule.new
-        end
+        check_rule [:error, '不能仅有属性名'] do
 
-        def test_check_double_quote
-          prop = XRay::HTML::Property.new('checked', 'true')
-          assert_equal [], @rule.check_html_property(prop)
-        end
+          should_with_result do
+            %Q{<input type="radio" checked />}
+          end
 
-        def test_check_single_quote
-          prop = XRay::HTML::Property.new('checked', nil)
-          assert_equal [["不能仅有属性名", :error]], @rule.check_html_property(prop)
+          should_without_result do
+            %Q{<input type="radio" checked="true" />}
+          end
         end
 
       end