rspec-rails 1.1.11 → 1.1.12

data/generators/rspec/templates/script/spec_server

@@ -13,17 +13,21 @@ module Spec
       def run(argv, stderr, stdout)
         $stdout = stdout
         $stderr = stderr
-
-        base = ActiveRecord::Base
-        def base.clear_reloadable_connections!
-          active_connections.each do |name, conn|
-            if conn.requires_reloading?
-              conn.disconnect!
-              active_connections.delete(name)
+        
+        unless ActiveRecord::Base.respond_to?(:clear_reloadable_connections!)
+          base = ActiveRecord::Base
+          def base.clear_reloadable_connections!
+            active_connections.each do |name, conn|
+              if conn.requires_reloading?
+                conn.disconnect!
+                active_connections.delete(name)
+              end
             end
           end
         end
 
+        ActiveRecord::Base.clear_reloadable_connections!
+
         if ActionController.const_defined?(:Dispatcher)
           dispatcher = ::ActionController::Dispatcher.new($stdout)
           dispatcher.cleanup_application
@@ -35,8 +39,13 @@ module Spec
         if Object.const_defined?(:Fixtures) && Fixtures.respond_to?(:reset_cache)
           Fixtures.reset_cache
         end
+        
+        if ::ActiveSupport.const_defined?(:Dependencies)
+          ::ActiveSupport::Dependencies.mechanism = :load
+        else
+          ::Dependencies.mechanism = :load
+        end
 
-        ::Dependencies.mechanism = :load
         require_dependency('application.rb') unless Object.const_defined?(:ApplicationController)
         load File.dirname(__FILE__) + '/../spec/spec_helper.rb'
 

data/generators/rspec/templates/spec_helper.rb

@@ -43,5 +43,5 @@ Spec::Runner.configure do |config|
   #
   # == Notes
   # 
-  # For more information take a look at Spec::Example::Configuration and Spec::Runner
+  # For more information take a look at Spec::Runner::Configuration and Spec::Runner
 end

data/generators/rspec_default_values.rb

@@ -3,9 +3,9 @@ module Rails
     class GeneratedAttribute
       def default_value
         @default_value ||= case type
-          when :int, :integer               then "\"1\""
-          when :float                       then "\"1.5\""
-          when :decimal                     then "\"9.99\""
+          when :int, :integer               then "1"
+          when :float                       then "1.5"
+          when :decimal                     then "9.99"
           when :datetime, :timestamp, :time then "Time.now"
           when :date                        then "Date.today"
           when :string, :text               then "\"value for #{@name}\""

data/generators/rspec_scaffold/templates/edit_erb_spec.rb

@@ -1,14 +1,15 @@
 require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper')
 
+<% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "/<%= table_name %>/edit.<%= default_file_extension %>" do
   include <%= controller_class_name %>Helper
   
   before(:each) do
     assigns[:<%= file_name %>] = @<%= file_name %> = stub_model(<%= class_name %>,
-      :new_record? => false<%= attributes.empty? ? '' : ',' %>
-<% attributes.each_with_index do |attribute, attribute_index| -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%>
-      :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == attributes.length - 1 ? '' : ','%>
-<% end -%><% end -%>
+      :new_record? => false<%= output_attributes.empty? ? '' : ',' %>
+<% output_attributes.each_with_index do |attribute, attribute_index| -%>
+      :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
+<% end -%>
     )
   end
 
@@ -16,9 +17,9 @@ describe "/<%= table_name %>/edit.<%= default_file_extension %>" do
     render "/<%= table_name %>/edit.<%= default_file_extension %>"
     
     response.should have_tag("form[action=#{<%= file_name %>_path(@<%= file_name %>)}][method=post]") do
-<% for attribute in attributes -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%>
+<% for attribute in output_attributes -%>
       with_tag('<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>[name=?]', "<%= file_name %>[<%= attribute.name %>]")
-<% end -%><% end -%>
+<% end -%>
     end
   end
 end

data/generators/rspec_scaffold/templates/index_erb_spec.rb

@@ -1,16 +1,17 @@
 require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper')
 
+<% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "/<%= table_name %>/index.<%= default_file_extension %>" do
   include <%= controller_class_name %>Helper
   
   before(:each) do
     assigns[:<%= table_name %>] = [
 <% [1,2].each_with_index do |id, model_index| -%>
-      stub_model(<%= class_name %><%= attributes.empty? ? (model_index == 1 ? ')' : '),') : ',' %>
-<% attributes.each_with_index do |attribute, attribute_index| -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%>
-        :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == attributes.length - 1 ? '' : ','%>
-<% end -%><% end -%>
-<% if !attributes.empty? -%>
+      stub_model(<%= class_name %><%= output_attributes.empty? ? (model_index == 1 ? ')' : '),') : ',' %>
+<% output_attributes.each_with_index do |attribute, attribute_index| -%>
+        :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
+<% end -%>
+<% if !output_attributes.empty? -%>
       <%= model_index == 1 ? ')' : '),' %>
 <% end -%>
 <% end -%>
@@ -19,9 +20,9 @@ describe "/<%= table_name %>/index.<%= default_file_extension %>" do
 
   it "should render list of <%= table_name %>" do
     render "/<%= table_name %>/index.<%= default_file_extension %>"
-<% for attribute in attributes -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%>
-    response.should have_tag("tr>td", <%= attribute.default_value %>, 2)
-<% end -%><% end -%>
+<% for attribute in output_attributes -%>
+    response.should have_tag("tr>td", <%= attribute.default_value %>.to_s, 2)
+<% end -%>
   end
 end
 

data/generators/rspec_scaffold/templates/new_erb_spec.rb

@@ -1,14 +1,15 @@
 require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper')
 
+<% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "/<%= table_name %>/new.<%= default_file_extension %>" do
   include <%= controller_class_name %>Helper
   
   before(:each) do
     assigns[:<%= file_name %>] = stub_model(<%= class_name %>,
-      :new_record? => true<%= attributes.empty? ? '' : ',' %>
-<% attributes.each_with_index do |attribute, attribute_index| -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%>
-      :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == attributes.length - 1 ? '' : ','%>
-<% end -%><% end -%>
+      :new_record? => true<%= output_attributes.empty? ? '' : ',' %>
+<% output_attributes.each_with_index do |attribute, attribute_index| -%>
+      :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
+<% end -%>
     )
   end
 
@@ -16,9 +17,9 @@ describe "/<%= table_name %>/new.<%= default_file_extension %>" do
     render "/<%= table_name %>/new.<%= default_file_extension %>"
     
     response.should have_tag("form[action=?][method=post]", <%= table_name %>_path) do
-<% for attribute in attributes -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%>
+<% for attribute in output_attributes -%>
       with_tag("<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>[name=?]", "<%= file_name %>[<%= attribute.name %>]")
-<% end -%><% end -%>
+<% end -%>
     end
   end
 end

data/generators/rspec_scaffold/templates/show_erb_spec.rb

@@ -1,23 +1,23 @@
 require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper')
 
+<% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "/<%= table_name %>/show.<%= default_file_extension %>" do
   include <%= controller_class_name %>Helper
-  
   before(:each) do
-    assigns[:<%= file_name %>] = @<%= file_name %> = stub_model(<%= class_name %><%= attributes.empty? ? ')' : ',' %>
-<% attributes.each_with_index do |attribute, attribute_index| -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%>
-      :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == attributes.length - 1 ? '' : ','%>
-<% end -%><% end -%>
-<% if !attributes.empty? -%>
+    assigns[:<%= file_name %>] = @<%= file_name %> = stub_model(<%= class_name %><%= output_attributes.empty? ? ')' : ',' %>
+<% output_attributes.each_with_index do |attribute, attribute_index| -%>
+      :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
+<% end -%>
+<% if !output_attributes.empty? -%>
     )
 <% end -%>
   end
 
   it "should render attributes in <p>" do
     render "/<%= table_name %>/show.<%= default_file_extension %>"
-<% for attribute in attributes -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%>
-    response.should have_text(/<%= Regexp.escape(attribute.default_value)[1..-2]%>/)
-<% end -%><% end -%>
+<% for attribute in output_attributes -%>
+    response.should have_text(/<%= Regexp.escape(attribute.default_value).gsub(/^"|"$/, '')%>/)
+<% end -%>
   end
 end
 

data/lib/spec/rails.rb

@@ -1,6 +1,11 @@
 silence_warnings { RAILS_ENV = "test" }
 
-require_dependency 'application'
+begin
+  require_dependency 'application_controller'
+rescue MissingSourceFile
+  require_dependency 'application'
+end
+
 require 'action_controller/test_process'
 require 'action_controller/integration'
 require 'active_record/fixtures' if defined?(ActiveRecord::Base)
@@ -12,4 +17,11 @@ require 'spec/rails/matchers'
 require 'spec/rails/mocks'
 require 'spec/rails/example'
 require 'spec/rails/extensions'
-require 'spec/rails/interop/testcase'
+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

data/lib/spec/rails/example/controller_example_group.rb

@@ -38,29 +38,9 @@ module Spec
       #
       # == Expecting Errors
       #
-      # Rspec on Rails will raise errors that occur in controller actions.
-      # In contrast, Rails will swallow errors that are raised in controller
-      # actions and return an error code in the header. If you wish to override
-      # Rspec and have Rail's default behaviour,tell the controller to use
-      # rails error handling ...
+      # Rspec on Rails will raise errors that occur in controller actions and
+      # are not rescued or handeled with rescue_from.
       #
-      #   before(:each) do
-      #     controller.use_rails_error_handling!
-      #   end
-      #
-      # When using Rail's error handling, you can expect error codes in headers ...
-      #
-      #   it "should return an error in the header" do
-      #     response.should be_error
-      #   end
-      #
-      #   it "should return a 501" do
-      #     response.response_code.should == 501
-      #   end
-      #
-      #   it "should return a 501" do
-      #     response.code.should == "501"
-      #   end
       class ControllerExampleGroup < FunctionalExampleGroup
         class << self
                     
@@ -202,6 +182,16 @@ module Spec
                     @_first_render ||= args[0] unless args[0] =~ /^layouts/
                     PickedTemplate.new
                   end
+                  
+                  define_method :render do |*args|
+                    if @_rendered
+                      opts = args[0]
+                      (@_rendered[:template] ||= opts[:file]) if opts[:file]
+                      (@_rendered[:partials][opts[:partial]] += 1) if opts[:partial]
+                    else
+                      super
+                    end
+                  end
                 end
               end
             end
@@ -247,8 +237,11 @@ module Spec
         Spec::Example::ExampleGroupFactory.register(:controller, self)
       end
       
-      class PickedTemplate
+      # Returned by _pick_template when running controller examples in isolation mode.
+      class PickedTemplate 
+        # Do nothing when running controller examples in isolation mode.
         def render_template(*ignore_args); end
+        # Do nothing when running controller examples in isolation mode.
         def render_partial(*ignore_args);  end
       end
     end

data/lib/spec/rails/example/cookies_proxy.rb

@@ -9,7 +9,11 @@ module Spec
         end
       
         def[]=(name, value)
-          @example.request.cookies[name.to_s] = CGI::Cookie.new(name.to_s, value)
+          if ::Rails::VERSION::STRING >= '2.3'
+            @example.request.cookies[name.to_s] = value
+          else
+            @example.request.cookies[name.to_s] = CGI::Cookie.new(name.to_s, value)
+          end
         end
         
         def [](name)

data/lib/spec/rails/example/functional_example_group.rb

@@ -7,7 +7,7 @@ module Spec
 
         attr_reader :request, :response
         before(:each) do
-          @controller_class = Object.path2class @controller_class_name
+          @controller_class = @controller_class_name.split('::').inject(Object) { |k,n| k.const_get n }
           raise "Can't determine controller class for #{@controller_class_name}" if @controller_class.nil?
 
           @controller = @controller_class.new
@@ -15,13 +15,13 @@ module Spec
           @response = ActionController::TestResponse.new
           @response.session = @request.session
         end
-
+        
         def params
           request.parameters
         end
 
         def flash
-          response.flash
+          @controller.__send__ :flash
         end
 
         def session
@@ -44,11 +44,23 @@ module Spec
         #   post :login
         #   cookies[:login].expires.should == 1.week.from_now
         #
-        # == Examples (Rails >= 2.0.0 only)
+        # == Examples (Rails 2.0 > 2.2)
         #
         #   cookies[:user_id] = {:value => '1234', :expires => 1.minute.ago}
         #   get :index
         #   response.should be_redirect
+        #
+        # == Examples (Rails 2.3)
+        #
+        # Rails 2.3 changes the way cookies are made available to functional
+        # tests (and therefore rspec controller specs), only making single
+        # values available with no access to other aspects of the cookie. This
+        # is backwards-incompatible, so you have to change your examples to
+        # look like this:
+        #
+        #   cookies[:foo] = 'bar'
+        #   get :index
+        #   cookies[:foo].should == 'bar'
         def cookies
           @cookies ||= Spec::Rails::Example::CookiesProxy.new(self)
         end
@@ -71,7 +83,7 @@ module Spec
         #   assigns[:registration].should == Thing.new
         #--
         # NOTE - Even though docs only use assigns[:key] format, this supports
-        # assigns(:key) in order to avoid breaking old specs.
+        # assigns(:key) for backwards compatibility.
         #++
         def assigns(key = nil)
           if key.nil?

data/lib/spec/rails/example/helper_example_group.rb

@@ -26,6 +26,8 @@ module Spec
       #     end
       #   end
       class HelperExampleGroup < FunctionalExampleGroup
+        attr_accessor :output_buffer
+        
         class HelperObject < ActionView::Base
           def protect_against_forgery?
             false
@@ -117,7 +119,9 @@ module Spec
 
           @flash = ActionController::Flash::FlashHash.new
           session['flash'] = @flash
-
+          
+          @output_buffer = ""
+          @template = helper
           ActionView::Helpers::AssetTagHelper::reset_javascript_include_default
           
           helper.session = session
@@ -161,9 +165,6 @@ module Spec
 
       class HelperExampleGroupController < ApplicationController #:nodoc:
         attr_accessor :request, :url
-
-        # Re-raise errors
-        def rescue_action(e); raise e; end
       end
     end
   end

data/lib/spec/rails/example/rails_example_group.rb

@@ -8,26 +8,21 @@ module Spec
   module Rails
 
     module Example
-      class RailsExampleGroup < Test::Unit::TestCase
-        
-        # Rails >= r8570 uses setup/teardown_fixtures explicitly
-        # However, Rails >= r8664 extracted these out to use ActiveSupport::Callbacks.
-        # The latter case is handled at the TestCase level, in interop/testcase.rb
-        unless ActiveSupport.const_defined?(:Callbacks) and self.include?(ActiveSupport::Callbacks)
-          before(:each) do
-            setup_fixtures if self.respond_to?(:setup_fixtures)
-          end
-          after(:each) do
-            teardown_fixtures if self.respond_to?(:teardown_fixtures)
-          end
+      if ActiveSupport.const_defined?(:TestCase)
+        class RailsExampleGroup < ActiveSupport::TestCase
+          include ActionController::Assertions::SelectorAssertions
         end
-        
+      else
+        class RailsExampleGroup < Test::Unit::TestCase
+        end
+      end
+      
+      class RailsExampleGroup
         include Spec::Rails::Matchers
         include Spec::Rails::Mocks
-        
         Spec::Example::ExampleGroupFactory.default(self)
-        
       end
+      
     end
   end
 end

data/lib/spec/rails/example/view_example_group.rb

@@ -103,11 +103,11 @@ module Spec
           add_helpers(options)
 
           assigns[:action_name] = @action_name
-
-          @request.path_parameters = {
-          :controller => derived_controller_name(options),
-          :action => derived_action_name(options)
-          }
+          
+          @request.path_parameters = @request.path_parameters.merge(
+            :controller => derived_controller_name(options),
+            :action => derived_action_name(options)
+          ).merge(options[:path_parameters] || {})
 
           defaults = { :layout => false }
           options = defaults.merge options

data/lib/spec/rails/extensions.rb

@@ -1,8 +1,6 @@
 require 'spec'
 
-require 'spec/rails/extensions/object'
-
-require 'spec/rails/extensions/spec/example/configuration'
+require 'spec/rails/extensions/spec/runner/configuration'
 require 'spec/rails/extensions/spec/matchers/have'
 
 require 'spec/rails/extensions/active_record/base'