@@ -196,7 +196,8 @@ module Spec end (class << @template; self; end).class_eval do define_method :render_file do |*args| - @first_render ||= args[0] + @first_render ||= args[0] # rails up 2.1.0 + @_first_render ||= args[0] # rails edge > 2.1.0 end end end lib/spec/rails/example/controller_example_group.rb @@ -10,10 +10,21 @@ module Spec end def matches?(response) - @actual = response.rendered_file - full_path(@actual) == full_path(@expected) + if response.respond_to?(:rendered_file) + @actual = response.rendered_file + full_path(@actual) == full_path(@expected) + else + @actual = response.rendered_template.to_s + if @expected =~ /\// + given_controller_path, given_file = path_and_file(@actual) + expected_controller_path, expected_file = path_and_file(@expected) + given_controller_path == expected_controller_path && given_file.match(expected_file) + else + current_controller_path == controller_path_from(@actual) && @actual.match(@expected) + end + end end - + def failure_message "expected #{@expected.inspect}, got #{@actual.inspect}" end @@ -27,9 +38,25 @@ module Spec end private + def path_and_file(path) + parts = path.split('/') + file = parts.pop + return parts.join('/'), file + end + + def controller_path_from(path) + parts = path.split('/') + parts.pop + parts.join('/') + end + def full_path(path) return nil if path.nil? - path.include?('/') ? path : "#{@controller.class.to_s.underscore.gsub('_controller','')}/#{path}" + path.include?('/') ? path : "#{current_controller_path}/#{path}" + end + + def current_controller_path + @controller.class.to_s.underscore.gsub(/_controller$/,'') end end lib/spec/rails/matchers/render_template.rb @@ -7,7 +7,7 @@ require File.dirname(__FILE__) + '/../../spec_helper' if mode == 'integration' integrate_views end - + it "should match a simple path" do post 'some_action' response.should render_template('some_action') @@ -51,35 +51,35 @@ require File.dirname(__FILE__) + '/../../spec_helper' post 'some_action' lambda do response.should render_template('non_existent_template') - end.should fail_with("expected \"non_existent_template\", got \"render_spec/some_action\"") + end.should fail_with(/expected \"non_existent_template\", got \"render_spec\/some_action(.rhtml)?\"/) end it "should fail without full path when template is associated with a different controller" do post 'action_which_renders_template_from_other_controller' lambda do response.should render_template('action_with_template') - end.should fail_with(%Q|expected "action_with_template", got "controller_spec/action_with_template"|) + end.should fail_with(/expected \"action_with_template\", got \"controller_spec\/action_with_template(.rhtml)?\"/) end it "should fail with incorrect full path when template is associated with a different controller" do post 'action_which_renders_template_from_other_controller' lambda do response.should render_template('render_spec/action_with_template') - end.should fail_with(%Q|expected "render_spec/action_with_template", got "controller_spec/action_with_template"|) + end.should fail_with(/expected \"render_spec\/action_with_template\", got \"controller_spec\/action_with_template(\.rhtml)?\"/) end it "should fail on the wrong extension (given rhtml)" do get 'some_action' lambda { response.should render_template('render_spec/some_action.rjs') - }.should fail_with("expected \"render_spec/some_action.rjs\", got \"render_spec/some_action\"") + }.should fail_with(/expected \"render_spec\/some_action\.rjs\", got \"render_spec\/some_action(\.rhtml)?\"/) end it "should fail when TEXT is rendered" do post 'text_action' lambda do response.should render_template('some_action') - end.should fail_with("expected \"some_action\", got nil") + end.should fail_with(/expected \"some_action\", got (nil|\"\")/) end end spec/rails/matchers/render_spec.rb 6c6e0ded3bd72244bcfdaba854ac5e2e634c8e1d David Chelimsky david@chelimac.local http://github.com/dchelimsky/rspec-rails/commit/6499e4e0d26451c090d88c4312fa245c189979b1 6499e4e0d26451c090d88c4312fa245c189979b1 2008-07-17T20:58:17-07:00 2008-07-17T20:58:17-07:00 Update handling of rendering to accomodate changes in edge rails. [#471 state:resolved milestone:"1.1.5"] fd957c4852b28996be75880ec37433ae04b94412 David Chelimsky david@chelimac.local