rspec-rails 3.0.2 → 3.1.0

data/lib/rspec-rails.rb

@@ -7,7 +7,7 @@ module RSpec
       # Rails-3.0.1 requires config.app_generators instead of 3.0.0's config.generators
       generators = config.respond_to?(:app_generators) ? config.app_generators : config.generators
       generators.integration_tool :rspec
-      generators.test_framework   :rspec
+      generators.test_framework :rspec
 
       rake_tasks do
         load "rspec/rails/tasks/rspec.rake"

data/lib/rspec/rails.rb

@@ -8,3 +8,4 @@ require 'rspec/rails/fixture_support'
 require 'rspec/rails/example'
 require 'rspec/rails/vendor/capybara'
 require 'rspec/rails/configuration'
+require 'rspec/rails/feature_check'

data/lib/rspec/rails/adapters.rb

@@ -89,13 +89,10 @@ module RSpec
 
     # @private
     module MinitestCounters
+      attr_writer :assertions
       def assertions
         @assertions ||= 0
       end
-
-      def assertions=(assertions)
-        @assertions = assertions
-      end
     end
 
     # @private
@@ -124,7 +121,8 @@ module RSpec
         end
       end
 
-      def initialize
+      def initialize(*args)
+        super
         @example = nil
       end
 
@@ -143,8 +141,12 @@ module RSpec
         # examples without exposing non-assertion methods in Test::Unit or
         # Minitest.
         def assertion_method_names
-          ::RSpec::Rails::Assertions.public_instance_methods.select{|m| m.to_s =~ /^(assert|flunk|refute)/} +
-            [:build_message]
+          methods = ::RSpec::Rails::Assertions.
+            public_instance_methods.
+            select do |m|
+              m.to_s =~ /^(assert|flunk|refute)/
+            end
+          methods + [:build_message]
         end
 
         def define_assertion_delegators

data/lib/rspec/rails/configuration.rb

@@ -1,5 +1,4 @@
 module RSpec
-
   module Rails
     # Fake class to document RSpec Rails configuration options. In practice,
     # these are dynamically added to the normal RSpec configuration object.
@@ -39,7 +38,7 @@ module RSpec
     # @private
     def self.initialize_configuration(config)
       config.backtrace_exclusion_patterns << /vendor\//
-      config.backtrace_exclusion_patterns << /lib\/rspec\/rails/
+      config.backtrace_exclusion_patterns << %r{ lib/rspec/rails }
 
       config.include RSpec::Rails::ControllerExampleGroup, :type => :controller
       config.include RSpec::Rails::HelperExampleGroup,     :type => :helper
@@ -57,7 +56,7 @@ module RSpec
       config.add_setting :infer_base_class_for_anonymous_controllers, :default => true
 
       # fixture support
-      config.include     RSpec::Rails::FixtureSupport
+      config.include RSpec::Rails::FixtureSupport
       config.add_setting :use_transactional_fixtures, :alias_with => :use_transactional_examples
       config.add_setting :use_instantiated_fixtures
       config.add_setting :global_fixtures

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

@@ -1,179 +1,202 @@
-module RSpec::Rails
-  # Container module for controller spec functionality.
-  module ControllerExampleGroup
-    extend ActiveSupport::Concern
-    include RSpec::Rails::RailsExampleGroup
-    include ActionController::TestCase::Behavior
-    include RSpec::Rails::ViewRendering
-    include RSpec::Rails::Matchers::RedirectTo
-    include RSpec::Rails::Matchers::RenderTemplate
-    include RSpec::Rails::Matchers::RoutingMatchers
-    include RSpec::Rails::AssertionDelegator.new(ActionDispatch::Assertions::RoutingAssertions)
-
-    # Class-level DSL for controller specs.
-    module ClassMethods
-      # @private
-      def controller_class
-        described_class
-      end
+module RSpec
+  module Rails
+    # Container module for controller spec functionality.
+    module ControllerExampleGroup
+      extend ActiveSupport::Concern
+      include RSpec::Rails::RailsExampleGroup
+      include ActionController::TestCase::Behavior
+      include RSpec::Rails::ViewRendering
+      include RSpec::Rails::Matchers::RedirectTo
+      include RSpec::Rails::Matchers::RenderTemplate
+      include RSpec::Rails::Matchers::RoutingMatchers
+      include RSpec::Rails::AssertionDelegator.new(ActionDispatch::Assertions::RoutingAssertions)
 
-      # Supports a simple DSL for specifying behavior of ApplicationController.
-      # Creates an anonymous subclass of ApplicationController and evals the
-      # `body` in that context. Also sets up implicit routes for this
-      # controller, that are separate from those defined in "config/routes.rb".
-      #
-      # @note Due to Ruby 1.8 scoping rules in anonymous subclasses, constants
-      #   defined in `ApplicationController` must be fully qualified (e.g.
-      #   `ApplicationController::AccessDenied`) in the block passed to the
-      #   `controller` method. Any instance methods, filters, etc, that are
-      #   defined in `ApplicationController`, however, are accessible from
-      #   within the block.
-      #
-      # @example
-      #     describe ApplicationController do
-      #       controller do
-      #         def index
-      #           raise ApplicationController::AccessDenied
-      #         end
-      #       end
-      #
-      #       describe "handling AccessDenied exceptions" do
-      #         it "redirects to the /401.html page" do
-      #           get :index
-      #           response.should redirect_to("/401.html")
-      #         end
-      #       end
-      #     end
-      #
-      # If you would like to spec a subclass of ApplicationController, call
-      # controller like so:
-      #
-      #     controller(ApplicationControllerSubclass) do
-      #       # ....
-      #     end
-      def controller(base_class = nil, &body)
-        if RSpec.configuration.infer_base_class_for_anonymous_controllers?
-          base_class ||= controller_class
+      # Class-level DSL for controller specs.
+      module ClassMethods
+        # @private
+        def controller_class
+          described_class
         end
-        base_class ||= defined?(ApplicationController) ? ApplicationController : ActionController::Base
-
-        new_controller_class = Class.new(base_class) do
-          def self.name
-            root_controller = defined?(ApplicationController) ? ApplicationController : ActionController::Base
-            if superclass == root_controller || superclass.abstract?
-              "AnonymousController"
-            else
-              superclass.to_s
+
+        # Supports a simple DSL for specifying behavior of ApplicationController.
+        # Creates an anonymous subclass of ApplicationController and evals the
+        # `body` in that context. Also sets up implicit routes for this
+        # controller, that are separate from those defined in "config/routes.rb".
+        #
+        # @note Due to Ruby 1.8 scoping rules in anonymous subclasses, constants
+        #   defined in `ApplicationController` must be fully qualified (e.g.
+        #   `ApplicationController::AccessDenied`) in the block passed to the
+        #   `controller` method. Any instance methods, filters, etc, that are
+        #   defined in `ApplicationController`, however, are accessible from
+        #   within the block.
+        #
+        # @example
+        #     describe ApplicationController do
+        #       controller do
+        #         def index
+        #           raise ApplicationController::AccessDenied
+        #         end
+        #       end
+        #
+        #       describe "handling AccessDenied exceptions" do
+        #         it "redirects to the /401.html page" do
+        #           get :index
+        #           response.should redirect_to("/401.html")
+        #         end
+        #       end
+        #     end
+        #
+        # If you would like to spec a subclass of ApplicationController, call
+        # controller like so:
+        #
+        #     controller(ApplicationControllerSubclass) do
+        #       # ....
+        #     end
+        def controller(base_class = nil, &body)
+          if RSpec.configuration.infer_base_class_for_anonymous_controllers?
+            base_class ||= controller_class
+          end
+          base_class ||= defined?(ApplicationController) ? ApplicationController : ActionController::Base
+
+          new_controller_class = Class.new(base_class) do
+            def self.name
+              root_controller = defined?(ApplicationController) ? ApplicationController : ActionController::Base
+              if superclass == root_controller || superclass.abstract?
+                "AnonymousController"
+              else
+                superclass.to_s
+              end
             end
           end
-        end
-        new_controller_class.class_exec(&body)
-        (class << self; self; end).__send__(:define_method, :controller_class) { new_controller_class }
+          new_controller_class.class_exec(&body)
+          (class << self; self; end).__send__(:define_method, :controller_class) { new_controller_class }
 
-        before do
-          @orig_routes = self.routes
-          resource_name = @controller.respond_to?(:controller_name) ?
-            @controller.controller_name.to_sym : :anonymous
-          resource_path = @controller.respond_to?(:controller_path) ?
-            @controller.controller_path : resource_name.to_s
-          resource_module = resource_path.rpartition('/').first.presence
-          resource_as = 'anonymous_' + resource_path.tr('/', '_')
-          self.routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
-            r.draw do
-              resources resource_name,
-                :as => resource_as,
-                :module => resource_module,
-                :path => resource_path
+          before do
+            @orig_routes = routes
+            resource_name = if @controller.respond_to?(:controller_name)
+                              @controller.controller_name.to_sym
+                            else
+                              :anonymous
+                            end
+            resource_path = if @controller.respond_to?(:controller_path)
+                              @controller.controller_path
+                            else
+                              resource_name.to_s
+                            end
+            resource_module = resource_path.rpartition('/').first.presence
+            resource_as = 'anonymous_' + resource_path.tr('/', '_')
+            self.routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
+              r.draw do
+                resources resource_name,
+                          :as => resource_as,
+                          :module => resource_module,
+                          :path => resource_path
+              end
             end
           end
+
+          after do
+            self.routes  = @orig_routes
+            @orig_routes = nil
+          end
+        end
+
+        # Specifies the routeset that will be used for the example group. This
+        # is most useful when testing Rails engines.
+        #
+        # @example
+        #     describe MyEngine::PostsController do
+        #       routes { MyEngine::Engine.routes }
+        #
+        #       # ...
+        #     end
+        def routes(&blk)
+          before do
+            self.routes = blk.call
+          end
         end
+      end
+
+      attr_reader :controller, :routes
+
+      # @private
+      #
+      # RSpec Rails uses this to make Rails routes easily available to specs.
+      def routes=(routes)
+        @routes = routes
+        assertion_instance.instance_variable_set(:@routes, routes)
+      end
 
-        after do
-          self.routes  = @orig_routes
-          @orig_routes = nil
+      # @private
+      module BypassRescue
+        def rescue_with_handler(exception)
+          raise exception
         end
       end
 
-      # Specifies the routeset that will be used for the example group. This
-      # is most useful when testing Rails engines.
+      # Extends the controller with a module that overrides
+      # `rescue_with_handler` to raise the exception passed to it. Use this to
+      # specify that an action _should_ raise an exception given appropriate
+      # conditions.
       #
       # @example
-      #     describe MyEngine::PostsController do
-      #       routes { MyEngine::Engine.routes }
+      #     describe ProfilesController do
+      #       it "raises a 403 when a non-admin user tries to view another user's profile" do
+      #         profile = create_profile
+      #         login_as profile.user
       #
-      #       # ...
+      #         expect do
+      #           bypass_rescue
+      #           get :show, :id => profile.id + 1
+      #         end.to raise_error(/403 Forbidden/)
+      #       end
       #     end
-      def routes(&blk)
-        before do
-          self.routes = blk.call
+      def bypass_rescue
+        controller.extend(BypassRescue)
+      end
+
+      # If method is a named_route, delegates to the RouteSet associated with
+      # this controller.
+      def method_missing(method, *args, &block)
+        if route_available?(method)
+          controller.send(method, *args, &block)
+        else
+          super
         end
       end
-    end
 
-    attr_reader :controller, :routes
+      included do
+        subject { controller }
 
-    # @private
-    #
-    # RSpec Rails uses this to make Rails routes easily available to specs.
-    def routes=(routes)
-      @routes = routes
-      assertion_instance.instance_variable_set(:@routes, routes)
-    end
+        before do
+          self.routes = ::Rails.application.routes
+        end
 
-    # @private
-    module BypassRescue
-      def rescue_with_handler(exception)
-        raise exception
+        around do |ex|
+          previous_allow_forgery_protection_value = ActionController::Base.allow_forgery_protection
+          begin
+            ActionController::Base.allow_forgery_protection = false
+            ex.call
+          ensure
+            ActionController::Base.allow_forgery_protection = previous_allow_forgery_protection_value
+          end
+        end
       end
-    end
 
-    # Extends the controller with a module that overrides
-    # `rescue_with_handler` to raise the exception passed to it. Use this to
-    # specify that an action _should_ raise an exception given appropriate
-    # conditions.
-    #
-    # @example
-    #     describe ProfilesController do
-    #       it "raises a 403 when a non-admin user tries to view another user's profile" do
-    #         profile = create_profile
-    #         login_as profile.user
-    #
-    #         expect do
-    #           bypass_rescue
-    #           get :show, :id => profile.id + 1
-    #         end.to raise_error(/403 Forbidden/)
-    #       end
-    #     end
-    def bypass_rescue
-      controller.extend(BypassRescue)
-    end
+    private
 
-    # If method is a named_route, delegates to the RouteSet associated with
-    # this controller.
-    def method_missing(method, *args, &block)
-      if defined?(@routes) && @routes.named_routes.helpers.include?(method)
-        controller.send(method, *args, &block)
-      elsif defined?(@orig_routes) && @orig_routes && @orig_routes.named_routes.helpers.include?(method)
-        controller.send(method, *args, &block)
-      else
-        super
+      def route_available?(method)
+        (defined?(@routes) && route_defined?(routes, method)) ||
+          (defined?(@orig_routes) && route_defined?(@orig_routes, method))
       end
-    end
 
-    included do
-      subject { controller }
-
-      before do
-        self.routes = ::Rails.application.routes
-      end
+      def route_defined?(routes, method)
+        return false if routes.nil?
 
-      around do |ex|
-        previous_allow_forgery_protection_value = ActionController::Base.allow_forgery_protection
-        begin
-          ActionController::Base.allow_forgery_protection = false
-          ex.call
-        ensure
-          ActionController::Base.allow_forgery_protection = previous_allow_forgery_protection_value
+        if routes.named_routes.respond_to?(:route_defined?)
+          routes.named_routes.route_defined?(method)
+        else
+          routes.named_routes.helpers.include?(method)
         end
       end
     end

data/lib/rspec/rails/example/feature_example_group.rb

@@ -1,32 +1,34 @@
-module RSpec::Rails
-  # Container module for routing spec functionality.
-  module FeatureExampleGroup
-    extend ActiveSupport::Concern
-    include RSpec::Rails::RailsExampleGroup
+module RSpec
+  module Rails
+    # Container module for routing spec functionality.
+    module FeatureExampleGroup
+      extend ActiveSupport::Concern
+      include RSpec::Rails::RailsExampleGroup
 
-    # Default host to be used in Rails route helpers if none is specified.
-    DEFAULT_HOST = "www.example.com"
+      # Default host to be used in Rails route helpers if none is specified.
+      DEFAULT_HOST = "www.example.com"
 
-    included do
-      app = ::Rails.application
-      if app.respond_to?(:routes)
-        include app.routes.url_helpers     if app.routes.respond_to?(:url_helpers)
-        include app.routes.mounted_helpers if app.routes.respond_to?(:mounted_helpers)
+      included do
+        app = ::Rails.application
+        if app.respond_to?(:routes)
+          include app.routes.url_helpers     if app.routes.respond_to?(:url_helpers)
+          include app.routes.mounted_helpers if app.routes.respond_to?(:mounted_helpers)
 
-        if respond_to?(:default_url_options)
-          default_url_options[:host] ||= ::RSpec::Rails::FeatureExampleGroup::DEFAULT_HOST
+          if respond_to?(:default_url_options)
+            default_url_options[:host] ||= ::RSpec::Rails::FeatureExampleGroup::DEFAULT_HOST
+          end
         end
       end
-    end
 
-    # Shim to check for presence of Capybara. Will delegate if present, raise
-    # if not. We assume here that in most cases `visit` will be the first
-    # Capybara method called in a spec.
-    def visit(*)
-      if defined?(super)
-        super
-      else
-        raise "Capybara not loaded, please add it to your Gemfile:\n\ngem \"capybara\""
+      # Shim to check for presence of Capybara. Will delegate if present, raise
+      # if not. We assume here that in most cases `visit` will be the first
+      # Capybara method called in a spec.
+      def visit(*)
+        if defined?(super)
+          super
+        else
+          raise "Capybara not loaded, please add it to your Gemfile:\n\ngem \"capybara\""
+        end
       end
     end
   end