merb-core/lib/merb-core/vendor/nokogiri/css.rb merb-core/lib/merb-core/vendor/nokogiri/css/generated_parser.rb merb-core/lib/merb-core/vendor/nokogiri/css/generated_tokenizer.rb merb-core/lib/merb-core/vendor/nokogiri/css/node.rb merb-core/lib/merb-core/vendor/nokogiri/css/parser.rb merb-core/lib/merb-core/vendor/nokogiri/css/parser.y merb-core/lib/merb-core/vendor/nokogiri/css/tokenizer.rb merb-core/lib/merb-core/vendor/nokogiri/css/tokenizer.rex merb-core/lib/merb-core/vendor/nokogiri/css/xpath_visitor.rb @@ -1,8 +1,8 @@ -begin - require "hpricot" - require 'merb-core/test/test_ext/hpricot' -rescue -end +# begin +# require "hpricot" +# require 'merb-core/test/test_ext/hpricot' +# rescue +# end require 'merb-core/test/test_ext/object' require 'merb-core/test/test_ext/string' merb-core/lib/merb-core/test.rb @@ -7,5 +7,4 @@ require "merb-core/test/helpers/mock_request_helper" require "merb-core/test/helpers/route_helper" require "merb-core/test/helpers/request_helper" require "merb-core/test/helpers/multipart_request_helper" -require "merb-core/test/helpers/controller_helper" -require "merb-core/test/helpers/view_helper" \ No newline at end of file +require "merb-core/test/helpers/controller_helper" \ No newline at end of file merb-core/lib/merb-core/test/helpers.rb @@ -6,5 +6,4 @@ require "merb-core/test/matchers/view_matchers" require "merb-core/test/matchers/request_matchers" Merb::Test::ControllerHelper.send(:include, Merb::Test::Rspec::ControllerMatchers) -Merb::Test::RouteHelper.send(:include, Merb::Test::Rspec::RouteMatchers) -Merb::Test::ViewHelper.send(:include, Merb::Test::Rspec::ViewMatchers) \ No newline at end of file +Merb::Test::RouteHelper.send(:include, Merb::Test::Rspec::RouteMatchers) \ No newline at end of file merb-core/lib/merb-core/test/matchers.rb @@ -1,11 +1,27 @@ module Merb::Test::Rspec::ViewMatchers + class HaveXpath - def initialize(expected, type) - @expected, @type = expected, type + def initialize(expected, &block) + # Require nokogiri and fall back on rexml + begin + require "nokogiri" + rescue LoadError => e + if require "rexml/document" + require "merb-core/vendor/nokogiri/css" + warn("Standard REXML library is slow. Please consider installing nokogiri.\nUse \"sudo gem install nokogiri\"") + end + end + + @expected = expected + @block = block end def matches?(stringlike) - send("matches_#{@type}?", stringlike) + if defined?(Nokogiri::XML) + matches_nokogiri?(stringlike) + else + matches_rexml?(stringlike) + end end def matches_rexml?(stringlike) @@ -17,23 +33,39 @@ module Merb::Test::Rspec::ViewMatchers when REXML::Node stringlike when StringIO, String - REXML::Document.new(stringlike).root + begin + REXML::Document.new(stringlike.to_s).root + rescue REXML::ParseException => e + if e.message.include?("second root element") + REXML::Document.new("<fake-root-element>#{stringlike}</fake-root-element>").root + else + raise e + end + end + end + + query.all? do |q| + matched = REXML::XPath.match(@document, q) + matched.any? && (!block_given? || matched.all?(&@block)) end - !REXML::XPath.match(@document, @expected).empty? end - def matches_libxml?(stringlike) + def matches_nokogiri?(stringlike) stringlike = stringlike.body.to_s if stringlike.respond_to?(:body) @document = case stringlike - when LibXML::XML::Document, LibXML::XML::Node + when Nokogiri::HTML::Document, Nokogiri::XML::NodeSet stringlike when StringIO - LibXML::XML::HTMLParser.string(stringlike.string).parse + Nokogiri::HTML(stringlike.string) else - LibXML::XML::HTMLParser.string(stringlike).parse + Nokogiri::HTML(stringlike.to_s) end - !@document.find(@expected).empty? + @document.xpath(*query).any? + end + + def query + [@expected].flatten.compact end # ==== Returns @@ -49,238 +81,71 @@ module Merb::Test::Rspec::ViewMatchers end end - class HaveSelector - - # ==== Parameters - # expected<String>:: The string to look for. - def initialize(expected) - @expected = expected - end - - # ==== Parameters - # stringlike<Hpricot::Elem, StringIO, String>:: The thing to search in. - # - # ==== Returns - # Boolean:: True if there was at least one match. - def matches?(stringlike) - @document = case stringlike - when Hpricot::Elem - stringlike - when StringIO - Hpricot.parse(stringlike.string) - else - Hpricot.parse(stringlike) - end - !@document.search(@expected).empty? - end + class HaveSelector < HaveXpath # ==== Returns # String:: The failure message. def failure_message "expected following text to match selector #{@expected}:\n#{@document}" end - + # ==== Returns # String:: The failure message to be displayed in negative matches. def negative_failure_message "expected following text to not match selector #{@expected}:\n#{@document}" end - end - - class MatchTag - - # ==== Parameters - # name<~to_s>:: The name of the tag to look for. - # attrs<Hash>:: Attributes to look for in the tag (see below). - # - # ==== Options (attrs) - # :content<String>:: Optional content to match. - def initialize(name, attrs) - @name, @attrs = name, attrs - @content = @attrs.delete(:content) - end - - # ==== Parameters - # target<String>:: The string to look for the tag in. - # - # ==== Returns - # Boolean:: True if the tag matched. - def matches?(target) - @errors = [] - unless target.include?("<#{@name}") - @errors << "Expected a <#{@name}>, but was #{target}" - end - @attrs.each do |attr, val| - unless target.include?("#{attr}=\"#{val}\"") - @errors << "Expected #{attr}=\"#{val}\", but was #{target}" - end - end - if @content - unless target.include?(">#{@content}<") - @errors << "Expected #{target} to include #{@content}" - end - end - @errors.size == 0 + + def query + Nokogiri::CSS::Parser.parse(*super).map { |ast| ast.to_xpath } end - + + end + + class HaveTag < HaveSelector + # ==== Returns # String:: The failure message. def failure_message - @errors[0] + "expected following output to contain a #{tag_inspect} tag:\n#{@document}" end - + # ==== Returns # String:: The failure message to be displayed in negative matches. def negative_failure_message - "Expected not to match against <#{@name} #{@attrs.map{ |a,v| "#{a}=\"#{v}\"" }.join(" ")}> tag, but it matched" - end - end - - class NotMatchTag - - # === Parameters - # attrs<Hash>:: A set of attributes that must not be matched. - def initialize(attrs) - @attrs = attrs - end - - # ==== Parameters - # target<String>:: The target to look for the match in. - # - # ==== Returns - # Boolean:: True if none of the attributes were matched. - def matches?(target) - @errors = [] - @attrs.each do |attr, val| - if target.include?("#{attr}=\"#{val}\"") - @errors << "Should not include #{attr}=\"#{val}\", but was #{target}" - end - end - @errors.size == 0 - end - - # ==== Returns - # String:: The failure message. - def failure_message - @errors[0] + "expected following output to omit a #{tag_inspect}:\n#{@document}" end - end - - class HasTag - attr_accessor :outer_has_tag, :inner_has_tag - - # ==== Parameters - # tag<~to_s>:: The tag to look for. - # attributes<Hash>:: Attributes for the tag (see below). - def initialize(tag, attributes = {}, &blk) - @tag, @attributes = tag, attributes - @id, @class = @attributes.delete(:id), @attributes.delete(:class) - @blk = blk - end - - # ==== Parameters - # stringlike<Hpricot::Elem, StringIO, String>:: The thing to search in. - # &blk:: An optional block for searching in child elements using with_tag. - # - # ==== Returns - # Boolean:: True if there was at least one match. - def matches?(stringlike, &blk) - @document = case stringlike - when Hpricot::Elem - stringlike - when StringIO - Hpricot.parse(stringlike.string) - else - Hpricot.parse(stringlike) + def tag_inspect + options = @expected.last.dup + content = options.delete(:content) + + html = "<#{@expected.first}" + options.each do |k,v| + html << " #{k}='#{v}'" end - @blk = blk unless blk.nil? - - unless @blk.nil? - !@document.search(selector).select do |ele| - begin - @blk.call ele - true - rescue Spec::Expectations::ExpectationNotMetError - @error_message = "#{tag_for_error}:\n" + $!.message - false - end - end.empty? + if content + html << ">#{content}</#{@expected.first}>" else - !@document.search(selector).empty? + html << "/>" end - end - - # ==== Returns - # String:: The complete selector for element queries. - def selector - @selector = @outer_has_tag ? @outer_has_tag.selector : '' - - @selector << "//#{@tag}#{id_selector}#{class_selector}" - @selector << @attributes.map{|a, v| "[@#{a}=\"#{v}\"]"}.join - end - - # ==== Returns - # String:: ID selector for use in element queries. - def id_selector - "##{@id}" if @id - end - - # ==== Returns - # String:: Class selector for use in element queries. - def class_selector - ".#{@class}" if @class - end - - # ==== Returns - # String:: The failure message. - def failure_message - @error_message || "expected following output to contain a #{tag_for_error} tag:\n#{@document}" - end - - # ==== Returns - # String:: The failure message to be displayed in negative matches. - def negative_failure_message - @error_message || "expected following output to omit a #{tag_for_error} tag:\n#{@document}" + + html end - # ==== Returns - # String:: The tag used in failure messages. - def tag_for_error - result = "#{@tag}#{id_for_error}#{class_for_error}#{attributes_for_error}" - inner_has_tag ? result << " > #{inner_has_tag.tag_for_error}" : result - end - - # ==== Returns - # String:: ID for the error tag. - def id_for_error - "##{@id}" unless @id.nil? - end - - # ==== Returns - # String:: Class for the error tag. - def class_for_error - ".#{@class}" unless @class.nil? - end - - # ==== Returns - # String:: Class for the error tag. - def attributes_for_error - @attributes.map{|a,v| "[#{a}=\"#{v}\"]"}.join - end - - # Search for a child tag within a have_tag block. - # - # ==== Parameters - # tag<~to_s>:: The tag to look for. - # attributes<Hash>:: Attributes for the tag (see below). - def with_tag(name, attrs={}) - @inner_has_tag = HasTag.new(name, attrs) - @inner_has_tag.outer_has_tag = self + def query + options = @expected.last.dup + selector = @expected.first.to_s + + selector << ":contains('#{options.delete(:content)}')" if options[:content] - @inner_has_tag + options.each do |key, value| + selector << "[#{key}='#{value}']" + end + + Nokogiri::CSS::Parser.parse(selector).map { |ast| ast.to_xpath } end + end class HasContent @@ -289,6 +154,7 @@ module Merb::Test::Rspec::ViewMatchers end def matches?(element) + element = element.body.to_s if element.respond_to?(:body) @element = element case @content @@ -320,83 +186,45 @@ module Merb::Test::Rspec::ViewMatchers end end end - - # ==== Parameters - # name<~to_s>:: The name of the tag to look for. - # attrs<Hash>:: Attributes to look for in the tag (see below). - # - # ==== Options (attrs) - # :content<String>:: Optional content to match. - # - # ==== Returns - # MatchTag:: A new match tag matcher. - def match_tag(name, attrs={}) - MatchTag.new(name, attrs) - end - # ==== Parameters - # attrs<Hash>:: A set of attributes that must not be matched. + # Matches HTML content against a CSS 3 selector. # - # ==== Returns - # NotMatchTag:: A new not match tag matcher. - def not_match_tag(attrs) - NotMatchTag.new(attrs) - end - # ==== Parameters - # expected<String>:: The string to look for. + # expected<String>:: The CSS selector to look for. # # ==== Returns # HaveSelector:: A new have selector matcher. + # --- + # @api public def have_selector(expected) HaveSelector.new(expected) end alias_method :match_selector, :have_selector - def have_xpath(expected) - begin - require "libxml" - type = "libxml" - rescue LoadError => e - if require "rexml/document" # show warning only once - warn(<<-WARN_TEXT) -Standard REXML library is slow. Please consider to install libxml-ruby. -Use "sudo gem install libxml-ruby" -WARN_TEXT - end - type = "rexml" - end - HaveXpath.new(expected, type) - end - alias_method :match_xpath, :have_xpath - - # RSpec matcher to test for the presence of tags. + # Matches HTML content against an XPath query # # ==== Parameters - # tag<~to_s>:: The name of the tag. - # attributes<Hash>:: Tag attributes. + # expected<String>:: The XPath query to look for. # # ==== Returns - # HasTag:: A new has tag matcher. - # - # ==== Examples - # # Check for <div> - # body.should have_tag("div") - # - # # Check for <span id="notice"> - # body.should have_tag("span", :id => :notice) - # - # # Check for <h1 id="foo" class="bar"> - # body.should have_tag(:h2, :class => "bar", :id => "foo") - # - # # Check for <div attr="val"> - # body.should have_tag(:div, :attr => :val) - def have_tag(tag, attributes = {}, &blk) - HasTag.new(tag, attributes, &blk) + # HaveXpath:: A new have xpath matcher. + # --- + # @api public + def have_xpath(expected) + HaveXpath.new(expected) end - - alias_method :with_tag, :have_tag + alias_method :match_xpath, :have_xpath + + def have_tag(name, attributes = {}) + HaveTag.new([name, attributes]) + end + alias_method :match_tag, :have_tag + # Matches the contents of an HTML document with + # whatever string is supplied + # + # --- + # @api public def contain(content) HasContent.new(content) end merb-core/lib/merb-core/test/matchers/view_matchers.rb @@ -42,7 +42,6 @@ module Merb class ExampleGroup < Spec::Example::ExampleGroup include ::Merb::Test::Matchers - include ::Merb::Test::ViewHelper include ::Merb::Test::RouteHelper include ::Merb::Test::ControllerHelper merb-core/lib/merb-core/test/test_ext/rspec.rb @@ -5,6 +5,10 @@ module Merb::Test "Method - #{request.method.to_s.upcase}" end + def document + '<html><body><div id="out"><div class="in">Hello</div></div></body></html>' + end + def counter value = (cookies[:counter] || 0).to_i + 1 cookies[:counter] = value merb-core/spec/public/test/controllers/request_controller.rb @@ -21,6 +21,18 @@ describe Merb::Test::RequestHelper do request("/method").should have_body("Method - GET") end + it "should work with have_selector" do + request("/document").should have_selector("div div") + end + + it "should work with have_xpath" do + request("/document").should have_xpath("//div/div") + end + + it "should work with have_content" do + request("/method").should contain("Method") + end + it "should persist cookies across sequential cookie setting requests" do request("/counter").should have_body("1") request("/counter").should have_body("2") merb-core/spec/public/test/request_helper_spec.rb @@ -4,7 +4,6 @@ require "merb-core/test" Merb.start :environment => 'test', :log_level => :fatal describe Merb::Test::Rspec::ViewMatchers do - include Merb::Test::ViewHelper before(:each) do @body = <<-EOF @@ -14,128 +13,50 @@ describe Merb::Test::Rspec::ViewMatchers do EOF end - describe "#match_tag" do - it "should work with a HasContent matcher in the block" do - @body.should have_tag(:div) {|d| d.should_not contain("merb")} + describe "#have_selector" do + + it "should be able to match a CSS selector" do + @body.should have_selector("div") + end + + it "should not match a CSS selector that does not exist" do + @body.should_not have_selector("p") end - it "should work with a 'with_tag' chain" do - @body.should have_tag(:div, :id => :main).with_tag(:div, :class => 'inner') + it "should be able to loop over all the matched elements" do + @body.should have_selector("div") { |node| node.name.should == "div" } end - it "should work with a block before a with_tag" do - @body.should have_tag(:div, :id => :main) {|d| d.should_not contain("merb")}.with_tag(:div, :class => 'inner') + it "should not match of any of the matchers in the block fail" do + lambda { + @body.should_not have_selector("div") { |node| node.name.should == "p" } + }.should raise_error(Spec::Expectations::ExpectationNotMetError) end + end - - module Merb::Test::Rspec::ViewMatchers - describe HasTag do - describe "#matches?" do - before(:each) do - @document = stub(:document) - Hpricot.should_receive(:parse).and_return @document - end - - it "should pass all found elements to the block" do - @block_called = false - - @document.should_receive(:search).and_return [""] - HasTag.new("tag").matches?("") {|e| e.should == "" } - end - - it 'should intercept errors raised in the block' do - @document.should_receive(:search).and_return [""] - lambda { - HasTag.new("tag").matches?("") {|e| true.should be_false } - }.should_not raise_error(Spec::Expectations::ExpectationNotMetError) - end - - it 'should raise ExpectationNotMetError when there are no matched elements' do - @document.should_receive(:search).and_return [""] - lambda { - @document.should have_tag(:tag) {|e| true.should be_false } - }.should raise_error(Spec::Expectations::ExpectationNotMetError, "tag:\nexpected false, got true") - end - - #part of bugfix for #329 - it 'should not raise error if block for first of matched elements by xpath expression fails' do - @document.should_receive(:search).and_return ["a", "b"] - lambda { - @document.should have_tag(:tag) { |tag| tag.should == "b" } - }.should_not raise_error(Spec::Expectations::ExpectationNotMetError) - end - end + describe "#have_tag" do - describe "#with_tag" do - it "should set @outer_has_tag" do - outer = HasTag.new("outer") - inner = outer.with_tag("inner") - - inner.selector.should include(outer.selector) - end - end + it "should be able to match a tag" do + @body.should have_tag("div") + end - describe "#selector" do - it "should always start with \/\/" do - HasTag.new("tag").selector.should =~ /^\/\// - end - - it "should use @tag for the element" do - HasTag.new("tag").selector.should include("tag") - end - - it "should use dot notation for the class" do - HasTag.new("tag", :class => "class").selector.should include("tag.class") - end - - it "should use pound(#) notation for the id" do - HasTag.new("tag", :id => "id").selector.should include("tag#id") - end - - it "should include any custom attributes" do - HasTag.new("tag", :random => :attribute).selector.should include("[@random=\"attribute\"]") - end - - it "should not include the class as a custom attribute" do - HasTag.new("tag", :class => :my_class, :rand => :attr).selector.should_not include("[@class=\"my_class\"]") - end - - it "should not include the id as a custom attribute" do - HasTag.new("tag", :id => :my_id, :rand => :attr).selector.should_not include("[@id=\"my_id\"]") - end - end + it "should not match the tag when it should not match" do + @body.should_not have_tag("p") + end - describe "#failure_message" do - it "should include the tag name" do - HasTag.new("anytag").failure_message.should include("anytag") - end - - it "should include the tag's id" do - HasTag.new("div", :id => :spacer).failure_message.should include("div#spacer") - end - - it "should include the tag's class" do - HasTag.new("div", :class => :header).failure_message.should include("div.header") - end - - it "should include the tag's custom attributes" do - HasTag.new("h1", :attr => :val, :foo => :bar).failure_message.should include("attr=\"val\"") - HasTag.new("h1", :attr => :val, :foo => :bar).failure_message.should include("foo=\"bar\"") - end - end + it "should be able to specify the content of the tag" do + @body.should have_tag("div", :content => "hello, world!") + end - describe "id, class, and attributes for error messages" do - it "should have '.classifier' in class_for_error" do - HasTag.new("tag", :class => "classifier").class_for_error.should include(".classifier") - end - - it "should have '#identifier' in id_for_error" do - HasTag.new("tag", :id => "identifier").id_for_error.should include("#identifier") - end - end + it "should be able to specify the attributes of the tag" do + @body.should have_tag("div", :class => "inner") end + end + + module Merb::Test::Rspec::ViewMatchers + describe HasContent do before(:each) do @element = stub(:element) merb-core/spec/public/test/view_matchers_spec.rb @@ -1,4 +1,4 @@ -<%= form_for @obj do %> +<%= form_for @obj, :action => "/" do %> <%= check_box(:baz) %> <%= check_box(:bat) %> <% end =%> merb-helpers/spec/fixture/app/views/bound_check_box_specs/basic.html.erb @@ -1,3 +1,3 @@ -<%= form_for @model do %> +<%= form_for @model, :action => "/" do %> <%= hidden_field(:foo, :bar =>"7") %> <% end =%> merb-helpers/spec/fixture/app/views/bound_hidden_field_specs/hidden_error.html.erb @@ -1,3 +1,3 @@ -<%= form_for @obj do %> +<%= form_for @obj, :action => "/" do %> <%= password_field(:foo, :bar => "7", :label => "LABEL") %> <% end =%> merb-helpers/spec/fixture/app/views/bound_password_field_specs/basic.html.erb @@ -1,3 +1,3 @@ -<%= form_for @obj do %> +<%= form_for @obj, :action => "/" do %> <%= radio_button(:foo, :bar => "7", :label => "LABEL") %> <% end =%> merb-helpers/spec/fixture/app/views/bound_radio_button_specs/basic.html.erb @@ -1,3 +1,3 @@ -<%= form_for @obj do %> +<%= form_for @obj, :action => "/" do %> <%= text_field :foo, :bar => "7", :label => "LABEL" %> <% end =%> merb-helpers/spec/fixture/app/views/bound_text_field_specs/basic.html.erb @@ -3,7 +3,7 @@ <head> <title>Fresh Merb App</title> <meta http-equiv="content-type" content="text/html; charset=utf-8" /> - <link rel="stylesheet" href="/stylesheets/master.css" type="text/css" media="screen" charset="utf-8"> + <link rel="stylesheet" href="/stylesheets/master.css" type="text/css" media="screen" charset="utf-8"/> </head> <body> <%= catch_content :for_layout %> merb-helpers/spec/fixture/app/views/layout/application.html.erb @@ -120,25 +120,25 @@ describe "form" do it "should use the post method by default" do ret = @c.render(:post_by_default) - ret.should match_tag(:form, :method => "post") + ret.should have_selector("form[method=post]") ret.should include("CONTENT") end it "should use the get method if set" do ret = @c.render(:get_if_set) - ret.should match_tag(:form, :method => "get") + ret.should have_selector("form[method=get]") end it "should fake out the put method if set" do ret = @c.render(:fake_put_if_set) - ret.should match_tag(:form, :method => "post") - ret.should match_tag(:input, :type => "hidden", :name => "_method", :value => "put") + ret.should have_selector("form[method=post]") + ret.should have_selector("input[type=hidden][name=_method][value=put]") end it "should fake out the delete method if set" do ret = @c.render(:fake_delete_if_set) - ret.should match_tag(:form, :method => "post") - ret.should match_tag(:input, :type => "hidden", :name => "_method", :value => "delete") + ret.should have_selector("form[method=post]") + ret.should have_selector("input[type=hidden][name=_method][value=delete]") end # TODO: Why is this required? @@ -153,14 +153,14 @@ describe "form" do # end it "should take create a form" do - ret = @c.render(:create_a_form) - ret.should match_tag(:form, :action => "foo", :method => "post") + ret = @c.render(:create_a_form) + ret.should have_selector("form[action=foo][method=post]") ret.should include("Hello") end it "should set a form to be multipart" do ret = @c.render(:create_a_multipart_form) - ret.should match_tag( :form, :action => "foo", :method => "post", :enctype => "multipart/form-data") + ret.should have_selector("form[action=foo][method=post][enctype='multipart/form-data']") ret.should include("CONTENT") end end @@ -175,22 +175,22 @@ describe "form_for" do it "should wrap the contents in a form tag" do form = @c.render :basic - form.should match_tag(:form, :method => "post") - form.should match_tag(:input, :type => "hidden", :value => "put", :name => "_method") + form.should have_selector("form[method=post]") + form.should have_selector("input[type=hidden][value=put][name=_method]") end it "should set the method to post be default" do new_fake_model = FakeModel2.new @c.instance_variable_set(:@obj, new_fake_model) form = @c.render :basic - form.should match_tag(:form, :method => "post") - form.should_not match_tag(:input, :type => "hidden", :name => "_method") + form.should have_selector("form[method=post]") + form.should_not have_selector("input[type=hidden][name=_method]") end it "should support PUT if the object passed in is not a new_record? via a hidden field" do form = @c.render :basic - form.should match_tag(:form, :method => "post") - form.should match_tag(:input, :type => "hidden", :value => "put", :name => "_method") + form.should have_selector("form[method=post]") + form.should have_selector("input[type=hidden][value=put][name=_method]") end end @@ -206,25 +206,25 @@ describe "fields_for" do it "should dump the contents in the context of the object" do r = @c.render :basic - r.should match_tag(:input, :type => "text", :value => "foowee") + r.should have_selector("input[type=text][value=foowee]") end it "should be able to modify the context midstream" do @c.instance_variable_set(:@obj2, FakeModel2.new) r = @c.render :midstream - r.should match_tag(:input, :type => "text", :value => "foowee") - r.should match_tag(:input, :name => "fake_model2[foo]", :type => "text", :value => "foowee2") + r.should have_selector("input[type=text][value=foowee]") + r.should have_selector("input[name='fake_model2[foo]'][type=text][value=foowee2]") end it "should handle an explicit nil attribute" do r = @c.render :nil - r.should match_tag(:input, :name => "fake_model[foo]", :value => "foowee", :type => "text") + r.should have_selector("input[name='fake_model[foo]'][value=foowee][type=text]") end it "should pass context back to the old object after exiting block" do @c.instance_variable_set(:@obj2, FakeModel2.new) r = @c.render :midstream - r.should match_tag(:input, :id => "fake_model_foo", :name => "fake_model[foo]", :type => "text", :extra => "true") + r.should have_selector("input[id=fake_model_foo][name='fake_model[foo]'][type=text][extra=true]") end end @@ -236,7 +236,7 @@ describe "text_field" do it "should return a basic text field based on the values passed in" do r = @c.render :basic - r.should match_tag( :input, :type => "text", :name => "foo", :value => "bar") + r.should have_selector("input[type=text][name=foo][value=bar]") end it "should provide an additional label tag if the :label option is passed in" do @@ -251,7 +251,7 @@ describe "text_field" do it "should be disabled if :disabled => true is passed in" do r = @c.render :disabled - r.should match_tag(:input, :type => "text", :disabled => "disabled") + r.should have_selector("input[type=text][disabled=disabled]") end it "should provide an additional label tag if the :label option is passed in as a hash" do @@ -270,24 +270,23 @@ describe "bound_text_field" do it "should take a string object and return a useful text control" do r = @c.render :basic - r.should match_tag(:input, :type => "text", :name => "fake_model[foo]", :value => "foowee") + r.should have_selector("input[type=text][name='fake_model[foo]'][value=foowee]") end it "should take additional attributes and use them" do r = @c.render :basic - r.should match_tag(:input, :type => "text", :name => "fake_model[foo]", :value => "foowee", :bar => "7") + r.should have_selector("input[type=text][name='fake_model[foo]'][value=foowee][bar='7']") end it "should provide an additional label tag if the :label option is passed in" do form = @c.render :basic form.should match(/<label.*>LABEL<\/label><input/) - res = form.scan(/<[^>]*>/) - res[2].should_not match_tag(:input, :label => "LABEL") + form.should_not have_selector("input[label=LABEL]") end it "should not errorify the field for a new object" do r = @c.render :basic - r.should_not match_tag(:input, :type => "text", :name => "fake_model[foo]", :class => "error") + r.should_not have_selector("input[type=text][name='fake_model[foo]'][class=error]") end it "should errorify a field for a model with errors" do @@ -301,7 +300,7 @@ describe "bound_text_field" do model.stub!(:errors).and_return(errors) @c.instance_variable_set(:@obj, model) r = @c.render :basic - r.should match_tag(:input, :class => "error text") + r.should have_selector("input[class='error text']") end end @@ -314,24 +313,23 @@ describe "bound_radio_button" do it "should take a string object and return a useful text control" do r = @c.render :basic - r.should match_tag(:input, :type => "radio", :name => "fake_model[foo]", :value => "foowee") + r.should have_selector("input[type=radio][name='fake_model[foo]'][value=foowee]") end it "should take additional attributes and use them" do r = @c.render :basic - r.should match_tag(:input, :type => "radio", :name => "fake_model[foo]", :value => "foowee", :bar => "7") + r.should have_selector("input[type=radio][name='fake_model[foo]'][value=foowee][bar='7']") end it "should provide an additional label tag if the :label option is passed in" do form = @c.render :basic - form.should match(/<input.*><label.*>LABEL<\/label>/) - res = form.scan(/<[^>]*>/) - res[2].should_not match_tag(:input, :label => "LABEL") + form.should have_selector("input + label:contains('LABEL')") + form.should_not have_selector("input[label]") end it "should not errorify the field for a new object" do r = @c.render :basic - r.should_not match_tag(:input, :type => "radio", :name => "fake_model[foo]", :class => "error") + r.should_not have_selector("input[type=radio][name='fake_model[foo]'][class=error]") end it "should errorify a field for a model with errors" do @@ -345,7 +343,7 @@ describe "bound_radio_button" do model.stub!(:errors).and_return(errors) @c.instance_variable_set(:@obj, model) r = @c.render :basic - r.should match_tag(:input, :class => "error radio") + r.should have_selector("input[class='error radio']") end end @@ -357,12 +355,12 @@ describe "password_field" do it "should return a basic password field, but omit the value" do r = @c.render :basic - r.should match_tag(:input, :type => "password", :name => "foo") + r.should have_selector("input[type=password][name=foo]") end it "should provide an additional label tag if the :label option is passed in" do r = @c.render :basic - r.should match(/<label.*>LABEL<\/label>/) + r.should have_selector("label:contains('LABEL')") end it "should be disabled if :disabled => true is passed in" do @@ -392,8 +390,7 @@ describe "bound_password_field" do it "should provide an additional label tag if the :label option is passed in" do r = @c.render :basic r.should match(/<label.*>LABEL<\/label><input/) - res = r.scan(/<[^>]*>/) - res[2].should_not match_tag(:input, :label => "LABEL") + r.should_not match_tag(:input, :label => "LABEL") end it "should not errorify the field for a new object" do @@ -512,7 +509,7 @@ describe "bound_check_box" do it "should take a string and return a useful checkbox control" do r = @c.render :basic r.should match_tag(:input, :type =>"checkbox", :name => "fake_model[baz]", :class => "checkbox", :value => "1", :checked => "checked", :id => "fake_model_baz") - r.should match_tag(:input, :type =>"checkbox", :name => "fake_model[bat]", :class => "checkbox", :value => "0") + r.should match_tag(:input, :type =>"hidden", :name => "fake_model[baz]", :value => "0") end it "should raise an error if you try to use :value" do @@ -529,25 +526,27 @@ describe "bound_check_box" do :value => "1", :checked => "checked", :id => "fake_dm_model_baz") - r.should match_tag(:input, :type =>"checkbox", :name => "fake_dm_model[bat]", :class => "checkbox", :value => "0") + + r.should match_tag(:input, :type =>"hidden", :name => "fake_dm_model[bat]", :value => "0") + r.should match_tag(:input, :type =>"checkbox", :name => "fake_dm_model[bat]", :class => "checkbox", :value => "1") end it "should allow a user to set the :off value" do r = @c.render :on_and_off - r.should match_tag(:input, :type =>"checkbox", :name => "fake_model[bat]", :class => "checkbox", :value => "off") + r.should match_tag(:input, :type =>"hidden", :name => "fake_model[bat]", :value => "off") + r.should match_tag(:input, :type =>"checkbox", :name => "fake_model[bat]", :class => "checkbox", :value => "on") end it "should render controls with errors if their attribute contains an error" do r = @c.render :errors r.should match_tag(:input, :type =>"checkbox", :name => "fake_model[bazbad]", :class => "error checkbox", :value => "1", :checked => "checked") - r.should match_tag(:input, :type =>"checkbox", :name => "fake_model[batbad]", :class => "error checkbox", :value => "0") + r.should match_tag(:input, :type =>"hidden", :name => "fake_model[batbad]", :value => "0") end it "should provide an additional label tag if the :label option is passed in" do form = @c.render :label form.should match( /<input.*><label.*>LABEL<\/label>/ ) - res = form.scan(/<[^>]*>/) - res[0].should_not match_tag(:input, :label => "LABEL") + form.should_not match_tag(:input, :label => "LABEL") end it "should not errorify the field for a new object" do @@ -581,7 +580,7 @@ describe "bound_check_box" do it "should be checked if the value of the model's attribute is equal to the value of :on" do r = @c.render :checked r.should match_tag(:input, :type =>"checkbox", :value => "foowee", :checked => "checked") - r.should match_tag(:input, :type =>"checkbox", :value => "YES", :checked => "checked") + r.should match_tag(:input, :type =>"checkbox", :value => "YES") end end @@ -705,14 +704,11 @@ describe "radio_group" do it "should accept array of hashes as options" do radio = @c.render :hash radio.scan( /<input.*?><label.*?>(Five|Bar)<\/label>/ ).size.should == 2 - radio = radio.scan(/<[^>]*>/) - radio.size.should == 6 - radio[0].should match_tag(:input, :value => 5) - radio[1].should match_tag(:label) - radio[2].should match_tag('/label') - radio[3].should match_tag(:input, :value => 'bar', :id => 'bar_id') - radio[4].should match_tag(:label, :for => 'bar_id') - radio[5].should match_tag('/label') + radio.scan(/<[^>]*>/).size.should == 6 + radio.should match_tag(:input, :value => 5) + radio.should match_tag(:label) + radio.should match_tag(:input, :value => 'bar', :id => 'bar_id') + radio.should match_tag(:label, :for => 'bar_id') end it "should apply attributes to each element" do @@ -740,10 +736,9 @@ describe "bound_radio_group" do it "should return a group of radio buttons" do r = @c.render :basic - radio = r.scan(/<[^>]*>/) - radio[2].should match_tag(:input, :type => "radio", :name => "fake_model[foo]", :value => "foowee", :checked => "checked") - radio[5].should match_tag(:input, :type => "radio", :name => "fake_model[foo]", :value => "baree") - radio[6].should not_match_tag(:checked => "checked") + r.should match_tag(:input, :type => "radio", :name => "fake_model[foo]", :value => "foowee", :checked => "checked") + r.should match_tag(:input, :type => "radio", :name => "fake_model[foo]", :value => "baree") + r.should_not match_tag(:checked => "checked") end it "should provide an additional label tag for each option in array-based options" do @@ -757,37 +752,31 @@ describe "bound_radio_group" do it "should accept array of hashes as options" do r = @c.render :hashes r.scan( /<input.*?><label.*?>(Five|Bar)<\/label>/ ).size.should == 2 - radio = r.scan(/<[^>]*>/)[2..-2] - radio.size.should == 6 - radio[0].should match_tag(:input, :value => 5) - radio[1].should match_tag(:label) - radio[2].should match_tag('/label') - radio[3].should match_tag(:input, :value => 'bar', :id => 'bar_id') - radio[4].should match_tag(:label, :for => 'bar_id') - radio[5].should match_tag('/label') + r.scan(/<[^>]*>/)[2..-2].size.should == 6 + r.should match_tag(:input, :value => 5) + r.should match_tag(:label) + r.should match_tag(:input, :value => 'bar', :id => 'bar_id') + r.should match_tag(:label, :for => 'bar_id') end it "should provide autogenerated id for inputs" do r = @c.render :mixed - radio = r.scan(/<[^>]*>/)[2..-2] - radio[0].should match_tag(:input, :id => 'fake_model_foo_bar') - radio[1].should match_tag(:label, :for => 'fake_model_foo_bar') - radio[3].should match_tag(:input, :id => 'fake_model_foo_bar') - radio[4].should match_tag(:label, :for => 'fake_model_foo_bar') + r.should match_tag(:input, :id => 'fake_model_foo_bar') + r.should match_tag(:label, :for => 'fake_model_foo_bar') + r.should match_tag(:input, :id => 'fake_model_foo_bar') + r.should match_tag(:label, :for => 'fake_model_foo_bar') end it "should override autogenerated id for inputs with hash-given id" do r = @c.render :override_id - radio = r.scan(/<[^>]*>/)[2..-2] - radio[0].should match_tag(:input, :id => 'bar_id') - radio[1].should match_tag(:label, :for => 'bar_id') + r.should match_tag(:input, :id => 'bar_id') + r.should match_tag(:label, :for => 'bar_id') end it "should only have one element with the checked property" do r = @c.render :basic - radio = r.scan(/<[^>]*>/)[2..-2] - radio[0].should match_tag(:input, :checked => "checked") - radio[3].should_not match_tag(:input, :checked => "false") + r.should match_tag(:input, :checked => "checked") + r.should_not match_tag(:input, :checked => "false") end end @@ -819,8 +808,7 @@ describe "text_area" do it "should render a label when the label is passed in" do result = @c.render :label result.should match(/<label.*>LABEL<\/label><textarea/) - res = result.scan(/<[^>]*>/) - res[1].should_not match_tag(:textarea, :label => "LABEL") + result.should_not match_tag(:textarea, :label => "LABEL") end it "should be disabled if :disabled => true is passed in" do @@ -1035,7 +1023,6 @@ describe "option tags" do it "should not pollute the <select> attributes with <option> attributes" do r = @c.render :clean - r = r.slice(/<select[^>]*>/) r.should_not match_tag(:select, :value => "banana", :selected => "selected") end end @@ -1048,12 +1035,7 @@ describe "fieldset" do it "should provide legend option" do r = @c.render :legend -# res = fieldset :legend => 'TEST' do -# _buffer << "CONTENT" -# end - r.should include("CONTENT") - r.should match_tag(:fieldset, {}) - r.should match_tag(:legend, :content => 'TEST') + r.should have_selector("fieldset legend:contains('TEST')") end end @@ -1066,8 +1048,7 @@ describe "label" do it "should render a label tag" do r = @c.render :basic - #r = label("First Name", :id => "user_first_name") - r.should match_tag(:label, :for => "user_first_name", :content => "First Name") + r.should have_selector("label[for=user_first_name]:contains('First Name')") end end @@ -1079,23 +1060,22 @@ describe "file_field" do it "should return a basic file field based on the values passed in" do r = @c.render :with_values - #file_field(:name => "foo", :value => "bar") - r.should match_tag( :input, :type => "file", :name => "foo", :value => "bar") + r.should have_selector("input[type=file][name=foo][value=bar]") end it "should wrap the field in a label if the :label option is passed to the file" do r = @c.render :with_label - r.should match(/<label>LABEL<\/label><input type="file" class="file"\s*\/>/) + r.should have_selector("label:contains('LABEL') + input.file[type=file]") end it "should be disabled if :disabled => true is passed in" do r = @c.render :disabled - r.should match_tag(:input, :type => "file", :disabled => "disabled") + r.should have_selector("input[type=file][disabled=disabled]") end it "should make the surrounding form multipart" do r = @c.render :makes_multipart - r.should match_tag(:form, :enctype => "multipart/form-data") + r.should have_selector("form[enctype='multipart/form-data']") end end @@ -1108,22 +1088,18 @@ describe "bound_file_field" do it "should take a string object and return a useful file control" do r = @c.render :takes_string - r.should match_tag(:input, :type => "file", :name => "fake_model[foo]", :value => "foowee") + r.should have_selector("input[type=file][name='fake_model[foo]'][value=foowee]") end it "should take additional attributes and use them" do r = @c.render :additional_attributes - r.should match_tag(:input, :type => "file", :name => "fake_model[foo]", :value => "foowee", :bar => "7") + r.should have_selector("input[type=file][name='fake_model[foo]'][value=foowee][bar='7']") end it "should wrap the file_field in a label if the :label option is passed in" do r = @c.render :with_label -# form = form_for @obj do -# _buffer << text_field(:foo, :label => "LABEL") -# end - r.should match(/<label.*>LABEL<\/label><input/) - res = r.scan(/<[^>]*>/) - res[2].should_not match_tag(:input, :label => "LABEL") + r.should have_selector("label:contains('LABEL')") + r.should_not have_selector("input[label=LABEL]") end end @@ -1135,20 +1111,18 @@ describe "submit" do it "should return a basic submit input based on the values passed in" do r = @c.render :submit_with_values - r.should match_tag(:input, :type => "submit", :name => "foo", :value => "Done") + r.should have_selector("input[type=submit][name=foo][value=Done]") end it "should provide an additional label tag if the :label option is passed in" do r = @c.render :submit_with_label - r.should match(/<input.*type="submit"/) - r.should match(/<input.*name="submit"/) - r.should match(/<input.*value="Done"/) - r.should match(/<label.*>LABEL<\/label>/) + r.should have_selector("input[type=submit][name=submit][value=Done]") + r.should have_selector("label:contains('LABEL')") end it "should be disabled if :disabled => true is passed in" do r = @c.render :disabled_submit - r.should match_tag(:input, :type => "submit", :value => "Done", :disabled => "disabled") + r.should have_selector("input[type=submit][value=Done][disabled=disabled]") end end @@ -1160,18 +1134,18 @@ describe "button" do it "should return a button based on the values passed in" do r = @c.render :button_with_values - r.should match_tag(:button, :type => "button", :name => "foo", :value => "bar", :content => "Click Me") + r.should have_selector("button[type=button][name=foo][value=bar]:contains('Click Me')") end it "should provide an additional label tag if the :label option is passed in" do r = @c.render :button_with_label - r.should match(/<button.*value="foo"/) - r.should match(/<label.*>LABEL<\/label>/) + r.should have_selector("button[value=foo]") + r.should have_selector("label:contains('LABEL')") end it "should be disabled if :disabled => true is passed in" do r = @c.render :disabled_button - r.should match_tag(:button, :disabled => "true") + r.should have_selector("button[disabled=true]") end end @@ -1209,9 +1183,9 @@ describe "custom builder" do it "should let you override update_unbound_controls" do r = @c.render :everything - r.should match_tag(:button, :unbound => "button") - r.should match_tag(:input, :unbound => "submit") - r.should match_tag(:textarea, :unbound => "text_area") + r.should have_selector("button[unbound=button]") + r.should have_selector("input[unbound=submit]") + r.should have_selector("textarea[unbound=text_area]") end end @@ -1225,28 +1199,28 @@ describe 'delete_button' do it "should have a default submit button text" do result = @controller.render :simple_delete # <%= delete_button @obj %> - result.should match(/<input type=\"submit\" value="Delete"><\/input>/) + result.should have_selector("input[type=submit][value=Delete]") end it 'should return a button inside of a form for the object' do result = @controller.render :simple_delete # <%= delete_button @obj %> - result.should match_tag(:form, :action => "/fake_models/fake_model", :method => "post") - result.should match_tag(:input, :type => "hidden", :value => "DELETE", :name => "_method") + result.should have_selector("form[action='/fake_models/fake_model'][method=post]") + result.should have_selector("input[type=hidden][value=DELETE][name=_method]") end it 'should allow you to modify the label' do result = @controller.render :delete_with_label # <%= delete_button(@obj, "Delete moi!") %> - result.should match(/<input type=\"submit\" value=\"Delete moi!\"><\/input>/) + result.should have_selector("input[type=submit][value='Delete moi!']") end it "should allow you to pass some extra params like a class" do result = @controller.render :delete_with_extra_params - result.should match(/<input type=\"submit\" class=\"custom-class\" value=\"Delete\"><\/input>/) + result.should have_selector("input.custom-class[type=submit][value=Delete]") end it "should allow to pass an explicit url as a string" do result = @controller.render :delete_with_explicit_url # <%= delete_button('/test/custom_url') %> - result.should match_tag(:form, :action => "/test/custom_url", :method => "post") + result.should have_selector("form[action='/test/custom_url'][method=post]") end end merb-helpers/spec/merb_helpers_form_spec.rb @@ -9,38 +9,32 @@ describe Merb::Helpers::Tag do describe "#tag" do it 'generates <div>content</div> from tag :div, "content"' do - response = get "/tag_helper/tag_with_content" + response = request "/tag_helper/tag_with_content" - response.body.should match_tag(:div) - response.body.should include("Astral Projection ~ Dancing Galaxy") + response.should have_selector("div") + response.body.to_s.should include("Astral Projection ~ Dancing Galaxy") end it 'outputs content returned by the block when block is given' do - response = get "/tag_helper/tag_with_content_in_the_block" + response = request "/tag_helper/tag_with_content_in_the_block" - response.body.should match_tag(:div) + response.should have_selector("div") response.body.should include("Astral Projection ~ Trust in Trance 1") end it 'generates tag attributes for all of keys of last Hash' do - response = get "/tag_helper/tag_with_attributes" + response = request "/tag_helper/tag_with_attributes" - doc = Hpricot(response.body) - (doc/"div.psy").size.should == 1 - (doc/"div#bands").size.should == 1 - (doc/"div[@invalid_attr='at least in html']").size.should == 1 + response.should have_selector("div.psy") + response.should have_selector("div#bands") + response.should have_selector("div[invalid_attr='at least in html']") end it 'handles nesting of tags/blocks' do - response = get "/tag_helper/nested_tags" + response = request "/tag_helper/nested_tags" - doc = Hpricot(response.body) - (doc/"div.discography").size.should == 1 - (doc/"div.discography"/"ul.albums").size.should == 1 - (doc/"div.discography"/"ul.albums"/"li.first").size.should == 1 - - (doc/"#tit").size.should == 1 - (doc/"#tit").first.inner_html.should == "Trust in Trance 2" + response.should have_selector("div.discography ul.albums li.first") + response.should have_selector("#tit:contains('Trust in Trance 2')") end end end merb-helpers/spec/merb_helpers_tag_helper_spec.rb merb-core/lib/merb-core/test/helpers/view_helper.rb merb-core/spec/public/test/view_helper_spec.rb aa16b61d61499606b54c19b529c18089122bd305 Carl Lerche carllerche@mac.com http://github.com/wycats/merb/commit/de93f6d6c8c1ad45fdd7ab330ab5b4d0bf3bf3b1 de93f6d6c8c1ad45fdd7ab330ab5b4d0bf3bf3b1 2008-11-03T13:56:05-08:00 2008-11-02T19:58:06-08:00 Convert view matchers to nokogiri with a rexml fallback The view matchers have_xpath, have_selector, have_tag, matches_tag now use nokogiri. If nokogiri is not present (for example, in situations where it cannot be compiled), the matchers fallback on rexml. 0627f1d405f132ed2bc178bc69125e908222f64a Carl Lerche carllerche@mac.com