@@ -63,46 +63,42 @@ module InheritedControllerSpec describe SuperController do describe "GET :an_action" do it "should execute action" do - if Rails.version >= '2.3' - pending "rspec/rails2.3 integrate_views working" do - @controller.should_receive :inside_an_action - get :an_action - end + spec = lambda do + @controller.should_receive :inside_an_action + get :an_action end + Rails.version >= '2.3' ? pending("rspec/rails2.3 integrate_views working") { spec.call } : spec.call end it "should render :an_action" do - 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 + spec = lambda 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 + Rails.version >= '2.3' ? pending("rspec/rails2.3 integrate_views working") { spec.call } : spec.call end end describe "GET :a_response" do it "should execute inside the super response block" do - if Rails.version >= '2.3' - pending "rspec/rails2.3 integrate_views working" do - @controller.should_receive :super_inside_a_response - get :a_response - end + spec = lambda do + @controller.should_receive :super_inside_a_response + get :a_response end + Rails.version >= '2.3' ? pending("rspec/rails2.3 integrate_views working") { spec.call } : spec.call end it "should NOT execute inside the sub response block" do - 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 + spec = lambda do + @controller.should_not_receive :sub_inside_a_response + get :a_response end + Rails.version >= '2.3' ? pending("rspec/rails2.3 integrate_views working") { spec.call } : spec.call end end @@ -129,21 +125,19 @@ module InheritedControllerSpec describe "GET :a_response (decorated with a new response)" do it "should NOT execute the super response" do - 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 + spec = lambda do + @controller.should_not_receive :super_inside_a_response + get :a_response end + Rails.version >= '2.3' ? pending("rspec/rails2.3 integrate_views working") { spec.call } : spec.call end it "should execute the sub response" do - if Rails.version >= '2.3' - pending "rspec/rails2.3 integrate_views working" do - @controller.should_receive :sub_inside_a_response - get :a_response - end + spec = lambda do + @controller.should_receive :sub_inside_a_response + get :a_response end + Rails.version >= '2.3' ? pending("rspec/rails2.3 integrate_views working") { spec.call } : spec.call end end spec/controllers/inherited_controllers_spec.rb ce9705f6aff79ae9b1af8cfba0a548f1ff6c1f7d Ian White ian.w.white@gmail.com http://github.com/ianwhite/response_for/commit/d7ce156cc451e0f5f7ae59fd9e38474ce479dfae d7ce156cc451e0f5f7ae59fd9e38474ce479dfae 2009-02-19T13:26:38-08:00 2009-02-19T13:26:38-08:00 Make pending 2.3 specs run on earlier versions 1e8a42e55600b942a81f1ca9cdd0c71b18d8010d Ian White ian.w.white@gmail.com