rspec2-rails-views-matchers 0.0.3 → 0.0.4

data/.gitignore

@@ -5,3 +5,4 @@ pkg/*
 html
 doc
 .yardoc
+coverage

data/.rspec

@@ -1,2 +1 @@
 --color
---format documentation

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rspec2-rails-views-matchers (0.0.3)
+    rspec2-rails-views-matchers (0.0.4)
       nokogiri (~> 1.4.4)
       rspec (>= 2.0.0)
 
@@ -10,17 +10,21 @@ GEM
   specs:
     diff-lcs (1.1.2)
     nokogiri (1.4.4)
-    rspec (2.4.0)
-      rspec-core (~> 2.4.0)
-      rspec-expectations (~> 2.4.0)
-      rspec-mocks (~> 2.4.0)
-    rspec-core (2.4.0)
-    rspec-expectations (2.4.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.4.0)
+    rspec-mocks (2.5.0)
+    simplecov (0.4.1)
+      simplecov-html (~> 0.4.3)
+    simplecov-html (0.4.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   rspec2-rails-views-matchers!
+  simplecov

data/README.md

@@ -1,3 +1,10 @@
+Test views, be true! :)
+=======================
+
+![Mikhalok](http://investigator.org.ua/wp-content/uploads/01_500_liapis_powe-300x192.jpg)
+
+([Lyapis Trubetskoy](http://www.myspace.com/lyapis))
+
 Why?
 ===
 

data/Rakefile

@@ -4,4 +4,17 @@ Bundler::GemHelper.install_tasks
 
 task :default => :spec
 
-RSpec::Core::RakeTask.new
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts='--tag ~wip'
+end
+
+namespace :spec do
+  RSpec::Core::RakeTask.new(:wip) do |t|
+    t.rspec_opts='--tag wip'
+    t.fail_on_error = false
+  end
+
+  RSpec::Core::RakeTask.new(:rcov) do |t|
+    t.rspec_opts=['-r simplecov']
+  end
+end

data/docs/CHANGELOG.md

@@ -1,4 +1,4 @@
-changelog
+Changelog
 =========
 
 unreleased(TODO)
@@ -8,7 +8,31 @@ unreleased(TODO)
 * add description
 * raise exception when wrong parametres specified(:count and :minimum simultaneously)
 * organize code
-* add more matchers(have\_form,with\_input)?
+* add :without to have\_tag?
+* !make possible constructions like:
+
+>     rendered.should have(3).tags('div').with(:class => 'some-class').and_content(/some content/)
+
+0.0.5-dev (trial-trip)
+----------------------
+
+* TODO: add more matchers:
+  * have\_form(will be finished when "child" matchers will be done)
+    * with\_hidden\_field
+    * with\_text\_field
+    * with\_password\_field
+    * TODO: with\_file\_field?
+    * TODO: with\_text\_area
+    * TODO: with\_check\_box
+    * TODO: with\_radio\_button
+    * with\_select
+      * with\_option
+    * TODO: with\_submit
+
+0.0.4 (bugfix)
+--------------
+
+* additional parameters(:count,:text,:with) rely on each other to match what exactly tester want to match([link to comment](https://github.com/kucaahbe/rspec2-rails-views-matchers/issues#issue/2/comment/848775))
 
 0.0.3
 -----

data/lib/rspec/rails/views/matchers/have_tag.rb

@@ -5,7 +5,7 @@ module RSpec
 
     # @api
     # @private
-    class NokogiriMatcher#:nodoc:
+    class NokogiriMatcher
       attr_reader :failure_message
       attr_reader :parent_scope, :current_scope
 
@@ -45,7 +45,7 @@ module RSpec
 	  @document = @parent_scope.to_html
 	end
 
-	if tag_presents? and count_right? and content_right?
+	if tag_presents? and content_right? and count_right?
 	  @current_scope = @parent_scope
 	  @block.call if @block
 	  true
@@ -91,14 +91,26 @@ module RSpec
 
 	case text=@options[:text]
 	when Regexp
-	  if @current_scope.any? {|node| node.content =~ text }
+	  new_scope = @current_scope.css(":regexp('#{text}')",Class.new {
+	    def regexp node_set, text
+	      node_set.find_all { |node| node.content =~ Regexp.new(text) }
+	    end
+	  }.new)
+	  unless new_scope.empty?
+	    @count = new_scope.count
 	    true
 	  else
 	    @failure_message=%Q{#{text.inspect} regexp expected within "#{@tag}" in following template:\n#{@document}}
 	    false
 	  end
 	else
-	  if @current_scope.any? {|node| node.content == text }
+	  new_scope = @current_scope.css(":content('#{text}')",Class.new {
+	    def content node_set, text
+	      node_set.find_all { |node| node.content == text }
+	    end
+	  }.new)
+	  unless new_scope.empty?
+	    @count = new_scope.count
 	    true
 	  else
 	    @failure_message=%Q{"#{text}" expected within "#{@tag}" in following template:\n#{@document}}
@@ -141,7 +153,7 @@ module RSpec
     #    </html>".should have_tag('body') { with_tag('h1', :text => 'some html document') }
     #   '<div class="one two">'.should have_tag('div', :with => { :class => ['two', 'one'] })
     #   '<div class="one two">'.should have_tag('div', :with => { :class => 'two one' })
-    def have_tag tag,options={}, &block
+    def have_tag tag, options={}, &block
       @__current_scope_for_nokogiri_matcher = NokogiriMatcher.new(tag, options, &block)
     end
 
@@ -161,5 +173,96 @@ module RSpec
       @__current_scope_for_nokogiri_matcher.should_not have_tag(tag, options, &block)
     end
 
+    def have_form action_url, method, options={}, &block
+      options[:with] ||= {}
+      id = options[:with].delete(:id)
+      tag = 'form'; tag += '#'+id if id
+      options[:with].merge!(:action => action_url)
+      options[:with].merge!(:method => method.to_s)
+      have_tag tag, options, &block
+    end
+
+    def with_hidden_field name, value=nil
+      options = { :with => { :name => name, :type => 'hidden' } }
+      options[:with].merge!(:value => value) if value
+      @__current_scope_for_nokogiri_matcher.should have_tag('input', options)
+    end
+
+    def without_hidden_field name, value=nil
+      options = { :with => { :name => name, :type => 'hidden' } }
+      options[:with].merge!(:value => value) if value
+      @__current_scope_for_nokogiri_matcher.should_not have_tag('input', options)
+    end
+
+    def with_text_field name, value=nil
+      options = { :with => { :name => name, :type => 'text' } }
+      options[:with].merge!(:value => value) if value
+      @__current_scope_for_nokogiri_matcher.should have_tag('input', options)
+    end
+
+    def without_text_field name, value=nil
+      options = { :with => { :name => name, :type => 'text' } }
+      options[:with].merge!(:value => value) if value
+      @__current_scope_for_nokogiri_matcher.should_not have_tag('input', options)
+    end
+
+    def with_password_field name
+      options = { :with => { :name => name, :type => 'password' } }
+      @__current_scope_for_nokogiri_matcher.should have_tag('input', options)
+    end
+
+    def without_password_field name
+      options = { :with => { :name => name, :type => 'password' } }
+      @__current_scope_for_nokogiri_matcher.should_not have_tag('input', options)
+    end
+
+    def with_select name, options={}, &block
+      options[:with] ||= {}
+      id = options[:with].delete(:id)
+      tag='select'; tag += '#'+id if id
+      options[:with].merge!(:name => name)
+      @__current_scope_for_nokogiri_matcher.should have_tag(tag, options, &block)
+    end
+
+    def without_select name, options={}, &block
+      options[:with] ||= {}
+      id = options[:with].delete(:id)
+      tag='select'; tag += '#'+id if id
+      options[:with].merge!(:name => name)
+      @__current_scope_for_nokogiri_matcher.should_not have_tag(tag, options, &block)
+    end
+
+    def with_option text, value=nil, options={}
+      options[:with] ||= {}
+      if value.is_a?(Hash)
+	options.merge!(value)
+	value=nil
+      end
+      tag='option'
+      options[:with].merge!(:value => value.to_s) if value
+      if options[:selected]
+	options[:with].merge!(:selected => "selected")
+      end
+      options.delete(:selected)
+      options.merge!(:text => text) if text
+      @__current_scope_for_nokogiri_matcher.should have_tag(tag, options)
+    end
+
+    def without_option text, value=nil, options={}
+      options[:with] ||= {}
+      if value.is_a?(Hash)
+	options.merge!(value)
+	value=nil
+      end
+      tag='option'
+      options[:with].merge!(:value => value.to_s) if value
+      if options[:selected]
+	options[:with].merge!(:selected => "selected")
+      end
+      options.delete(:selected)
+      options.merge!(:text => text) if text
+      @__current_scope_for_nokogiri_matcher.should_not have_tag(tag, options)
+    end
+
   end
 end

data/lib/version.rb

@@ -1,12 +1,12 @@
-module RSpec#:nodoc:
+module RSpec
   # @private
-  module Rails#:nodoc:
+  module Rails
     # @private
-    module Views#:nodoc:
+    module Views
       # @private
-      module Matchers#:nodoc:
+      module Matchers
 	# @private
-        VERSION = "0.0.3"
+        VERSION = "0.0.4"
       end
     end
   end

data/rspec2-rails-views-matchers.gemspec

@@ -21,4 +21,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'rspec', '>= 2.0.0'
   s.add_dependency 'nokogiri', '~> 1.4.4'
+
+  s.add_development_dependency 'simplecov'
 end

data/spec/matchers/form_matchers_spec.rb

@@ -0,0 +1,212 @@
+require 'spec_helper'
+
+describe "have_form" do
+
+  before :each do
+    render_html <<HTML
+<form action="/books" class="formtastic book" id="new_book" method="post">
+
+  <div style="margin:0;padding:0;display:inline">
+    <input name="authenticity_token" type="hidden" value="718WaH76RAbIVhDlnOidgew62ikn8IUCOyWLEqjw1GE=" />
+   </div>
+
+  <fieldset class="inputs">
+    <ol>
+      <li class="select required" id="book_publisher_input">
+        <label for="book_publisher_id">
+           Publisher<abbr title="required">*</abbr>
+        </label>
+	<select id="book_publisher_id" name="book[publisher_id]">
+	  <option value=""></option>
+	  <option value="1" selected="selected">The Pragmatic Bookshelf</option>
+	  <option value="2">sitepoint</option>
+	  <option value="3">O'Reilly</option>
+	</select>
+      </li>
+
+      <li class="string required" id="book_title_input">
+      <label for="book_title">
+        Title<abbr title="required">*</abbr>
+      </label>
+        <input id="book_title" maxlength="255" name="book[title]" size="50" type="text" />
+      </li>
+
+      <li class="string required" id="book_author_input">
+      <label for="book_author">
+        Author<abbr title="required">*</abbr>
+      </label>
+        <input id="book_author" maxlength="255" name="book[author]" size="50" type="text" value="Authorname" />
+      </li>
+
+      <li class="password optional" id="user_password_input">
+      <label for="user_password">
+        Password:
+      </label>
+        <input id="user_password" name="user[password]" size="30" type="password" />
+      </li>
+
+    </ol>
+  </fieldset>
+</form>
+HTML
+  end
+
+  context "without &block" do
+
+    it "should find form" do
+      rendered.should have_form("/books", :post)
+
+      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
+
+    it "should not find form" do
+      rendered.should_not have_form("/some_url", :post)
+      rendered.should_not have_form("/books", :get)
+    end
+
+  end
+
+  context "with &block" do
+
+    context "with_select" do
+
+      it "should find select" do
+	rendered.should have_form("/books", :post) do
+	  with_select("book[publisher_id]", :with => { :id => "book_publisher_id" })
+
+	  self.should_receive(:have_tag).with("select#book_publisher_id", :with => { :name => "book[publisher_id]" })
+	  with_select("book[publisher_id]", :with => { :id => "book_publisher_id" })
+	end
+      end
+
+      it "should not find select" do
+	rendered.should have_form("/books", :post) do
+	  without_select("book[publisher_id]", :with => { :id => "other_id" })
+
+	  self.should_receive(:have_tag).with("select#book_publisher_id", :with => { :name => "koob[publisher_id]" })
+	  without_select("koob[publisher_id]", :with => { :id => "book_publisher_id" })
+	end
+      end
+
+      context "with_option" do
+
+	it "should find options" do
+	  rendered.should have_form("/books", :post) do
+	    with_select("book[publisher_id]") do
+	      with_option(nil)
+	      with_option("The Pragmatic Bookshelf", :selected => true)
+	      with_option(/sitepoint/,2)
+
+	      self.should_receive(:have_tag).with('option', :with => { :value => '3' }, :text => "O'Reilly")
+	      with_option("O'Reilly", 3, :selected => false)
+	    end
+	  end
+	end
+
+	it "should not find options" do
+	  rendered.should have_form("/books", :post) do
+	    with_select("book[publisher_id]") do
+	      without_option("blah blah")
+	      without_option("O'Reilly", 3, :selected => true)
+	      without_option("O'Reilly", 100500)
+	    end
+	  end
+	end
+
+      end
+
+    end
+
+    context "with_hidden_field" do
+
+      it "should find hidden field" do
+	rendered.should have_form("/books", :post) do
+	  with_hidden_field("authenticity_token")
+	  self.should_receive(:have_tag).with('input', :with => { :name => 'authenticity_token', :type => 'hidden', :value => '718WaH76RAbIVhDlnOidgew62ikn8IUCOyWLEqjw1GE=' })
+	  with_hidden_field("authenticity_token", '718WaH76RAbIVhDlnOidgew62ikn8IUCOyWLEqjw1GE=')
+	end
+      end
+
+      it "should not find hidden field" do
+	rendered.should have_form("/books", :post) do
+	  without_hidden_field('user_id')
+	  without_hidden_field('authenticity_token', 'blabla')
+	end
+      end
+
+    end
+
+    context "with_text_field" do
+
+      it "should find text field" do
+	rendered.should have_form("/books", :post) do
+	  with_text_field('book[title]')
+	  with_text_field('book[title]',nil)
+	  with_text_field('book[author]','Authorname')
+	end
+      end
+
+      it "should not find text field" do
+	rendered.should have_form("/books", :post) do
+	  without_text_field('book[title]','title does not exist')
+	  without_text_field('book[authoRR]')
+	  without_text_field('book[blabla]')
+	end
+      end
+
+    end
+
+    context "with_password_field" do
+
+      it "should find password field" do
+	rendered.should have_form("/books", :post) do
+	  with_password_field('user[password]')
+	end
+      end
+
+      it "should not find password field" do
+	rendered.should have_form("/books", :post) do
+	  without_password_field('account[password]')
+	end
+      end
+
+    end
+
+    context "with_file_field" do
+
+      it "should find file field"
+      it "should not find file field"
+
+    end
+
+    context "with_text_area" do
+
+      it "should find text area"
+      it "should not find text area"
+
+    end
+
+    context "with_check_box" do
+
+      it "should find check box"
+      it "should not find check box"
+
+    end
+
+    context "with_radio_button" do
+
+      it "should find radio button"
+      it "should not find radio button"
+
+    end
+
+    context "with_submit" do
+
+      it "should find submit"
+      it "should not find submit"
+
+    end
+
+  end
+end

data/spec/matchers/have_tag_spec.rb

@@ -209,6 +209,74 @@ HTML
 
   end
 
+  context "mixed matching" do
+
+    before :each do
+      render_html <<HTML
+<table>
+  <tr>
+    <td>user_1</td>
+    <td id="other-special">user_2</td>
+    <td>user_3</td>
+  </tr>
+  <tr>
+    <td>a</td>
+    <td id="special">a</td>
+    <td>a</td>
+  </tr>
+</table>
+
+<div class="one">text</div>
+<div class="one">text</div>
+<div class="one">text</div>
+<div class="one">text bla</div>
+<div class="one">content bla</div>
+<div class="one">content</div>
+<div class="two">content bla</div>
+<div class="two">content</div>
+<div class="two">text</div>
+HTML
+    end
+
+    it "should find tags by count and exact content" do
+      rendered.should have_tag("td", :text => 'a', :count => 3)
+    end
+
+    it "should find tags by count and rough content(regexp)" do
+      rendered.should have_tag("td", :text => /user/, :count => 3)
+    end
+
+    it "should find tags with exact content and additional attributes" do
+      rendered.should have_tag("td", :text => 'a', :with => { :id => "special" })
+      rendered.should_not have_tag("td", :text => 'a', :with => { :id => "other-special" })
+    end
+
+    it "should find tags with rough content and additional attributes" do
+      rendered.should have_tag("td", :text => /user/, :with => { :id => "other-special" })
+      rendered.should_not have_tag("td", :text => /user/, :with => { :id => "special" })
+    end
+
+    it "should find tags with count and additional attributes" do
+      rendered.should have_tag("div", :with => { :class => "one" }, :count => 6)
+      rendered.should have_tag("div", :with => { :class => "two" }, :count => 3)
+    end
+
+    it "should find tags with count, exact text and additional attributes" do
+      rendered.should have_tag("div", :with => { :class => "one" }, :count => 3, :text => 'text')
+      rendered.should_not have_tag("div", :with => { :class => "one" }, :count => 5, :text => 'text')
+      rendered.should_not have_tag("div", :with => { :class => "one" }, :count => 3, :text => 'other text')
+      rendered.should_not have_tag("div", :with => { :class => "two" }, :count => 3, :text => 'text')
+    end
+
+    it "should find tags with count, regexp text and additional attributes" do
+      rendered.should have_tag("div", :with => { :class => "one" }, :count => 2, :text => /bla/)
+      rendered.should have_tag("div", :with => { :class => "two" }, :count => 1, :text => /bla/)
+      rendered.should_not have_tag("div", :with => { :class => "one" }, :count => 5, :text => /bla/)
+      rendered.should_not have_tag("div", :with => { :class => "one" }, :count => 6, :text => /other bla/)
+    end
+
+  end
+
   context "nested matching:" do
     before :each do
       @ordered_list =<<OL

data/spec/spec_helper.rb

@@ -1,3 +1,11 @@
+require 'rspec/core'
+
+if defined?(SimpleCov)
+  SimpleCov.start do
+    add_group 'Main', '/lib/'
+  end
+end
+
 require 'rspec2-rails-views-matchers'
 
 # Requires supporting files with custom matchers and macros, etc,

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rspec2-rails-views-matchers
 version: !ruby/object:Gem::Version 
-  hash: 25
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - kucaahbe
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-02 00:00:00 +02:00
+date: 2011-03-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
         version: 2.0.0
   type: :runtime
   version_requirements: *id001
@@ -42,14 +32,20 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 4
-        - 4
         version: 1.4.4
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: simplecov
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: Nokogiri based 'have_tag' and 'with_tag' for rspec-2 without assert_select dependencies and useful error messages
 email: 
 - kucaahbe@ukr.net
@@ -73,6 +69,7 @@ files:
 - lib/rspec2-rails-views-matchers.rb
 - lib/version.rb
 - rspec2-rails-views-matchers.gemspec
+- spec/matchers/form_matchers_spec.rb
 - spec/matchers/have_tag_spec.rb
 - spec/spec_helper.rb
 - spec/support/spec_error.rb
@@ -90,23 +87,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rspec2-rails-views-matchers
-rubygems_version: 1.5.0
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Nokogiri based 'have_tag' and 'with_tag' for rspec-2 without assert_select dependencies and useful error messages