rspec-rails 3.0.2 → 3.1.0

data/lib/rspec/rails/matchers/have_rendered.rb

@@ -1,41 +1,44 @@
-module RSpec::Rails::Matchers
-  # Matcher for template rendering.
-  module RenderTemplate
-    # @private
-    class RenderTemplateMatcher < RSpec::Matchers::BuiltIn::BaseMatcher
+module RSpec
+  module Rails
+    module Matchers
+      # Matcher for template rendering.
+      module RenderTemplate
+        # @private
+        class RenderTemplateMatcher < RSpec::Matchers::BuiltIn::BaseMatcher
+          def initialize(scope, expected, message = nil)
+            @expected = Symbol === expected ? expected.to_s : expected
+            @message = message
+            @scope = scope
+          end
 
-      def initialize(scope, expected, message=nil)
-        @expected = Symbol === expected ? expected.to_s : expected
-        @message = message
-        @scope = scope
-      end
+          # @api private
+          def matches?(*)
+            match_unless_raises ActiveSupport::TestCase::Assertion do
+              @scope.assert_template expected, @message
+            end
+          end
+
+          # @api private
+          def failure_message
+            rescued_exception.message
+          end
 
-      # @api private
-      def matches?(*)
-        match_unless_raises ActiveSupport::TestCase::Assertion do
-          @scope.assert_template expected, @message
+          # @api private
+          def failure_message_when_negated
+            "expected not to render #{expected.inspect}, but did"
+          end
         end
-      end
 
-      # @api private
-      def failure_message
-        rescued_exception.message
-      end
+        # Delegates to `assert_template`.
+        #
+        # @example
+        #     expect(response).to have_rendered("new")
+        def have_rendered(options, message = nil)
+          RenderTemplateMatcher.new(self, options, message)
+        end
 
-      # @api private
-      def failure_message_when_negated
-        "expected not to render #{expected.inspect}, but did"
+        alias_method :render_template, :have_rendered
       end
     end
-
-    # Delegates to `assert_template`.
-    #
-    # @example
-    #     expect(response).to have_rendered("new")
-    def have_rendered(options, message=nil)
-      RenderTemplateMatcher.new(self, options, message)
-    end
-
-    alias_method :render_template, :have_rendered
   end
 end

data/lib/rspec/rails/matchers/redirect_to.rb

@@ -1,35 +1,38 @@
-module RSpec::Rails::Matchers
-  # Matcher for redirects.
-  module RedirectTo
-    # @private
-    class RedirectTo < RSpec::Matchers::BuiltIn::BaseMatcher
+module RSpec
+  module Rails
+    module Matchers
+      # Matcher for redirects.
+      module RedirectTo
+        # @private
+        class RedirectTo < RSpec::Matchers::BuiltIn::BaseMatcher
+          def initialize(scope, expected)
+            @expected = expected
+            @scope = scope
+          end
 
-      def initialize(scope, expected)
-        @expected = expected
-        @scope = scope
-      end
+          def matches?(_)
+            match_unless_raises ActiveSupport::TestCase::Assertion do
+              @scope.assert_redirected_to(@expected)
+            end
+          end
 
-      def matches?(_)
-        match_unless_raises ActiveSupport::TestCase::Assertion do
-          @scope.assert_redirected_to(@expected)
-        end
-      end
+          def failure_message
+            rescued_exception.message
+          end
 
-      def failure_message
-        rescued_exception.message
-      end
+          def failure_message_when_negated
+            "expected not to redirect to #{@expected.inspect}, but did"
+          end
+        end
 
-      def failure_message_when_negated
-        "expected not to redirect to #{@expected.inspect}, but did"
+        # Delegates to `assert_redirected_to`.
+        #
+        # @example
+        #     expect(response).to redirect_to(:action => "new")
+        def redirect_to(target)
+          RedirectTo.new(self, target)
+        end
       end
     end
-
-    # Delegates to `assert_redirected_to`.
-    #
-    # @example
-    #     expect(response).to redirect_to(:action => "new")
-    def redirect_to(target)
-      RedirectTo.new(self, target)
-    end
   end
 end

data/lib/rspec/rails/matchers/routing_matchers.rb

@@ -1,117 +1,119 @@
-module RSpec::Rails::Matchers
-  # Matchers to help with specs for routing code.
-  module RoutingMatchers
-    extend RSpec::Matchers::DSL
+module RSpec
+  module Rails
+    module Matchers
+      # Matchers to help with specs for routing code.
+      module RoutingMatchers
+        extend RSpec::Matchers::DSL
 
-    # @private
-    class RouteToMatcher < RSpec::Matchers::BuiltIn::BaseMatcher
+        # @private
+        class RouteToMatcher < RSpec::Matchers::BuiltIn::BaseMatcher
+          def initialize(scope, *expected)
+            @scope = scope
+            @expected = expected[1] || {}
+            if Hash === expected[0]
+              @expected.merge!(expected[0])
+            else
+              controller, action = expected[0].split('#')
+              @expected.merge!(:controller => controller, :action => action)
+            end
+          end
 
-      def initialize(scope, *expected)
-        @scope = scope
-        @expected = expected[1] || {}
-        if Hash === expected[0]
-          @expected.merge!(expected[0])
-        else
-          controller, action = expected[0].split('#')
-          @expected.merge!(:controller => controller, :action => action)
-        end
-      end
+          def matches?(verb_to_path_map)
+            @actual = @verb_to_path_map = verb_to_path_map
+            # assert_recognizes does not consider ActionController::RoutingError an
+            # assertion failure, so we have to capture that and Assertion here.
+            match_unless_raises ActiveSupport::TestCase::Assertion, ActionController::RoutingError do
+              path, query = *verb_to_path_map.values.first.split('?')
+              @scope.assert_recognizes(
+                @expected,
+                { :method => verb_to_path_map.keys.first, :path => path },
+                Rack::Utils.parse_nested_query(query)
+              )
+            end
+          end
 
-      def matches?(verb_to_path_map)
-        @actual = @verb_to_path_map = verb_to_path_map
-        # assert_recognizes does not consider ActionController::RoutingError an
-        # assertion failure, so we have to capture that and Assertion here.
-        match_unless_raises ActiveSupport::TestCase::Assertion, ActionController::RoutingError do
-          path, query = *verb_to_path_map.values.first.split('?')
-          @scope.assert_recognizes(
-            @expected,
-            {:method => verb_to_path_map.keys.first, :path => path},
-            Rack::Utils::parse_nested_query(query)
-          )
-        end
-      end
+          def failure_message
+            rescued_exception.message
+          end
 
-      def failure_message
-        rescued_exception.message
-      end
+          def failure_message_when_negated
+            "expected #{@actual.inspect} not to route to #{@expected.inspect}"
+          end
 
-      def failure_message_when_negated
-        "expected #{@actual.inspect} not to route to #{@expected.inspect}"
-      end
+          def description
+            "route #{@actual.inspect} to #{@expected.inspect}"
+          end
+        end
 
-      def description
-        "route #{@actual.inspect} to #{@expected.inspect}"
-      end
-    end
+        # Delegates to `assert_recognizes`. Supports short-hand controller/action
+        # declarations (e.g. `"controller#action"`).
+        #
+        # @example
+        #
+        #     expect(:get => "/things/special").to route_to(
+        #       :controller => "things",
+        #       :action     => "special"
+        #     )
+        #
+        #     expect(:get => "/things/special").to route_to("things#special")
+        #
+        # @see http://api.rubyonrails.org/classes/ActionDispatch/Assertions/RoutingAssertions.html#method-i-assert_recognizes
+        def route_to(*expected)
+          RouteToMatcher.new(self, *expected)
+        end
 
-    # Delegates to `assert_recognizes`. Supports short-hand controller/action
-    # declarations (e.g. `"controller#action"`).
-    #
-    # @example
-    #
-    #     expect(:get => "/things/special").to route_to(
-    #       :controller => "things",
-    #       :action     => "special"
-    #     )
-    #
-    #     expect(:get => "/things/special").to route_to("things#special")
-    #
-    # @see http://api.rubyonrails.org/classes/ActionDispatch/Assertions/RoutingAssertions.html#method-i-assert_recognizes
-    def route_to(*expected)
-      RouteToMatcher.new(self, *expected)
-    end
+        # @private
+        class BeRoutableMatcher < RSpec::Matchers::BuiltIn::BaseMatcher
+          def initialize(scope)
+            @scope = scope
+          end
 
-    # @private
-    class BeRoutableMatcher < RSpec::Matchers::BuiltIn::BaseMatcher
+          def matches?(path)
+            @actual = path
+            match_unless_raises ActionController::RoutingError do
+              @routing_options = @scope.routes.recognize_path(
+                path.values.first, :method => path.keys.first
+              )
+            end
+          end
 
-      def initialize(scope)
-        @scope = scope
-      end
+          def failure_message
+            "expected #{@actual.inspect} to be routable"
+          end
 
-      def matches?(path)
-        @actual = path
-        match_unless_raises ActionController::RoutingError do
-          @routing_options = @scope.routes.recognize_path(
-            path.values.first, :method => path.keys.first
-          )
+          def failure_message_when_negated
+            "expected #{@actual.inspect} not to be routable, but it routes to #{@routing_options.inspect}"
+          end
         end
-      end
-
-      def failure_message
-        "expected #{@actual.inspect} to be routable"
-      end
 
-      def failure_message_when_negated
-        "expected #{@actual.inspect} not to be routable, but it routes to #{@routing_options.inspect}"
-      end
-    end
-
-    # Passes if the route expression is recognized by the Rails router based on
-    # the declarations in `config/routes.rb`. Delegates to
-    # `RouteSet#recognize_path`.
-    #
-    # @example You can use route helpers provided by rspec-rails.
-    #     expect(:get  => "/a/path").to be_routable
-    #     expect(:post => "/another/path").to be_routable
-    #     expect(:put  => "/yet/another/path").to be_routable
-    def be_routable
-      BeRoutableMatcher.new(self)
-    end
+        # Passes if the route expression is recognized by the Rails router based on
+        # the declarations in `config/routes.rb`. Delegates to
+        # `RouteSet#recognize_path`.
+        #
+        # @example You can use route helpers provided by rspec-rails.
+        #     expect(:get  => "/a/path").to be_routable
+        #     expect(:post => "/another/path").to be_routable
+        #     expect(:put  => "/yet/another/path").to be_routable
+        def be_routable
+          BeRoutableMatcher.new(self)
+        end
 
-    # Helpers for matching different route types.
-    module RouteHelpers
-      # @!method get
-      # @!method post
-      # @!method put
-      # @!method patch
-      # @!method delete
-      # @!method options
-      # @!method head
-      #
-      # Shorthand method for matching this type of route.
-      %w(get post put patch delete options head).each do |method|
-        define_method method do |path|
-          { method.to_sym => path }
+        # Helpers for matching different route types.
+        module RouteHelpers
+          # @!method get
+          # @!method post
+          # @!method put
+          # @!method patch
+          # @!method delete
+          # @!method options
+          # @!method head
+          #
+          # Shorthand method for matching this type of route.
+          %w[get post put patch delete options head].each do |method|
+            define_method method do |path|
+              { method.to_sym => path }
+            end
+          end
         end
       end
     end

data/lib/rspec/rails/version.rb

@@ -3,7 +3,7 @@ module RSpec
     # Version information for RSpec Rails.
     module Version
       # Current version of RSpec Rails, in semantic versioning format.
-      STRING = '3.0.2'
+      STRING = '3.1.0'
     end
   end
 end

data/lib/rspec/rails/view_assigns.rb

@@ -35,12 +35,11 @@ module RSpec
         super.merge(_encapsulated_assigns)
       end
 
-      private
+    private
 
       def _encapsulated_assigns
         @_encapsulated_assigns ||= {}
       end
-
     end
   end
 end

data/lib/rspec/rails/view_rendering.rb

@@ -11,7 +11,7 @@ module RSpec
       # DSL methods
       module ClassMethods
         # @see RSpec::Rails::ControllerExampleGroup
-        def render_views(true_or_false=true)
+        def render_views(true_or_false = true)
           @render_views = true_or_false
         end
 
@@ -44,15 +44,13 @@ module RSpec
         end
 
         def find_all(*args)
-          original_path_set.find_all(*args).collect do |template|
+          original_path_set.find_all(*args).map do |template|
             ::ActionView::Template.new(
               "",
               template.identifier,
               EmptyTemplateHandler,
-              {
-                :virtual_path => template.virtual_path,
-                :format => template.formats
-              }
+              :virtual_path => template.virtual_path,
+              :format => template.formats
             )
           end
         end
@@ -60,7 +58,7 @@ module RSpec
 
       # @private
       class EmptyTemplateHandler
-        def self.call(template)
+        def self.call(_template)
           %("")
         end
       end
@@ -77,7 +75,7 @@ module RSpec
           lookup_context.view_paths.push(*_path_decorator(new_path))
         end
 
-        private
+      private
 
         def _path_decorator(path)
           EmptyTemplatePathSetDecorator.new(ActionView::PathSet.new(Array.wrap(path)))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-rails
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.0
 platform: ruby
 authors:
 - David Chelimsky
@@ -32,7 +32,7 @@ cert_chain:
   1yHC1AcSYpvi2dAbOiHT5iQF+krm4wse8KctXgTNnjMsHEoGKulJS2/sZl90jcCz
   muA=
   -----END CERTIFICATE-----
-date: 2014-07-21 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -82,56 +82,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rspec-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -180,14 +180,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.2
 description: RSpec for Rails
 email: rspec@googlegroups.com
 executables: []
@@ -212,6 +212,8 @@ files:
 - lib/generators/rspec/install/templates/spec/rails_helper.rb
 - lib/generators/rspec/integration/integration_generator.rb
 - lib/generators/rspec/integration/templates/request_spec.rb
+- lib/generators/rspec/job/job_generator.rb
+- lib/generators/rspec/job/templates/job_spec.rb.erb
 - lib/generators/rspec/mailer/mailer_generator.rb
 - lib/generators/rspec/mailer/templates/fixture
 - lib/generators/rspec/mailer/templates/mailer_spec.rb
@@ -245,6 +247,7 @@ files:
 - lib/rspec/rails/example/view_example_group.rb
 - lib/rspec/rails/extensions.rb
 - lib/rspec/rails/extensions/active_record/proxy.rb
+- lib/rspec/rails/feature_check.rb
 - lib/rspec/rails/fixture_support.rb
 - lib/rspec/rails/matchers.rb
 - lib/rspec/rails/matchers/be_a_new.rb
@@ -284,6 +287,6 @@ rubyforge_project: rspec
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: rspec-rails-3.0.2
+summary: rspec-rails-3.1.0
 test_files: []
 has_rdoc: