rspec-rails 3.0.2 → 3.1.0

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

@@ -1,38 +1,40 @@
 require 'rspec/rails/view_assigns'
 
-module RSpec::Rails
-  # Container module for helper specs.
-  module HelperExampleGroup
-    extend ActiveSupport::Concern
-    include RSpec::Rails::RailsExampleGroup
-    include ActionView::TestCase::Behavior
-    include RSpec::Rails::ViewAssigns
+module RSpec
+  module Rails
+    # Container module for helper specs.
+    module HelperExampleGroup
+      extend ActiveSupport::Concern
+      include RSpec::Rails::RailsExampleGroup
+      include ActionView::TestCase::Behavior
+      include RSpec::Rails::ViewAssigns
 
-    # @private
-    module ClassMethods
-      def determine_default_helper_class(ignore)
-        described_class
+      # @private
+      module ClassMethods
+        def determine_default_helper_class(_ignore)
+          described_class
+        end
       end
-    end
 
-    # Returns an instance of ActionView::Base with the helper being specified
-    # mixed in, along with any of the built-in rails helpers.
-    def helper
-      _view.tap do |v|
-        v.extend(ApplicationHelper) if defined?(ApplicationHelper)
-        v.assign(view_assigns)
+      # Returns an instance of ActionView::Base with the helper being specified
+      # mixed in, along with any of the built-in rails helpers.
+      def helper
+        _view.tap do |v|
+          v.extend(ApplicationHelper) if defined?(ApplicationHelper)
+          v.assign(view_assigns)
+        end
       end
-    end
 
     private
 
-    def _controller_path(example)
-      example.example_group.described_class.to_s.sub(/Helper/,'').underscore
-    end
+      def _controller_path(example)
+        example.example_group.described_class.to_s.sub(/Helper/, '').underscore
+      end
 
-    included do
-      before do |example|
-        controller.controller_path = _controller_path(example)
+      included do
+        before do |example|
+          controller.controller_path = _controller_path(example)
+        end
       end
     end
   end

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

@@ -1,31 +1,35 @@
-module RSpec::Rails
-  # Container module for mailer spec functionality. It is only available if
-  # ActionMailer has been loaded before it.
-  module MailerExampleGroup
-    # This blank module is only necessary for YARD processing. It doesn't
-    # handle the conditional `defined?` check below very well.
+module RSpec
+  module Rails
+    # Container module for mailer spec functionality. It is only available if
+    # ActionMailer has been loaded before it.
+    module MailerExampleGroup
+      # This blank module is only necessary for YARD processing. It doesn't
+      # handle the conditional `defined?` check below very well.
+    end
   end
 end
 
 if defined?(ActionMailer)
-  module RSpec::Rails
-    # Container module for mailer spec functionality.
-    module MailerExampleGroup
-      extend ActiveSupport::Concern
-      include RSpec::Rails::RailsExampleGroup
-      include ActionMailer::TestCase::Behavior
+  module RSpec
+    module Rails
+      # Container module for mailer spec functionality.
+      module MailerExampleGroup
+        extend ActiveSupport::Concern
+        include RSpec::Rails::RailsExampleGroup
+        include ActionMailer::TestCase::Behavior
 
-      included do
-        include ::Rails.application.routes.url_helpers
-        options = ::Rails.configuration.action_mailer.default_url_options
-        options.each { |key, value| default_url_options[key] = value } if options
-      end
+        included do
+          include ::Rails.application.routes.url_helpers
+          options = ::Rails.configuration.action_mailer.default_url_options
+          options.each { |key, value| default_url_options[key] = value } if options
+        end
 
-      # Class-level DSL for mailer specs.
-      module ClassMethods
-        # Alias for `described_class`.
-        def mailer_class
-          described_class
+        # Class-level DSL for mailer specs.
+        module ClassMethods
+          # Alias for `described_class`.
+          def mailer_class
+            described_class
+          end
         end
       end
     end

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

@@ -1,8 +1,10 @@
-module RSpec::Rails
-  # Container class for model spec functionality. Does not provide anything
-  # special over the common RailsExampleGroup currently.
-  module ModelExampleGroup
-    extend ActiveSupport::Concern
-    include RSpec::Rails::RailsExampleGroup
+module RSpec
+  module Rails
+    # Container class for model spec functionality. Does not provide anything
+    # special over the common RailsExampleGroup currently.
+    module ModelExampleGroup
+      extend ActiveSupport::Concern
+      include RSpec::Rails::RailsExampleGroup
+    end
   end
 end

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

@@ -1,22 +1,24 @@
-module RSpec::Rails
-  # Container class for request spec functionality.
-  module RequestExampleGroup
-    extend ActiveSupport::Concern
-    include RSpec::Rails::RailsExampleGroup
-    include ActionDispatch::Integration::Runner
-    include ActionDispatch::Assertions
-    include RSpec::Rails::Matchers::RedirectTo
-    include RSpec::Rails::Matchers::RenderTemplate
-    include ActionController::TemplateAssertions
+module RSpec
+  module Rails
+    # Container class for request spec functionality.
+    module RequestExampleGroup
+      extend ActiveSupport::Concern
+      include RSpec::Rails::RailsExampleGroup
+      include ActionDispatch::Integration::Runner
+      include ActionDispatch::Assertions
+      include RSpec::Rails::Matchers::RedirectTo
+      include RSpec::Rails::Matchers::RenderTemplate
+      include ActionController::TemplateAssertions
 
-    # Delegates to `Rails.application`.
-    def app
-      ::Rails.application
-    end
+      # Delegates to `Rails.application`.
+      def app
+        ::Rails.application
+      end
 
-    included do
-      before do
-        @routes = ::Rails.application.routes
+      included do
+        before do
+          @routes = ::Rails.application.routes
+        end
       end
     end
   end

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

@@ -1,53 +1,55 @@
 require "action_dispatch/testing/assertions/routing"
 
-module RSpec::Rails
-  # Container module for routing spec functionality.
-  module RoutingExampleGroup
-    extend ActiveSupport::Concern
-    include RSpec::Rails::RailsExampleGroup
-    include RSpec::Rails::Matchers::RoutingMatchers
-    include RSpec::Rails::Matchers::RoutingMatchers::RouteHelpers
-    include RSpec::Rails::AssertionDelegator.new(ActionDispatch::Assertions::RoutingAssertions)
+module RSpec
+  module Rails
+    # Container module for routing spec functionality.
+    module RoutingExampleGroup
+      extend ActiveSupport::Concern
+      include RSpec::Rails::RailsExampleGroup
+      include RSpec::Rails::Matchers::RoutingMatchers
+      include RSpec::Rails::Matchers::RoutingMatchers::RouteHelpers
+      include RSpec::Rails::AssertionDelegator.new(ActionDispatch::Assertions::RoutingAssertions)
 
-    # Class-level DSL for route specs.
-    module ClassMethods
-      # 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 }
-      #
-      #       it "routes posts#index" do
-      #         expect(:get => "/posts").to
-      #           route_to(:controller => "my_engine/posts", :action => "index")
-      #       end
-      #     end
-      def routes(&blk)
-        before do
-          self.routes = blk.call
+      # Class-level DSL for route specs.
+      module ClassMethods
+        # 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 }
+        #
+        #       it "routes posts#index" do
+        #         expect(:get => "/posts").to
+        #           route_to(:controller => "my_engine/posts", :action => "index")
+        #       end
+        #     end
+        def routes(&blk)
+          before do
+            self.routes = blk.call
+          end
         end
       end
-    end
 
-    included do
-      before do
-        self.routes = ::Rails.application.routes
+      included do
+        before do
+          self.routes = ::Rails.application.routes
+        end
       end
-    end
 
-    attr_reader :routes
+      attr_reader :routes
 
-    # @private
-    def routes=(routes)
-      @routes = routes
-      assertion_instance.instance_variable_set(:@routes, routes)
-    end
+      # @private
+      def routes=(routes)
+        @routes = routes
+        assertion_instance.instance_variable_set(:@routes, routes)
+      end
 
     private
 
-    def method_missing(m, *args, &block)
-      routes.url_helpers.respond_to?(m) ? routes.url_helpers.send(m, *args) : super
+      def method_missing(m, *args, &block)
+        routes.url_helpers.respond_to?(m) ? routes.url_helpers.send(m, *args) : super
+      end
     end
   end
 end

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

@@ -1,169 +1,172 @@
 require 'rspec/rails/view_assigns'
 
-module RSpec::Rails
-  # Container class for view spec functionality.
-  module ViewExampleGroup
-    extend ActiveSupport::Concern
-    include RSpec::Rails::RailsExampleGroup
-    include ActionView::TestCase::Behavior
-    include RSpec::Rails::ViewAssigns
-    include RSpec::Rails::Matchers::RenderTemplate
-
-    # @private
-    module ClassMethods
-      def _default_helper
-        base = metadata[:description].split('/')[0..-2].join('/')
-        (base.camelize + 'Helper').constantize if base
-      rescue NameError
-        nil
-      end
-
-      def _default_helpers
-        helpers = [_default_helper].compact
-        helpers << ApplicationHelper if Object.const_defined?('ApplicationHelper')
-        helpers
-      end
-    end
+module RSpec
+  module Rails
+    # Container class for view spec functionality.
+    module ViewExampleGroup
+      extend ActiveSupport::Concern
+      include RSpec::Rails::RailsExampleGroup
+      include ActionView::TestCase::Behavior
+      include RSpec::Rails::ViewAssigns
+      include RSpec::Rails::Matchers::RenderTemplate
+
+      # @private
+      module ClassMethods
+        def _default_helper
+          base = metadata[:description].split('/')[0..-2].join('/')
+          (base.camelize + 'Helper').constantize if base
+        rescue NameError
+          nil
+        end
 
-    # DSL exposed to view specs.
-    module ExampleMethods
-      # @overload render
-      # @overload render({:partial => path_to_file})
-      # @overload render({:partial => path_to_file}, {... locals ...})
-      # @overload render({:partial => path_to_file}, {... locals ...}) do ... end
-      #
-      # Delegates to ActionView::Base#render, so see documentation on that
-      # for more info.
-      #
-      # The only addition is that you can call render with no arguments, and RSpec
-      # will pass the top level description to render:
-      #
-      #     describe "widgets/new.html.erb" do
-      #       it "shows all the widgets" do
-      #         render # => view.render(:file => "widgets/new.html.erb")
-      #         # ...
-      #       end
-      #     end
-      def render(options={}, local_assigns={}, &block)
-        options = _default_render_options if Hash === options and options.empty?
-        super(options, local_assigns, &block)
+        def _default_helpers
+          helpers = [_default_helper].compact
+          helpers << ApplicationHelper if Object.const_defined?('ApplicationHelper')
+          helpers
+        end
       end
 
-      # The instance of `ActionView::Base` that is used to render the template.
-      # Use this to stub methods _before_ calling `render`.
-      #
-      #     describe "widgets/new.html.erb" do
-      #       it "shows all the widgets" do
-      #         view.stub(:foo) { "foo" }
-      #         render
-      #         # ...
-      #       end
-      #     end
-      def view
-        _view
-      end
+      # DSL exposed to view specs.
+      module ExampleMethods
+        # @overload render
+        # @overload render({:partial => path_to_file})
+        # @overload render({:partial => path_to_file}, {... locals ...})
+        # @overload render({:partial => path_to_file}, {... locals ...}) do ... end
+        #
+        # Delegates to ActionView::Base#render, so see documentation on that
+        # for more info.
+        #
+        # The only addition is that you can call render with no arguments, and
+        # RSpec will pass the top level description to render:
+        #
+        #     describe "widgets/new.html.erb" do
+        #       it "shows all the widgets" do
+        #         render # => view.render(:file => "widgets/new.html.erb")
+        #         # ...
+        #       end
+        #     end
+        def render(options = {}, local_assigns = {}, &block)
+          options = _default_render_options if Hash === options && options.empty?
+          super(options, local_assigns, &block)
+        end
 
-      # Simulates the presence of a template on the file system by adding a
-      # Rails' FixtureResolver to the front of the view_paths list. Designed to
-      # help isolate view examples from partials rendered by the view template
-      # that is the subject of the example.
-      #
-      #     stub_template("widgets/_widget.html.erb" => "This content.")
-      def stub_template(hash)
-        view.view_paths.unshift(ActionView::FixtureResolver.new(hash))
-      end
+        # The instance of `ActionView::Base` that is used to render the template.
+        # Use this to stub methods _before_ calling `render`.
+        #
+        #     describe "widgets/new.html.erb" do
+        #       it "shows all the widgets" do
+        #         view.stub(:foo) { "foo" }
+        #         render
+        #         # ...
+        #       end
+        #     end
+        def view
+          _view
+        end
 
-      # Provides access to the params hash that will be available within the
-      # view.
-      #
-      #     params[:foo] = 'bar'
-      def params
-        controller.params
-      end
+        # Simulates the presence of a template on the file system by adding a
+        # Rails' FixtureResolver to the front of the view_paths list. Designed to
+        # help isolate view examples from partials rendered by the view template
+        # that is the subject of the example.
+        #
+        #     stub_template("widgets/_widget.html.erb" => "This content.")
+        def stub_template(hash)
+          view.view_paths.unshift(ActionView::FixtureResolver.new(hash))
+        end
 
-      # @deprecated Use `view` instead.
-      def template
-        RSpec.deprecate("template", :replacement => "view")
-        view
-      end
+        # Provides access to the params hash that will be available within the
+        # view.
+        #
+        #     params[:foo] = 'bar'
+        def params
+          controller.params
+        end
 
-      # @deprecated Use `rendered` instead.
-      def response
-        # `assert_template` expects `response` to implement a #body method
-        # like an `ActionDispatch::Response` does to force the view to render.
-        # For backwards compatibility, we use #response as an alias for
-        # #rendered, but it needs to implement #body to avoid `assert_template`
-        # raising a `NoMethodError`.
-        unless rendered.respond_to?(:body)
-          def rendered.body; self; end;
+        # @deprecated Use `view` instead.
+        def template
+          RSpec.deprecate("template", :replacement => "view")
+          view
         end
 
-        rendered
-      end
+        # @deprecated Use `rendered` instead.
+        def response
+          # `assert_template` expects `response` to implement a #body method
+          # like an `ActionDispatch::Response` does to force the view to
+          # render. For backwards compatibility, we use #response as an alias
+          # for #rendered, but it needs to implement #body to avoid
+          # `assert_template` raising a `NoMethodError`.
+          unless rendered.respond_to?(:body)
+            def rendered.body
+              self
+            end
+          end
+
+          rendered
+        end
 
-    private
+      private
 
-      def _default_render_options
-        if ::Rails::VERSION::STRING >= '3.2'
-          # pluck the handler, format, and locale out of, eg, posts/index.de.html.haml
-          template, *components   = _default_file_to_render.split('.')
-          handler, format, locale = *components.reverse
+        def _default_render_options
+          if ::Rails::VERSION::STRING >= '3.2'
+            # pluck the handler, format, and locale out of, eg, posts/index.de.html.haml
+            template, *components   = _default_file_to_render.split('.')
+            handler, format, locale = *components.reverse
 
-          render_options = {:template => template}
-          render_options[:handlers] = [handler] if handler
-          render_options[:formats] = [format] if format
-          render_options[:locales] = [locale] if locale
+            render_options = { :template => template }
+            render_options[:handlers] = [handler] if handler
+            render_options[:formats] = [format] if format
+            render_options[:locales] = [locale] if locale
 
-          render_options
-        else
-          {:template => _default_file_to_render}
+            render_options
+          else
+            { :template => _default_file_to_render }
+          end
         end
-      end
 
-      def _path_parts
-        _default_file_to_render.split("/")
-      end
+        def _path_parts
+          _default_file_to_render.split("/")
+        end
 
-      def _controller_path
-        _path_parts[0..-2].join("/")
-      end
+        def _controller_path
+          _path_parts[0..-2].join("/")
+        end
 
-      def _inferred_action
-        _path_parts.last.split(".").first
-      end
+        def _inferred_action
+          _path_parts.last.split(".").first
+        end
 
-      def _include_controller_helpers
-        helpers = controller._helpers
-        view.singleton_class.class_exec do
-          include helpers unless included_modules.include?(helpers)
+        def _include_controller_helpers
+          helpers = controller._helpers
+          view.singleton_class.class_exec do
+            include helpers unless included_modules.include?(helpers)
+          end
         end
       end
-    end
 
-    included do
-      include ExampleMethods
+      included do
+        include ExampleMethods
 
-      helper(*_default_helpers)
+        helper(*_default_helpers)
 
-      before do
-        _include_controller_helpers
-        if view.lookup_context.respond_to?(:prefixes)
-          # rails 3.1
-          view.lookup_context.prefixes << _controller_path
-        end
+        before do
+          _include_controller_helpers
+          if view.lookup_context.respond_to?(:prefixes)
+            # rails 3.1
+            view.lookup_context.prefixes << _controller_path
+          end
 
-        # fixes bug with differing formats
-        view.lookup_context.view_paths.each(&:clear_cache)
+          # fixes bug with differing formats
+          view.lookup_context.view_paths.each(&:clear_cache)
 
-        controller.controller_path = _controller_path
-        controller.request.path_parameters[:controller] = _controller_path
-        controller.request.path_parameters[:action]     = _inferred_action unless _inferred_action =~ /^_/
-      end
+          controller.controller_path = _controller_path
+          controller.request.path_parameters[:controller] = _controller_path
+          controller.request.path_parameters[:action]     = _inferred_action unless _inferred_action =~ /^_/
+        end
 
-      let(:_default_file_to_render) do |example|
-        example.example_group.top_level_description
+        let(:_default_file_to_render) do |example|
+          example.example_group.top_level_description
+        end
       end
     end
   end
 end
-