@@ -63,20 +63,24 @@ module InheritedControllerSpec describe SuperController do describe "GET :an_action" do it "should execute action" do - pending "rspec/rails2.3 integrate_views working" do - @controller.should_receive :inside_an_action - get :an_action + if Rails.version >= '2.3' + pending "rspec/rails2.3 integrate_views working" do + @controller.should_receive :inside_an_action + get :an_action + end end end it "should render :an_action" do - pending "rspec/rails2.3 integrate_views working" do - get :an_action - # different rails/rspec behaviour catered for - begin - response.should render_template('an_action') - rescue - response.should render_template('inherited_spec/super/an_action') + if Rails.version >= '2.3' + pending "rspec/rails2.3 integrate_views working" do + get :an_action + # different rails/rspec behaviour catered for + begin + response.should render_template('an_action') + rescue + response.should render_template('inherited_spec/super/an_action') + end end end end @@ -84,16 +88,20 @@ module InheritedControllerSpec describe "GET :a_response" do it "should execute inside the super response block" do - pending "rspec/rails2.3 integrate_views working" do - @controller.should_receive :super_inside_a_response - get :a_response + if Rails.version >= '2.3' + pending "rspec/rails2.3 integrate_views working" do + @controller.should_receive :super_inside_a_response + get :a_response + end end end it "should NOT execute inside the sub response block" do - pending "rspec/rails2.3 integrate_views working" do - @controller.should_not_receive :sub_inside_a_response - get :a_response + if Rails.version >= '2.3' + pending "rspec/rails2.3 integrate_views working" do + @controller.should_not_receive :sub_inside_a_response + get :a_response + end end end end @@ -121,16 +129,20 @@ module InheritedControllerSpec describe "GET :a_response (decorated with a new response)" do it "should NOT execute the super response" do - pending "rspec/rails2.3 integrate_views working" do - @controller.should_not_receive :super_inside_a_response - get :a_response + if Rails.version >= '2.3' + pending "rspec/rails2.3 integrate_views working" do + @controller.should_not_receive :super_inside_a_response + get :a_response + end end end it "should execute the sub response" do - pending "rspec/rails2.3 integrate_views working" do - @controller.should_receive :sub_inside_a_response - get :a_response + if Rails.version >= '2.3' + pending "rspec/rails2.3 integrate_views working" do + @controller.should_receive :sub_inside_a_response + get :a_response + end end end end spec/controllers/inherited_controllers_spec.rb a6d1876a05f18d2e98dcf4fedfaf88d4bbc36774 Ian White ian.w.white@gmail.com http://github.com/ianwhite/response_for/commit/bcc544a726990f851051f09bb8799e69d0e34f46 bcc544a726990f851051f09bb8799e69d0e34f46 2009-02-03T05:04:25-08:00 2009-02-03T05:04:25-08:00 Make pending specs only run in Rails2.3, so that they don't fail (b/c they pass) on older Rails builds in CI 4e06d976b576f7d3651743e18d28b8202f0db65c Ian White ian.w.white@gmail.com