@@ -15,11 +15,7 @@ class RspecControllerGenerator < ControllerGenerator m.directory File.join('spec/helpers', class_path) m.directory File.join('spec/views', class_path, file_name) - if Rails::VERSION::STRING < "2.0.0" - @default_file_extension = "rhtml" - else - @default_file_extension = "html.erb" - end + @default_file_extension = "html.erb" # Controller spec, class, and helper. m.template 'controller_spec.rb', generators/rspec_controller/rspec_controller_generator.rb @@ -30,13 +30,8 @@ class RspecScaffoldGenerator < Rails::Generator::NamedBase @controller_class_name = "#{@controller_class_nesting}::#{@controller_class_name_without_nesting}" end - if Rails::VERSION::STRING < "2.0.0" - @resource_generator = "scaffold_resource" - @default_file_extension = "rhtml" - else - @resource_generator = "scaffold" - @default_file_extension = "html.erb" - end + @resource_generator = "scaffold" + @default_file_extension = "html.erb" if ActionController::Base.respond_to?(:resource_action_separator) @resource_edit_path = "/edit" generators/rspec_scaffold/rspec_scaffold_generator.rb @@ -19,9 +19,7 @@ require 'spec/rails/example' require 'spec/rails/extensions' require 'spec/rails/interop/testcase' -if Rails::VERSION::STRING >= "2.0" - # This is a temporary hack to get rspec's auto-runner functionality to not consider - # ActionMailer::TestCase to be a spec waiting to run. - require 'action_mailer/test_case' - Spec::Example::ExampleGroupFactory.register(:ignore_for_now, ActionMailer::TestCase) -end \ No newline at end of file +# This is a temporary hack to get rspec's auto-runner functionality to not consider +# ActionMailer::TestCase to be a spec waiting to run. +require 'action_mailer/test_case' +Spec::Example::ExampleGroupFactory.register(:ignore_for_now, ActionMailer::TestCase) lib/spec/rails.rb @@ -35,15 +35,6 @@ module Spec # cookies in examples using the same API with which you set and read # them in controllers. # - # == Examples (Rails >= 1.2.6) - # - # cookies[:user_id] = '1234' - # get :index - # assigns[:user].id.should == '1234' - # - # post :login - # cookies[:login].expires.should == 1.week.from_now - # # == Examples (Rails 2.0 > 2.2) # # cookies[:user_id] = {:value => '1234', :expires => 1.minute.ago} lib/spec/rails/example/functional_example_group.rb @@ -129,11 +129,9 @@ require 'controller_spec_controller' get 'action_which_gets_cookie', :expected => "cookie value" end - if Rails::VERSION::STRING >= "2.0.0" - it "should support a Hash value" do - cookies[:cookie_key] = {'value' => 'cookie value', 'path' => '/not/default'} - get 'action_which_gets_cookie', :expected => {'value' => 'cookie value', 'path' => '/not/default'} - end + it "should support a Hash value" do + cookies[:cookie_key] = {'value' => 'cookie value', 'path' => '/not/default'} + get 'action_which_gets_cookie', :expected => {'value' => 'cookie value', 'path' => '/not/default'} end end @@ -178,35 +176,33 @@ require 'controller_spec_controller' end end - if Rails::VERSION::MAJOR >= 2 - describe "with an error that is rescued in the controller" do - context "without rails' error handling" do - it "does not raise error" do - lambda do - get 'rescued_error_action' - end.should_not raise_error - end - - it "executes rescue_from" do + describe "with an error that is rescued in the controller" do + context "without rails' error handling" do + it "does not raise error" do + lambda do get 'rescued_error_action' - response.body.should == 'Rescued!' - end + end.should_not raise_error end - context "with rails' error handling" do - before(:each) do - controller.use_rails_error_handling! - end - it "does not raise error" do - lambda do - get 'rescued_error_action' - end.should_not raise_error - end + it "executes rescue_from" do + get 'rescued_error_action' + response.body.should == 'Rescued!' + end + end - it "executes rescue_from" do + context "with rails' error handling" do + before(:each) do + controller.use_rails_error_handling! + end + it "does not raise error" do + lambda do get 'rescued_error_action' - response.body.should == 'Rescued!' - end + end.should_not raise_error + end + + it "executes rescue_from" do + get 'rescued_error_action' + response.body.should == 'Rescued!' end end end spec/spec/rails/example/controller_spec_spec.rb @@ -26,19 +26,17 @@ module Spec end end - if ::Rails::VERSION::STRING >= "2.0.0" - it "should accept a Hash value" do - cookies = CookiesProxy.new(self) - cookies['key'] = { :value => 'value', :expires => expiration = 1.hour.from_now, :path => path = '/path' } - get :index - if ::Rails::VERSION::STRING >= "2.3" - cookies['key'].should == 'value' - else - cookies['key'].should == ['value'] - cookies['key'].value.should == ['value'] - cookies['key'].expires.should == expiration - cookies['key'].path.should == path - end + it "should accept a Hash value" do + cookies = CookiesProxy.new(self) + cookies['key'] = { :value => 'value', :expires => expiration = 1.hour.from_now, :path => path = '/path' } + get :index + if ::Rails::VERSION::STRING >= "2.3" + cookies['key'].should == 'value' + else + cookies['key'].should == ['value'] + cookies['key'].value.should == ['value'] + cookies['key'].expires.should == expiration + cookies['key'].path.should == path end end @@ -57,19 +55,17 @@ module Spec end end - if ::Rails::VERSION::STRING >= "2.0.0" - it "should accept a Hash value" do - example_cookies = CookiesProxy.new(self) - example_cookies[:key] = { :value => 'value', :expires => expiration = 1.hour.from_now, :path => path = '/path' } - get :index - if ::Rails::VERSION::STRING >= "2.3" - example_cookies[:key].should == 'value' - else - example_cookies[:key].should == ['value'] - example_cookies[:key].value.should == ['value'] - example_cookies[:key].expires.should == expiration - example_cookies[:key].path.should == path - end + it "should accept a Hash value" do + example_cookies = CookiesProxy.new(self) + example_cookies[:key] = { :value => 'value', :expires => expiration = 1.hour.from_now, :path => path = '/path' } + get :index + if ::Rails::VERSION::STRING >= "2.3" + example_cookies[:key].should == 'value' + else + example_cookies[:key].should == ['value'] + example_cookies[:key].value.should == ['value'] + example_cookies[:key].expires.should == expiration + example_cookies[:key].path.should == path end end spec/spec/rails/example/cookies_proxy_spec.rb @@ -112,8 +112,6 @@ module Spec ActionView::Helpers::TextHelper, ActionView::Helpers::UrlHelper ] - helpers << ActionView::Helpers::PaginationHelper rescue nil #removed for 2.0 - helpers << ActionView::Helpers::JavaScriptMacrosHelper rescue nil #removed for 2.0 helpers.each do |helper_module| it "should include #{helper_module}" do self.class.ancestors.should include(helper_module) spec/spec/rails/example/helper_spec_spec.rb @@ -149,18 +149,16 @@ describe "A view that includes a partial using :collection and :spacer_template" end -if Rails::VERSION::MAJOR >= 2 - describe "A view that includes a partial using an array as partial_path", :type => :view do - before(:each) do - renderable_object = Object.new - renderable_object.stub!(:name).and_return("Renderable Object") - assigns[:array] = [renderable_object] - end +describe "A view that includes a partial using an array as partial_path", :type => :view do + before(:each) do + renderable_object = Object.new + renderable_object.stub!(:name).and_return("Renderable Object") + assigns[:array] = [renderable_object] + end - it "should render the array passed through to render_partial without modification" do - render "view_spec/template_with_partial_with_array" - response.body.should match(/^Renderable Object$/) - end + it "should render the array passed through to render_partial without modification" do + render "view_spec/template_with_partial_with_array" + response.body.should match(/^Renderable Object$/) end end spec/spec/rails/example/view_spec_spec.rb @@ -30,11 +30,7 @@ require File.dirname(__FILE__) + '/../../../spec_helper' it "should match an rjs template" do xhr :post, 'some_action' - if Rails::VERSION::STRING < "2.0.0" - response.should render_template('render_spec/some_action.rjs') - else - response.should render_template('render_spec/some_action') - end + response.should render_template('render_spec/some_action') end it "should match a partial template (simple path)" do spec/spec/rails/matchers/render_template_spec.rb f6a82199a0e6d583f8b219484c66c0f9168a7202 David Chelimsky dchelimsky@gmail.com http://github.com/bmabey/rspec-rails/commit/7cea2cbddb47ec4d156ad5ad2491a8ac2e09544c 7cea2cbddb47ec4d156ad5ad2491a8ac2e09544c 2009-01-12T05:59:40-08:00 2009-01-12T05:59:40-08:00 remove remaining conditionals checking for rails >=< 2.0 033d8e12ec1d4d54da7e9802e531fcdce8c27ef8 David Chelimsky dchelimsky@gmail.com