rspec-rails 1.1.12 → 1.2.0

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

@@ -1,21 +1,15 @@
+require 'action_controller/test_case'
+
 module Spec
   module Rails
     module Example
-      class FunctionalExampleGroup < RailsExampleGroup
-        include ActionController::TestProcess
-        include ActionController::Assertions
+      class FunctionalExampleGroup < ActionController::TestCase
+        def setup
+          # no-op to override AC::TC's setup w/ conflicts with the before(:each) below
+        end
 
         attr_reader :request, :response
-        before(:each) do
-          @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
-          @request = ActionController::TestRequest.new
-          @response = ActionController::TestResponse.new
-          @response.session = @request.session
-        end
-        
         def params
           request.parameters
         end
@@ -25,7 +19,7 @@ module Spec
         end
 
         def session
-          response.session
+          request.session
         end
         
         # Overrides the <tt>cookies()</tt> method in
@@ -35,15 +29,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}

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

@@ -1,6 +1,10 @@
 module Spec
   module Rails
     module Example
+      class HelperExampleGroupController < ApplicationController #:nodoc:
+        attr_accessor :request, :url
+      end
+
       # Helper Specs live in $RAILS_ROOT/spec/helpers/.
       #
       # Helper Specs use Spec::Rails::Example::HelperExampleGroup, which allows you to
@@ -12,7 +16,7 @@ module Spec
       #
       # == Example
       #
-      #   class ThingHelper
+      #   module ThingHelper
       #     def number_of_things
       #       Thing.count
       #     end
@@ -26,32 +30,19 @@ module Spec
       #     end
       #   end
       class HelperExampleGroup < FunctionalExampleGroup
+        tests HelperExampleGroupController
         attr_accessor :output_buffer
         
         class HelperObject < ActionView::Base
+          def initialize(*args)
+            @template = self
+            super
+          end
           def protect_against_forgery?
             false
           end
           
-          def session=(session)
-            @session = session
-          end
-          
-          def request=(request)
-            @request = request
-          end
-          
-          def flash=(flash)
-            @flash = flash
-          end
-          
-          def params=(params)
-            @params = params
-          end
-          
-          def controller=(controller)
-            @controller = controller
-          end
+          attr_writer :session, :request, :flash, :params, :controller
           
           private
             attr_reader :session, :request, :flash, :params, :controller
@@ -108,11 +99,7 @@ module Spec
         ActionView::Base.included_modules.reverse.each do |mod|
           include mod if mod.parents.include?(ActionView::Helpers)
         end
-
-        before(:all) do
-          @controller_class_name = 'Spec::Rails::Example::HelperExampleGroupController'
-        end
-
+        
         before(:each) do
           @controller.request = @request
           @controller.url = ActionController::UrlRewriter.new @request, {} # url_for
@@ -154,18 +141,13 @@ module Spec
 
         Spec::Example::ExampleGroupFactory.register(:helper, self)
 
-        protected
+      protected
+
         def _assigns_hash_proxy
-          @_assigns_hash_proxy ||= AssignsHashProxy.new self do
-            helper
-          end
+          @_assigns_hash_proxy ||= AssignsHashProxy.new(self) {helper}
         end
 
       end
-
-      class HelperExampleGroupController < ApplicationController #:nodoc:
-        attr_accessor :request, :url
-      end
     end
   end
 end

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

@@ -6,7 +6,7 @@ module Spec
       # Model examples use Spec::Rails::Example::ModelExampleGroup, which
       # provides support for fixtures and some custom expectations via extensions
       # to ActiveRecord::Base.
-      class ModelExampleGroup < RailsExampleGroup
+      class ModelExampleGroup < ActiveSupport::TestCase
         Spec::Example::ExampleGroupFactory.register(:model, self)
       end
     end

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

@@ -8,32 +8,6 @@ module Spec
       # and template and view examples
       module RenderObserver
 
-        # DEPRECATED
-        #
-        # Use should_receive(:render).with(opts) instead
-        def expect_render(opts={})
-          warn_deprecation("expect_render", "should_receive")
-          register_verify_after_each
-          render_proxy.should_receive(:render, :expected_from => caller(1)[0]).with(opts)
-        end
-
-        # DEPRECATED
-        #
-        # Use stub!(:render).with(opts) instead
-        def stub_render(opts={})
-          warn_deprecation("stub_render", "stub!")
-          register_verify_after_each
-          render_proxy.stub!(:render, :expected_from => caller(1)[0]).with(opts)
-        end
-        
-        def warn_deprecation(deprecated_method, new_method)
-          Kernel.warn <<-WARNING
-#{deprecated_method} is deprecated and will be removed from a future version of rspec-rails.
-
-Please just use object.#{new_method} instead.
-WARNING
-        end
-  
         def verify_rendered # :nodoc:
           render_proxy.rspec_verify
         end

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

@@ -0,0 +1,13 @@
+module Spec
+  module Rails
+    module Example
+
+      class RoutingExampleGroup < ActionController::TestCase
+        tests Class.new(ActionController::Base)
+        
+        Spec::Example::ExampleGroupFactory.register(:routing, self)
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,68 @@
+module Spec
+  module Rails
+    module Example
+      module RoutingHelpers
+        
+        module ParamsFromQueryString # :nodoc:
+          def params_from_querystring(querystring) # :nodoc:
+            params = {}
+            querystring.split('&').each do |piece|
+              key, value = piece.split('=')
+              params[key.to_sym] = value
+            end
+            params
+          end
+        end
+        
+        class RouteFor
+          include ::Spec::Rails::Example::RoutingHelpers::ParamsFromQueryString
+          def initialize(example, options)
+            @example, @options = example, options
+          end
+  
+          def ==(expected)
+            if Hash === expected
+              path, querystring = expected[:path].split('?')
+              path = expected.merge(:path => path)
+            else
+              path, querystring = expected.split('?')
+            end
+            params = querystring.blank? ? {} : @example.params_from_querystring(querystring)
+            @example.assert_recognizes(@options, path, params)
+            true
+          end
+        end
+
+        # Uses ActionController::Routing::Routes to generate
+        # the correct route for a given set of options.
+        # == Example
+        #   route_for(:controller => 'registrations', :action => 'edit', :id => 1)
+        #     => '/registrations/1;edit'
+        def route_for(options)
+          RouteFor.new(self, options)
+        end
+
+        # Uses ActionController::Routing::Routes to parse
+        # an incoming path so the parameters it generates can be checked
+        # == Example
+        #   params_from(:get, '/registrations/1/edit')
+        #     => :controller => 'registrations', :action => 'edit', :id => 1
+        def params_from(method, path)
+          ensure_that_routes_are_loaded
+          path, querystring = path.split('?')
+          params = ActionController::Routing::Routes.recognize_path(path, :method => method)
+          querystring.blank? ? params : params.merge(params_from_querystring(querystring))
+        end
+
+      private
+
+        include ParamsFromQueryString
+
+        def ensure_that_routes_are_loaded
+          ActionController::Routing::Routes.reload if ActionController::Routing::Routes.empty?
+        end
+
+      end
+    end
+  end
+end

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

@@ -1,6 +1,29 @@
 module Spec
   module Rails
     module Example
+      class ViewExampleGroupController < ApplicationController #:nodoc:
+        include Spec::Rails::Example::RenderObserver
+        attr_reader :template
+
+        def add_helper_for(template_path)
+          add_helper(template_path.split('/')[0])
+        end
+
+        def add_helper(name)
+          begin
+            helper_module = "#{name}_helper".camelize.constantize
+          rescue
+            return
+          end
+          (class << template; self; end).class_eval do
+            include helper_module
+          end
+        end
+        
+        def forget_variables_added_to_assigns
+        end
+      end
+
       # View Examples live in $RAILS_ROOT/spec/views/.
       #
       # View Specs use Spec::Rails::Example::ViewExampleGroup,
@@ -24,24 +47,23 @@ module Spec
       #     end
       #   end
       class ViewExampleGroup < FunctionalExampleGroup
-        before(:each) do
-          ensure_that_flash_and_session_work_properly
+        tests ViewExampleGroupController
+        class << self
+          def inherited(klass) # :nodoc:
+            klass.subject { template }
+            super
+          end
         end
 
-        after(:each) do
-          ensure_that_base_view_path_is_not_set_across_example_groups
-        end
-
-        def initialize(defined_description, options={}, &implementation) #:nodoc:
-          super
-          @controller_class_name = "Spec::Rails::Example::ViewExampleGroupController"
-        end
+        before {ensure_that_flash_and_session_work_properly}
+        after  {ensure_that_base_view_path_is_not_set_across_example_groups}
 
         def ensure_that_flash_and_session_work_properly #:nodoc:
-          @controller.send :initialize_template_class, @response
-          @controller.send :assign_shortcuts, @request, @response
+          @controller.class.__send__ :public, :flash
+          @controller.__send__ :initialize_template_class, @response
+          @controller.__send__ :assign_shortcuts, @request, @response
+          @controller.__send__ :initialize_current_url
           @session = @controller.session
-          @controller.class.send :public, :flash
         end
 
         def ensure_that_base_view_path_is_not_set_across_example_groups #:nodoc:
@@ -97,8 +119,15 @@ module Spec
         # See Spec::Rails::Example::ViewExampleGroup for more information.
         def render(*args)
           options = Hash === args.last ? args.pop : {}
-          options[:template] = args.first.to_s unless args.empty?
-
+          
+          if args.empty? 
+            unless [:partial, :inline, :file, :template, :xml, :json, :update].any? {|k| options.has_key? k} 
+              args << self.class.description_parts.first
+            end
+          end
+          
+          options[:template] = args.first.to_s.sub(/^\//,'') unless args.empty?
+          
           set_base_view_path(options)
           add_helpers(options)
 
@@ -112,9 +141,7 @@ module Spec
           defaults = { :layout => false }
           options = defaults.merge options
 
-          @controller.send(:params).reverse_merge! @request.parameters
-
-          @controller.send :initialize_current_url
+          @controller.__send__(:params).reverse_merge! @request.parameters
 
           @controller.class.instance_eval %{
             def controller_path
@@ -126,9 +153,9 @@ module Spec
             end
           }
 
-          @controller.send :forget_variables_added_to_assigns
-          @controller.send :render, options
-          @controller.send :process_cleanup
+          @controller.__send__ :forget_variables_added_to_assigns
+          @controller.__send__ :render, options
+          @controller.__send__ :process_cleanup
         end
 
         # This provides the template. Use this to set mock
@@ -148,36 +175,12 @@ module Spec
 
         Spec::Example::ExampleGroupFactory.register(:view, self)
 
-        protected
+      protected
         def _assigns_hash_proxy
-          @_assigns_hash_proxy ||= AssignsHashProxy.new self do
-            @response.template
-          end
+          @_assigns_hash_proxy ||= AssignsHashProxy.new(self) {@response.template}
         end
       end
 
-      class ViewExampleGroupController < ApplicationController #:nodoc:
-        include Spec::Rails::Example::RenderObserver
-        attr_reader :template
-
-        def add_helper_for(template_path)
-          add_helper(template_path.split('/')[0])
-        end
-
-        def add_helper(name)
-          begin
-            helper_module = "#{name}_helper".camelize.constantize
-          rescue
-            return
-          end
-          (class << template; self; end).class_eval do
-            include helper_module
-          end
-        end
-        
-        def forget_variables_added_to_assigns
-        end
-      end
     end
   end
 end

data/lib/spec/rails/extensions.rb

@@ -3,8 +3,9 @@ require 'spec'
 require 'spec/rails/extensions/spec/runner/configuration'
 require 'spec/rails/extensions/spec/matchers/have'
 
+require 'spec/rails/extensions/active_support/test_case'
 require 'spec/rails/extensions/active_record/base'
-require 'spec/rails/extensions/action_controller/base'
 require 'spec/rails/extensions/action_controller/rescue'
+require 'spec/rails/extensions/action_controller/test_case'
 require 'spec/rails/extensions/action_controller/test_response'
 require 'spec/rails/extensions/action_view/base'

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

@@ -1,25 +1,42 @@
 module ActionController
   module Rescue
     def use_rails_error_handling!
-      @use_rails_error_handling = true
-    end
+      Kernel.warn <<-WARNING
+DEPRECATION NOTICE: controller.use_rails_error_handling! is
+deprecated and will be removed from a future version of
+rspec-rails.
 
+Use rescue_action_in_public!, which is defined directly in
+rails' testing framework, instead.
+WARNING
+      if Rails::VERSION::STRING =~ /^2\.0/
+        @use_rails_error_handling = true
+      else
+        # anything but 0.0.0.0 - borrowed from rails own rescue_action_in_public!
+        request.remote_addr = '208.77.188.166'
+      end
+    end
+    
     def use_rails_error_handling?
       @use_rails_error_handling ||= false
     end
 
   protected
   
-    def rescue_action_with_fast_errors(exception)
-      unless respond_to?(:rescue_with_handler) and rescue_with_handler(exception)
-        if use_rails_error_handling?
-          rescue_action_without_fast_errors exception
+    if Rails::VERSION::STRING =~ /^2\.0/
+      def rescue_action_in_public?
+        request.respond_to?(:rescue_action_in_public?) and request.rescue_action_in_public?
+      end
+      
+      def rescue_action_with_handler_with_fast_errors(exception)
+        if (use_rails_error_handling? || rescue_action_in_public?) & !handler_for_rescue(exception)
+          rescue_action_in_public(exception)
         else
-          raise exception
+          rescue_action_with_handler_without_fast_errors(exception)
         end
       end
+      alias_method_chain :rescue_action_with_handler, :fast_errors
     end
-    alias_method_chain :rescue_action, :fast_errors
 
   end
 end