rspec-rails 1.1.12 → 1.2.0

data/lib/spec/rails/extensions/action_controller/test_case.rb

@@ -0,0 +1,16 @@
+module ActionController
+  class TestCase
+    include ::Spec::Rails::Example::RoutingHelpers
+
+    if Rails::VERSION::STRING =~ /2\.0/
+      # Introduced in Rails 2.1, but we need it for 2.0
+      def rescue_action_in_public!
+        # See rescue.rb in this same directory
+        def request.rescue_action_in_public?
+          true
+        end
+      end
+      
+    end
+  end
+end

data/lib/spec/rails/extensions/action_controller/test_response.rb

@@ -9,9 +9,10 @@ module ActionController #:nodoc:
     if ::Rails::VERSION::STRING < "2.3"
       def [](name)
         Kernel.warn <<-WARNING
-[](name) as an alias for capture(name) (TestResponse extension in rspec-rails)
-is deprecated and will be removed in the rspec-rails release that follows the
-rails-2.3.0 release.
+DEPRECATION NOTICE: [](name) as an alias for capture(name) (TestResponse
+extension in rspec-rails) is deprecated and will not be defined by rspec-rails
+when working with rails >= 2.3.0. It will also be removed entirely from
+a future version of rspec-rails.
 WARNING
         capture(name)
       end

data/lib/spec/rails/extensions/action_view/base.rb

@@ -3,8 +3,7 @@ module ActionView #:nodoc:
     include Spec::Rails::Example::RenderObserver
     cattr_accessor :base_view_path
 
-    alias_method :orig_render_partial, :render_partial
-    def render_partial(partial_path, local_assigns = nil, deprecated_local_assigns = nil) #:nodoc:
+    def render_partial_with_base_view_path_handling(partial_path, local_assigns = nil, deprecated_local_assigns = nil) #:nodoc:
       if partial_path.is_a?(String)
         unless partial_path.include?("/")
           unless self.class.base_view_path.nil?
@@ -13,21 +12,22 @@ module ActionView #:nodoc:
         end
       end
       begin
-        orig_render_partial(partial_path, local_assigns, deprecated_local_assigns)
+        render_partial_without_base_view_path_handling(partial_path, local_assigns, deprecated_local_assigns)
       rescue ArgumentError # edge rails > 2.1 changed render_partial to accept only one arg
-        orig_render_partial(partial_path)
+        render_partial_without_base_view_path_handling(partial_path)
       end
     end
+    alias_method_chain :render_partial, :base_view_path_handling
 
-    alias_method :orig_render, :render
-    def render(options = {}, old_local_assigns = {}, &block)
-      if render_proxy.send(:__mock_proxy).send(:find_matching_expectation, :render, options)
+    def render_with_mock_proxy(options = {}, old_local_assigns = {}, &block)
+      if render_proxy.__send__(:__mock_proxy).__send__(:find_matching_expectation, :render, options)
         render_proxy.render(options)
       else
-        unless render_proxy.send(:__mock_proxy).send(:find_matching_method_stub, :render, options)
-          orig_render(options, old_local_assigns, &block)
+        unless render_proxy.__send__(:__mock_proxy).__send__(:find_matching_method_stub, :render, options)
+          render_without_mock_proxy(options, old_local_assigns, &block)
         end
       end
     end
+    alias_method_chain :render, :mock_proxy
   end
 end

data/lib/spec/rails/extensions/active_record/base.rb

@@ -1,29 +1,45 @@
 if defined?(ActiveRecord::Base)
-  module ActiveRecord #:nodoc:
-    class Base
-      class << self
-        # Extension for <tt>should have</tt> on AR Model classes
-        #
-        #   ModelClass.should have(:no).records
-        #   ModelClass.should have(1).record
-        #   ModelClass.should have(n).records
-        def records
-          find(:all)
-        end
-        alias :record :records
-      end
+  module Spec
+    module Rails
+      module Extensions
+        module ActiveRecord
+          module ClassMethods
+            # :call-seq:
+            #   ModelClass.should have(:no).records
+            #   ModelClass.should have(1).record
+            #   ModelClass.should have(n).records
+            #
+            # Extension to enhance <tt>should have</tt> on AR Model classes
+            def records
+              find(:all)
+            end
+            alias :record :records
+          end
 
-      # Extension for <tt>should have</tt> on AR Model instances
-      #
-      #   model.should have(:no).errors_on(:attribute)
-      #   model.should have(1).error_on(:attribute)
-      #   model.should have(n).errors_on(:attribute)
-      def errors_on(attribute)
-        self.valid?
-        [self.errors.on(attribute)].flatten.compact
+          module InstanceMethods
+            # :call-seq:
+            #   model.should have(:no).errors_on(:attribute)
+            #   model.should have(1).error_on(:attribute)
+            #   model.should have(n).errors_on(:attribute)
+            #
+            # Extension to enhance <tt>should have</tt> on AR Model instances.
+            # Calls model.valid? in order to prepare the object's errors
+            # object.
+            def errors_on(attribute)
+              self.valid?
+              [self.errors.on(attribute)].flatten.compact
+            end
+            alias :error_on :errors_on
+          end
+        end
       end
-      alias :error_on :errors_on
-
+    end
+  end
+  
+  module ActiveRecord #:nodoc:
+    class Base
+      extend  Spec::Rails::Extensions::ActiveRecord::ClassMethods
+      include Spec::Rails::Extensions::ActiveRecord::InstanceMethods
     end
   end
 end

data/lib/spec/rails/extensions/active_support/test_case.rb

@@ -0,0 +1,7 @@
+module ActiveSupport
+  class TestCase
+    include ::Spec::Rails::Matchers
+    include ::Spec::Rails::Mocks
+  end
+end
+

data/lib/spec/rails/extensions/spec/matchers/have.rb

@@ -3,19 +3,21 @@ require 'spec/matchers/have'
 module Spec #:nodoc:
   module Matchers #:nodoc:
     class Have #:nodoc:
-      alias_method :__original_failure_message, :failure_message
-      def failure_message
+
+      def failure_message_for_should_with_errors_on_extensions
         return "expected #{relativities[@relativity]}#{@expected} errors on :#{@args[0]}, got #{@given}" if @collection_name == :errors_on
         return "expected #{relativities[@relativity]}#{@expected} error on :#{@args[0]}, got #{@given}" if @collection_name == :error_on
-        return __original_failure_message
+        return failure_message_without_errors_on_extensions
       end
+      alias_method_chain :failure_message_for_should, :errors_on_extensions
       
-      alias_method :__original_description, :description
-      def description
+      def description_with_errors_on_extensions
         return "should have #{relativities[@relativity]}#{@expected} errors on :#{@args[0]}" if @collection_name == :errors_on
         return "should have #{relativities[@relativity]}#{@expected} error on :#{@args[0]}" if @collection_name == :error_on
-        return __original_description
+        return description_without_errors_on_extensions
       end
+      alias_method_chain :description, :errors_on_extensions
+
     end
   end
 end

data/lib/spec/rails/extensions/spec/runner/configuration.rb

@@ -1,76 +1,44 @@
 require 'spec/runner/configuration'
 require 'test_help'
 
-begin
-module Spec
-  module Runner
-    class Configuration
+if defined?(ActiveRecord::Base)
+  module Spec
+    module Runner
+      class Configuration
       
-      TEST_CASE = ActiveSupport.const_defined?(:TestCase) ? ActiveSupport::TestCase : Test::Unit::TestCase
-      
-      # Rails 1.2.3 does a copy of the @inheritable_attributes to the subclass when the subclass is
-      # created. This causes an ordering issue when setting state on Configuration because the data is
-      # already copied.
-      # Iterating over EXAMPLE_GROUP_CLASSES causes the base ExampleGroup classes to have their
-      # @inheritable_attributes updated.
-      # TODO: BT - When we no longer support Rails 1.2.3, we can remove this functionality
-      EXAMPLE_GROUP_CLASSES = [
-        TEST_CASE,
-        ::Spec::Rails::Example::RailsExampleGroup,
-        ::Spec::Rails::Example::FunctionalExampleGroup,
-        ::Spec::Rails::Example::ControllerExampleGroup,
-        ::Spec::Rails::Example::ViewExampleGroup,
-        ::Spec::Rails::Example::HelperExampleGroup,
-        ::Spec::Rails::Example::ModelExampleGroup
-      ]
-      # All of this is ActiveRecord related and makes no sense if it's not used by the app
-      if defined?(ActiveRecord::Base)
         def initialize
           super
           self.fixture_path = RAILS_ROOT + '/spec/fixtures'
         end
 
         def use_transactional_fixtures
-          TEST_CASE.use_transactional_fixtures
+          ActiveSupport::TestCase.use_transactional_fixtures
         end
         def use_transactional_fixtures=(value)
-          EXAMPLE_GROUP_CLASSES.each do |example_group|
-            example_group.use_transactional_fixtures = value
-          end
+          ActiveSupport::TestCase.use_transactional_fixtures = value
         end
 
         def use_instantiated_fixtures
-          TEST_CASE.use_instantiated_fixtures
+          ActiveSupport::TestCase.use_instantiated_fixtures
         end
         def use_instantiated_fixtures=(value)
-          EXAMPLE_GROUP_CLASSES.each do |example_group|
-            example_group.use_instantiated_fixtures = value
-          end
+          ActiveSupport::TestCase.use_instantiated_fixtures = value
         end
 
         def fixture_path
-          TEST_CASE.fixture_path
+          ActiveSupport::TestCase.fixture_path
         end
         def fixture_path=(path)
-          EXAMPLE_GROUP_CLASSES.each do |example_group|
-            example_group.fixture_path = path
-          end
+          ActiveSupport::TestCase.fixture_path = path
         end
 
         def global_fixtures
-          TEST_CASE.fixture_table_names
+          ActiveSupport::TestCase.fixture_table_names
         end
         def global_fixtures=(fixtures)
-          EXAMPLE_GROUP_CLASSES.each do |example_group|
-            example_group.fixtures(*fixtures)
-          end
+          ActiveSupport::TestCase.fixtures(*fixtures)
         end
       end
     end
   end
 end
-rescue Exception => e
-  puts e.message
-  puts e.backtrace
-  raise e
-end

data/lib/spec/rails/matchers/ar_be_valid.rb

@@ -6,7 +6,7 @@ module Spec
         
         def initialize
           @matcher = Spec::Matchers::Be.new :be_valid
-          @matcher.send :handling_predicate!
+          @matcher.__send__ :handling_predicate!
         end
 
         def matches?(actual)
@@ -14,19 +14,22 @@ module Spec
           @matcher.matches? @actual
         end
       
-        def failure_message
+        def failure_message_for_should
           if @actual.respond_to?(:errors) &&
               ActiveRecord::Errors === @actual.errors
             "Expected #{@actual.inspect} to be valid, but it was not\nErrors: " + @actual.errors.full_messages.join(", ")            
           else
-            @matcher.failure_message
+            @matcher.failure_message_for_should
           end
         end
         
-        def negative_failure_message
-          @matcher.negative_failure_message
+        def failure_message_for_should_not
+          @matcher.failure_message_for_should_not
         end
         
+        def description
+          "be valid"
+        end
       end
 
       # :call-seq:

data/lib/spec/rails/matchers/assert_select.rb

@@ -5,7 +5,7 @@ module Spec # :nodoc:
     module Matchers
 
       class AssertSelect #:nodoc:
-
+        
         def initialize(assertion, spec_scope, *args, &block)
           @assertion = assertion
           @spec_scope = spec_scope
@@ -14,25 +14,22 @@ module Spec # :nodoc:
         end
         
         def matches?(response_or_text, &block)
-          if ActionController::TestResponse === response_or_text and
-                   response_or_text.headers.key?('Content-Type') and
-                   !response_or_text.headers['Content-Type'].blank? and
-                   response_or_text.headers['Content-Type'].to_sym == :xml
-            @args.unshift(HTML::Document.new(response_or_text.body, false, true).root)           
-          elsif String === response_or_text
-            @args.unshift(HTML::Document.new(response_or_text).root)
-          end
           @block = block if block
+
+          if doc = doc_from(response_or_text)
+            @args.unshift(doc)
+          end
+
           begin
-            @spec_scope.send(@assertion, *@args, &@block)
+            @spec_scope.__send__(@assertion, *@args, &@block)
+            true
           rescue ::Test::Unit::AssertionFailedError => @error
+            false
           end
-          
-          @error.nil?
         end
-
-        def failure_message; @error.message; end
-        def negative_failure_message; "should not #{description}, but did"; end
+        
+        def failure_message_for_should; @error.message; end
+        def failure_message_for_should_not; "should not #{description}, but did"; end
 
         def description
           {
@@ -43,13 +40,31 @@ module Spec # :nodoc:
 
       private
 
+        module TestResponseOrString
+          def test_response?
+            ActionController::TestResponse === self and
+                                               !self.headers['Content-Type'].blank? and
+                                               self.headers['Content-Type'].to_sym == :xml
+          end
+        
+          def string?
+            String === self
+          end
+        end
+
+        def doc_from(response_or_text)
+          response_or_text.extend TestResponseOrString
+          markup = response_or_text.body if response_or_text.test_response?
+          markup = response_or_text if response_or_text.string?
+          HTML::Document.new(markup, false, true).root if markup
+        end
+        
         def format_args(*args)
-          return "" if args.empty?
-          return "(#{arg_list(*args)})"
+          args.empty? ? "" : "(#{arg_list(*args)})"
         end
 
         def arg_list(*args)
-          args.collect do |arg|
+          args.map do |arg|
             arg.respond_to?(:description) ? arg.description : arg.inspect
           end.join(", ")
         end
@@ -75,7 +90,7 @@ module Spec # :nodoc:
       #
       # see documentation for assert_select at http://api.rubyonrails.org/
       def have_tag(*args, &block)
-        AssertSelect.new(:assert_select, self, *args, &block)
+        @__current_scope_for_assert_select = AssertSelect.new(:assert_select, self, *args, &block)
       end
     
       # wrapper for a nested assert_select
@@ -86,7 +101,7 @@ module Spec # :nodoc:
       #
       # see documentation for assert_select at http://api.rubyonrails.org/
       def with_tag(*args, &block)
-        should have_tag(*args, &block)
+        @__current_scope_for_assert_select.should have_tag(*args, &block)
       end
     
       # wrapper for a nested assert_select with false
@@ -97,7 +112,7 @@ module Spec # :nodoc:
       #
       # see documentation for assert_select at http://api.rubyonrails.org/
       def without_tag(*args, &block)
-        should_not have_tag(*args, &block)
+        @__current_scope_for_assert_select.should_not have_tag(*args, &block)
       end
     
       # :call-seq:

data/lib/spec/rails/matchers/have_text.rb

@@ -14,15 +14,15 @@ module Spec
           return actual == expected unless Regexp === expected
         end
       
-        def failure_message
+        def failure_message_for_should
           "expected #{expected.inspect}, got #{actual.inspect}"
         end
         
-        def negative_failure_message
+        def failure_message_for_should_not
           "expected not to have text #{expected.inspect}"
         end
         
-        def to_s
+        def description
           "have text #{expected.inspect}"
         end
       

data/lib/spec/rails/matchers/include_text.rb

@@ -13,15 +13,15 @@ module Spec
           return actual.include?(expected)
         end
 
-        def failure_message
+        def failure_message_for_should
           "expected to find #{expected.inspect} in #{actual.inspect}"
         end
 
-        def negative_failure_message
+        def failure_message_for_should_not
           "expected not to include text #{expected.inspect}"
         end
 
-        def to_s
+        def description
           "include text #{expected.inspect}"
         end
 
@@ -51,4 +51,4 @@ module Spec
 
     end
   end
-end
+end