@@ -15,7 +15,11 @@ class RspecControllerGenerator < ControllerGenerator m.directory File.join('spec/helpers', class_path) m.directory File.join('spec/views', class_path, file_name) - @default_file_extension = "html.erb" + if Rails::VERSION::STRING < "2.0.0" + @default_file_extension = "rhtml" + else + @default_file_extension = "html.erb" + end # Controller spec, class, and helper. m.template 'controller_spec.rb', generators/rspec_controller/rspec_controller_generator.rb @@ -30,8 +30,13 @@ class RspecScaffoldGenerator < Rails::Generator::NamedBase @controller_class_name = "#{@controller_class_nesting}::#{@controller_class_name_without_nesting}" end - @resource_generator = "scaffold" - @default_file_extension = "html.erb" + 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 if ActionController::Base.respond_to?(:resource_action_separator) @resource_edit_path = "/edit" generators/rspec_scaffold/rspec_scaffold_generator.rb @@ -177,7 +177,9 @@ module Spec # allowing Controller Examples to run in two modes, freely switching # from context to context. def render(options=nil, deprecated_status_or_extra_options=nil, &block) - deprecated_status_or_extra_options ||= {} + if ::Rails::VERSION::STRING >= '2.0.0' && deprecated_status_or_extra_options.nil? + deprecated_status_or_extra_options = {} + end unless block_given? unless integrate_views? lib/spec/rails/example/controller_example_group.rb @@ -35,6 +35,15 @@ 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 @@ -131,9 +131,11 @@ require 'controller_spec_controller' get 'action_which_gets_cookie', :expected => "cookie value" 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'} + 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 end end spec/spec/rails/example/controller_spec_spec.rb @@ -26,17 +26,19 @@ module Spec end 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 + 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 end end @@ -55,17 +57,19 @@ module Spec end 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 + 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 end end spec/spec/rails/example/cookies_proxy_spec.rb @@ -149,16 +149,18 @@ describe "A view that includes a partial using :collection and :spacer_template" 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 +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 - 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$/) + 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 end spec/spec/rails/example/view_spec_spec.rb @@ -30,7 +30,11 @@ require File.dirname(__FILE__) + '/../../../spec_helper' it "should match an rjs template" do xhr :post, 'some_action' - response.should render_template('render_spec/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 end it "should match a partial template (simple path)" do spec/spec/rails/matchers/render_template_spec.rb 876f611fb026bea04c89346755d62de93e6e5050 David Chelimsky dchelimsky@gmail.com http://github.com/dchelimsky/rspec-rails/commit/07a554091cb23a0227ecf4333c00cccd82dad66c 07a554091cb23a0227ecf4333c00cccd82dad66c 2009-01-08T12:19:05-08:00 2009-01-08T12:19:05-08:00 Revert "eliminate all the rails <= 2 conditionals" This reverts commit 876f611fb026bea04c89346755d62de93e6e5050. (keeping that commit in the 1.2-dev branch) cdae213f0f0628b7e99ab4435d645ff35e505fcd David Chelimsky dchelimsky@gmail.com