rspec-html-matchers 0.3.5 → 0.4.0

data/rspec-html-matchers.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "rspec-html-matchers"
-  s.version     = '0.3.5'
+  s.version     = '0.4.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["kucaahbe"]
   s.email       = ["kucaahbe@ukr.net"]
@@ -28,4 +28,5 @@ DESC
   s.add_development_dependency 'capybara'
   s.add_development_dependency 'sinatra'
   s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec', '>= 2.11.0' # in order to use new expect().to syntax
 end

data/spec/assets/quotes.html

@@ -0,0 +1,15 @@
+<div>sample text</div>
+<span>sample with 'single' quotes</span>
+<span>sample with 'single' and "double" quotes</span>
+<p>one</p>
+<p>two</p>
+<p>three </p>
+<p>315</p>
+<p>content&nbsp;with&nbsp;nbsp</p>
+<pre> 1. bla   
+ 2. bla </pre>
+
+<a href="#">học</a>
+<!--
+vim:list
+-->

data/spec/matchers/form_matchers_spec.rb

@@ -1,11 +1,12 @@
 require 'spec_helper'
 
 describe "have_form" do
-  let(:rendered) { IO.read(File.dirname(__FILE__)+"/../../assets/form.html") }
+  asset 'form'
 
   context "without &block" do
     it "should find form" do
-      rendered.should have_form("/books", :post)
+      rendered.should have_form("/books", :post) # just to make sure it just works
+      # params checking:
       self.should_receive(:have_tag).with("form#new_book", :with => { :method => "post", :action => "/books", :class => %w(book formtastic) })
       rendered.should have_form("/books", "post", :with => { :id => "new_book", :class => %w(book formtastic) })
     end

data/spec/matchers/have_tag_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 describe 'have_tag' do
   context "through css selector" do
-    let(:rendered) { asset('search_and_submit') }
+    asset 'search_and_submit'
 
     it "should have right description" do
       have_tag('div').description.should == 'have at least 1 element matching "div"'
@@ -28,25 +28,25 @@ describe 'have_tag' do
     end
 
     it "should not find tags and display appropriate message" do
-      expect { rendered.should have_tag('span') }.should raise_spec_error(
+      expect { rendered.should have_tag('span') }.to raise_spec_error(
         %Q{expected following:\n#{rendered}\nto have at least 1 element matching "span", found 0.}
       )
-      expect { rendered.should have_tag('span#some_id') }.should raise_spec_error(
+      expect { rendered.should have_tag('span#some_id') }.to raise_spec_error(
         %Q{expected following:\n#{rendered}\nto have at least 1 element matching "span#some_id", found 0.}
       )
-      expect { rendered.should have_tag('span.some_class') }.should raise_spec_error(
+      expect { rendered.should have_tag('span.some_class') }.to raise_spec_error(
         %Q{expected following:\n#{rendered}\nto have at least 1 element matching "span.some_class", found 0.}
       )
     end
 
     it "should find unexpected tags and display appropriate message" do
-      expect { rendered.should_not have_tag('div') }.should raise_spec_error(
+      expect { rendered.should_not have_tag('div') }.to raise_spec_error(
         %Q{expected following:\n#{rendered}\nto NOT have element matching "div", found 2.}
       )
-      expect { rendered.should_not have_tag('div#div') }.should raise_spec_error(
+      expect { rendered.should_not have_tag('div#div') }.to raise_spec_error(
         %Q{expected following:\n#{rendered}\nto NOT have element matching "div#div", found 1.}
       )
-      expect { rendered.should_not have_tag('p.paragraph') }.should raise_spec_error(
+      expect { rendered.should_not have_tag('p.paragraph') }.to raise_spec_error(
         %Q{expected following:\n#{rendered}\nto NOT have element matching "p.paragraph", found 1.}
       )
     end
@@ -67,14 +67,14 @@ describe 'have_tag' do
       end
 
       it "should not find tags that have classes specified via array and display appropriate message" do
-        expect do
+        expect {
           rendered.should have_tag('div',:with => {:class => %w(class-other class-two)})
-        end.should raise_spec_error(
+        }.to raise_spec_error(
           %Q{expected following:\n#{rendered}\nto have at least 1 element matching "div.class-other.class-two", found 0.}
         )
-        expect do
+        expect {
           rendered.should have_tag('div',:with => {:class => 'class-other class-two'})
-        end.should raise_spec_error(
+        }.to raise_spec_error(
           %Q{expected following:\n#{rendered}\nto have at least 1 element matching "div.class-other.class-two", found 0.}
         )
       end
@@ -85,13 +85,13 @@ describe 'have_tag' do
       end
 
       it "should not find tags and display appropriate message" do
-        expect { rendered.should have_tag('input#search',:with => {:type => "some_other_type"}) }.should raise_spec_error(
+        expect { rendered.should have_tag('input#search',:with => {:type => "some_other_type"}) }.to raise_spec_error(
           %Q{expected following:\n#{rendered}\nto have at least 1 element matching "input#search[type='some_other_type']", found 0.}
         )
       end
 
       it "should find unexpected tags and display appropriate message" do
-        expect { rendered.should_not have_tag('input#search',:with => {:type => "text"}) }.should raise_spec_error(
+        expect { rendered.should_not have_tag('input#search',:with => {:type => "text"}) }.to raise_spec_error(
           %Q{expected following:\n#{rendered}\nto NOT have element matching "input#search[type='text']", found 1.}
         )
       end
@@ -101,7 +101,7 @@ describe 'have_tag' do
   end
 
   context "by count" do
-    let(:rendered) { asset('paragraphs') }
+    asset 'paragraphs'
 
     it "should have right description" do
       have_tag('div', :count => 100500).description.should == 'have 100500 element(s) matching "div"'
@@ -132,146 +132,272 @@ describe 'have_tag' do
     end
 
     it "should not find tags and display appropriate message(with :count)" do
-      expect { rendered.should have_tag('p', :count => 10) }.should raise_spec_error(
+      expect { rendered.should have_tag('p', :count => 10) }.to raise_spec_error(
         %Q{expected following:\n#{rendered}\nto have 10 element(s) matching "p", found 3.}
       )
 
-      expect { rendered.should have_tag('p', :count => 4..8) }.should raise_spec_error(
+      expect { rendered.should have_tag('p', :count => 4..8) }.to raise_spec_error(
         %Q{expected following:\n#{rendered}\nto have at least 4 and at most 8 element(s) matching "p", found 3.}
       )
     end
 
     it "should find unexpected tags and display appropriate message(with :count)" do
-      expect { rendered.should_not have_tag('p', :count => 3) }.should raise_spec_error(
+      expect { rendered.should_not have_tag('p', :count => 3) }.to raise_spec_error(
         %Q{expected following:\n#{rendered}\nto NOT have 3 element(s) matching "p", but found.}
       )
 
-      expect { rendered.should_not have_tag('p', :count => 1..3) }.should raise_spec_error(
+      expect { rendered.should_not have_tag('p', :count => 1..3) }.to raise_spec_error(
         %Q{expected following:\n#{rendered}\nto NOT have at least 1 and at most 3 element(s) matching "p", but found 3.}
       )
     end
 
     it "should not find tags and display appropriate message(with :minimum)" do
-      expect { rendered.should have_tag('p', :min => 100) }.should raise_spec_error(
+      expect { rendered.should have_tag('p', :min => 100) }.to raise_spec_error(
         %Q{expected following:\n#{rendered}\nto have at least 100 element(s) matching "p", found 3.}
       )
-      expect { rendered.should have_tag('p', :minimum => 100) }.should raise_spec_error(
+      expect { rendered.should have_tag('p', :minimum => 100) }.to raise_spec_error(
         %Q{expected following:\n#{rendered}\nto have at least 100 element(s) matching "p", found 3.}
       )
     end
 
     it "should find unexpected tags and display appropriate message(with :minimum)" do
-      expect { rendered.should_not have_tag('p', :min => 2) }.should raise_spec_error(
+      expect { rendered.should_not have_tag('p', :min => 2) }.to raise_spec_error(
         %Q{expected following:\n#{rendered}\nto NOT have at least 2 element(s) matching "p", but found 3.}
       )
-      expect { rendered.should_not have_tag('p', :minimum => 2) }.should raise_spec_error(
+      expect { rendered.should_not have_tag('p', :minimum => 2) }.to raise_spec_error(
         %Q{expected following:\n#{rendered}\nto NOT have at least 2 element(s) matching "p", but found 3.}
       )
     end
 
     it "should not find tags and display appropriate message(with :maximum)" do
-      expect { rendered.should have_tag('p', :max => 2) }.should raise_spec_error(
+      expect { rendered.should have_tag('p', :max => 2) }.to raise_spec_error(
         %Q{expected following:\n#{rendered}\nto have at most 2 element(s) matching "p", found 3.}
       )
-      expect { rendered.should have_tag('p', :maximum => 2) }.should raise_spec_error(
+      expect { rendered.should have_tag('p', :maximum => 2) }.to raise_spec_error(
         %Q{expected following:\n#{rendered}\nto have at most 2 element(s) matching "p", found 3.}
       )
     end
 
     it "should find unexpected tags and display appropriate message(with :maximum)" do
-      expect { rendered.should_not have_tag('p', :max => 5) }.should raise_spec_error(
+      expect { rendered.should_not have_tag('p', :max => 5) }.to raise_spec_error(
         %Q{expected following:\n#{rendered}\nto NOT have at most 5 element(s) matching "p", but found 3.}
       )
-      expect { rendered.should_not have_tag('p', :maximum => 5) }.should raise_spec_error(
+      expect { rendered.should_not have_tag('p', :maximum => 5) }.to raise_spec_error(
         %Q{expected following:\n#{rendered}\nto NOT have at most 5 element(s) matching "p", but found 3.}
       )
     end
 
     it "should raise error when wrong params specified" do
-      expect { rendered.should have_tag('div', :count => 'string') }.should raise_error(/wrong :count/)
+      expect { rendered.should have_tag('div', :count => 'string') }.to raise_error(/wrong :count/)
       wrong_params_error_msg_1 = ':count with :minimum or :maximum has no sence!'
-      expect { rendered.should have_tag('div', :count => 2, :minimum => 1) }.should raise_error(wrong_params_error_msg_1)
-      expect { rendered.should have_tag('div', :count => 2, :min     => 1) }.should raise_error(wrong_params_error_msg_1)
-      expect { rendered.should have_tag('div', :count => 2, :maximum => 1) }.should raise_error(wrong_params_error_msg_1)
-      expect { rendered.should have_tag('div', :count => 2, :max     => 1) }.should raise_error(wrong_params_error_msg_1)
+      expect { rendered.should have_tag('div', :count => 2, :minimum => 1) }.to raise_error(wrong_params_error_msg_1)
+      expect { rendered.should have_tag('div', :count => 2, :min     => 1) }.to raise_error(wrong_params_error_msg_1)
+      expect { rendered.should have_tag('div', :count => 2, :maximum => 1) }.to raise_error(wrong_params_error_msg_1)
+      expect { rendered.should have_tag('div', :count => 2, :max     => 1) }.to raise_error(wrong_params_error_msg_1)
       wrong_params_error_msg_2 = ':minimum shold be less than :maximum!'
-      expect { rendered.should have_tag('div', :minimum => 2, :maximum => 1) }.should raise_error(wrong_params_error_msg_2)
+      expect { rendered.should have_tag('div', :minimum => 2, :maximum => 1) }.to raise_error(wrong_params_error_msg_2)
       [ 4..1, -2..6, 'a'..'z', 3..-9 ].each do |range|
-        expect { rendered.should have_tag('div', :count => range ) }.should raise_error("Your :count range(#{range.to_s}) has no sence!")
+        expect { rendered.should have_tag('div', :count => range ) }.to raise_error("Your :count range(#{range.to_s}) has no sence!")
       end
     end
   end
 
-  context "with content specified" do
-    let(:rendered) { asset('quotes') }
+  context "with :text specified" do
+    asset 'quotes'
 
-    it "should find tags" do
-      rendered.should have_tag('div',  :text => 'sample text')
-      rendered.should have_tag('p',    :text => 'one')
-      rendered.should have_tag('div',  :text => /SAMPLE/i)
-      rendered.should have_tag('span', :text => "sample with 'single' quotes")
-      rendered.should have_tag('span', :text => %Q{sample with 'single' and "double" quotes})
-      rendered.should have_tag('span', :text => /sample with 'single' and "double" quotes/)
-
-      rendered.should have_tag('p',    :text => 'content with ignored spaces around')
-      rendered.should have_tag('p',    :text => 'content with ignored spaces in')
-      rendered.should have_tag('p',    :text => 'content with nbsp')
-      rendered.should have_tag('p',    :text => 'content with nbsp  and  spaces   around')
-      rendered.should have_tag('pre',  :text => " 1. bla   \n 2. bla ")
-    end
+    context 'using standard syntax' do
 
-    it "should map a string argument to :text => string" do
-      rendered.should have_tag('div',  'sample text')
-    end
+      it "should find tags" do
+        rendered.should have_tag('div',  :text => 'sample text')
+        rendered.should have_tag('p',    :text => 'one')
+        rendered.should have_tag('div',  :text => /SAMPLE/i)
+        rendered.should have_tag('span', :text => "sample with 'single' quotes")
+        rendered.should have_tag('span', :text => %Q{sample with 'single' and "double" quotes})
+        rendered.should have_tag('span', :text => /sample with 'single' and "double" quotes/)
+
+        rendered.should have_tag('p',    :text => 'content with nbsp')
+        rendered.should have_tag('pre',  :text => " 1. bla   \n 2. bla ")
+      end
 
-    it "should find with unicode text specified" do
-      expect { rendered.should have_tag('a', :text => "học") }.to_not raise_exception(Encoding::CompatibilityError) if RUBY_VERSION =~ /^1\.9/
-      rendered.should have_tag('a', :text => "học")
-    end
+      it "should map a string argument to :text => string" do
+        rendered.should have_tag('div',  'sample text')
+      end
 
-    it "should not find tags" do
-      rendered.should_not have_tag('p',      :text => 'text does not present')
-      rendered.should_not have_tag('strong', :text => 'text does not present')
-      rendered.should_not have_tag('p',      :text => /text does not present/)
-      rendered.should_not have_tag('strong', :text => /text does not present/)
-
-      rendered.should_not have_tag('p',      :text => 'content with ignoredspaces around')
-      rendered.should_not have_tag('p',      :text => 'content with ignored  spaces around')
-      rendered.should_not have_tag('p',      :text => 'content withignored spaces in')
-      rendered.should_not have_tag('p',      :text => 'contentwith nbsp')
-      rendered.should_not have_tag('p',      :text => 'content with nbsp  and  spaces  around')
-      rendered.should_not have_tag('pre',    :text => "1. bla\n2. bla")
-    end
+      it "should find with unicode text specified" do
+        expect { rendered.should have_tag('a', :text => "học") }.to_not raise_exception(Encoding::CompatibilityError) if RUBY_VERSION =~ /^1\.9/
+          rendered.should have_tag('a', :text => "học")
+      end
 
-    it "should invoke #to_s method for :text" do
-      expect {
-        rendered.should_not have_tag('p', :text => 100500 )
-        rendered.should have_tag('p', :text => 315 )
-      }.to_not raise_exception
-    end
+      it "should not find tags" do
+        rendered.should_not have_tag('p',      :text => 'text does not present')
+        rendered.should_not have_tag('strong', :text => 'text does not present')
+        rendered.should_not have_tag('p',      :text => /text does not present/)
+        rendered.should_not have_tag('strong', :text => /text does not present/)
+
+        rendered.should_not have_tag('p',      :text => 'contentwith nbsp')
+        rendered.should_not have_tag('pre',    :text => "1. bla\n2. bla")
+      end
+
+      it "should invoke #to_s method for :text" do
+        expect {
+          rendered.should_not have_tag('p', :text => 100500 )
+          rendered.should have_tag('p', :text => 315 )
+        }.to_not raise_exception
+      end
+
+      it "should not find tags and display appropriate message" do
+        # TODO make diffable,maybe...
+        expect { rendered.should have_tag('div', :text => 'SAMPLE text') }.to raise_spec_error(
+          %Q{"SAMPLE text" expected within "div" in following template:\n#{rendered}}
+        )
+        expect { rendered.should have_tag('div', :text => /SAMPLE tekzt/i) }.to raise_spec_error(
+          %Q{/SAMPLE tekzt/i regexp expected within "div" in following template:\n#{rendered}}
+        )
+      end
+
+      it "should find unexpected tags and display appropriate message" do
+        expect { rendered.should_not have_tag('div', :text => 'sample text') }.to raise_spec_error(
+          %Q{"sample text" unexpected within "div" in following template:\n#{rendered}\nbut was found.}
+        )
+        expect { rendered.should_not have_tag('div', :text => /SAMPLE text/i) }.to raise_spec_error(
+          %Q{/SAMPLE text/i regexp unexpected within "div" in following template:\n#{rendered}\nbut was found.}
+        )
+      end
 
-    it "should not find tags and display appropriate message" do
-      # TODO make diffable,maybe...
-      expect { rendered.should have_tag('div', :text => 'SAMPLE text') }.should raise_spec_error(
-        %Q{"SAMPLE text" expected within "div" in following template:\n#{rendered}}
-      )
-      expect { rendered.should have_tag('div', :text => /SAMPLE tekzt/i) }.should raise_spec_error(
-        %Q{/SAMPLE tekzt/i regexp expected within "div" in following template:\n#{rendered}}
-      )
     end
 
-    it "should find unexpected tags and display appropriate message" do
-      expect { rendered.should_not have_tag('div', :text => 'sample text') }.should raise_spec_error(
-        %Q{"sample text" unexpected within "div" in following template:\n#{rendered}\nbut was found.}
-      )
-      expect { rendered.should_not have_tag('div', :text => /SAMPLE text/i) }.should raise_spec_error(
-        %Q{/SAMPLE text/i regexp unexpected within "div" in following template:\n#{rendered}\nbut was found.}
-      )
+    context 'using alternative syntax(with_text/without_text)' do
+
+      it "should raise exception when used outside any other tag matcher" do
+        expect { with_text 'sample text' }.to    raise_error(StandardError,/inside "have_tag"/)
+        expect { without_text 'sample text' }.to raise_error(StandardError,/inside "have_tag"/)
+      end
+
+      it "should raise exception when used with block" do
+        expect {
+          rendered.should have_tag('div') do
+            with_text 'sample text' do
+              puts 'bla'
+            end
+          end
+        }.to raise_error(ArgumentError,/does not accept block/)
+        expect {
+          rendered.should have_tag('div') do
+            with_text 'sample text', proc { puts 'bla' }
+          end
+        }.to raise_error(ArgumentError)
+
+        expect {
+          rendered.should have_tag('div') do
+            without_text 'sample text' do
+              puts 'bla'
+            end
+          end
+        }.to raise_error(ArgumentError,/does not accept block/)
+        expect {
+          rendered.should have_tag('div') do
+            without_text 'sample text', proc { puts 'bla' }
+          end
+        }.to raise_error(ArgumentError)
+      end
+
+      it "should find tags" do
+        rendered.should have_tag('div') do
+          with_text 'sample text'
+        end
+
+        rendered.should have_tag('p') do
+          with_text 'one'
+        end
+
+        rendered.should have_tag('div') do
+          with_text /SAMPLE/i
+        end
+
+        rendered.should have_tag('span') do
+          with_text "sample with 'single' quotes"
+        end
+
+        rendered.should have_tag('span') do
+          with_text %Q{sample with 'single' and "double" quotes}
+        end
+
+        rendered.should have_tag('span') do
+          with_text /sample with 'single' and "double" quotes/
+        end
+
+
+        rendered.should have_tag('p') do
+          with_text 'content with nbsp'
+        end
+
+        rendered.should have_tag('pre') do
+          with_text " 1. bla   \n 2. bla "
+        end
+      end
+
+      it "should not find tags" do
+        rendered.should have_tag('p') do
+          but_without_text 'text does not present'
+          without_text 'text does not present'
+        end
+
+        rendered.should have_tag('p') do
+          but_without_text /text does not present/
+          without_text /text does not present/
+        end
+
+        rendered.should have_tag('p') do
+          but_without_text 'contentwith nbsp'
+          without_text 'contentwith nbsp'
+        end
+
+        rendered.should have_tag('pre') do
+          but_without_text "1. bla\n2. bla"
+          without_text "1. bla\n2. bla"
+        end
+      end
+
+      it "should not find tags and display appropriate message" do
+        expect {
+          rendered.should have_tag('div') do
+            with_text 'SAMPLE text'
+          end
+        }.to raise_spec_error(
+          %Q{"SAMPLE text" expected within "div" in following template:\n<div>sample text</div>}
+        )
+        expect {
+          rendered.should have_tag('div') do
+            with_text /SAMPLE tekzt/i
+          end
+        }.to raise_spec_error(
+          %Q{/SAMPLE tekzt/i regexp expected within "div" in following template:\n<div>sample text</div>}
+        )
+      end
+
+      it "should find unexpected tags and display appropriate message" do
+        expect {
+          rendered.should have_tag('div') do
+            without_text 'sample text'
+          end
+        }.to raise_spec_error(
+          %Q{"sample text" unexpected within "div" in following template:\n<div>sample text</div>\nbut was found.}
+        )
+        expect {
+          rendered.should have_tag('div') do
+            without_text /SAMPLE text/i
+          end
+        }.to raise_spec_error(
+          %Q{/SAMPLE text/i regexp unexpected within "div" in following template:\n<div>sample text</div>\nbut was found.}
+        )
+      end
+
     end
+
   end
 
   context "mixed matching" do
-    let(:rendered) { asset('special') }
+    asset 'special'
 
     it "should find tags by count and exact content" do
       rendered.should have_tag("td", :text => 'a', :count => 3)
@@ -312,7 +438,7 @@ describe 'have_tag' do
   end
 
   context "nested matching:" do
-    let(:rendered) { asset('ordered_list') }
+    asset 'ordered_list'
 
     it "should find tags" do
       rendered.should have_tag('ol') {
@@ -339,24 +465,24 @@ describe 'have_tag' do
     end
 
     it "should handle do; end" do
-      expect do
+      expect {
         rendered.should have_tag('ol') do
           with_tag('div')
         end
-      end.should raise_spec_error(/have at least 1 element matching "div", found 0/)
+      }.to raise_spec_error(/have at least 1 element matching "div", found 0/)
     end
 
     it "should not find tags and display appropriate message" do
       ordered_list_regexp = rendered[/<ol.*<\/ol>/m].gsub(/(\n?\s{2,}|\n\s?)/,'\n*\s*')
       expect {
         rendered.should have_tag('ol') { with_tag('li'); with_tag('div') }
-      }.should raise_spec_error(/expected following:\n#{ordered_list_regexp}\n\s*to have at least 1 element matching "div", found 0/)
+      }.to raise_spec_error(/expected following:\n#{ordered_list_regexp}\n\s*to have at least 1 element matching "div", found 0/)
       expect {
         rendered.should have_tag('ol') { with_tag('li'); with_tag('li', :count => 10) }
-      }.should raise_spec_error(/expected following:\n#{ordered_list_regexp}\n\s*to have 10 element\(s\) matching "li", found 3/)
+      }.to raise_spec_error(/expected following:\n#{ordered_list_regexp}\n\s*to have 10 element\(s\) matching "li", found 3/)
       expect {
         rendered.should have_tag('ol') { with_tag('li'); with_tag('li', :text => /SAMPLE text/i) }
-      }.should raise_spec_error(/\/SAMPLE text\/i regexp expected within "li" in following template:\n#{ordered_list_regexp}/)
+      }.to raise_spec_error(/\/SAMPLE text\/i regexp expected within "li" in following template:\n#{ordered_list_regexp}/)
     end
   end
 end