rspec-rails 3.4.2 → 3.5.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3c2bf74d8e3c39d48f2b100bdf34fc7b7df0a8e
-  data.tar.gz: c761b4f171bc4f488710bf9a1a01c3fe08af3de4
+  metadata.gz: 08859ba10ff07a8c852ea2876b8a7ea64d67c2fb
+  data.tar.gz: f7bd3a8ca6a57eb36cf785899477b50bc9e037bd
 SHA512:
-  metadata.gz: 31d8d3df825e4dbcd68d346bb26f910cc3000b44431a6c6247171ad30883f9bfca5697d6823cb10e9f4bb18188e2a84fc7579dc791cb184ee0b073159461eaf4
-  data.tar.gz: e3470575de9a03243eec9ca305d299b19550668a22e5a52d9627b280d4497b963c736e4579a88b060eefd751f3802ad7caef7620a028fa8f43964d7e1e577e92
+  metadata.gz: 4efe07fbf434ab02bf07c7b24a454bc5d4740398d9ecdd71087046cdbc02b41e046b5bf926cead6cceed9fc415218a35a46677bb57702eead1f01ab8d5b41221
+  data.tar.gz: 0d3e500e662a15665e435e1b04df591ab87ce52877693d337cb2d9fd1591236154c509045758d530730d1180ed1e3b57d75f5126b948eb742ba97ced15b32eb9

data/Changelog.md

@@ -1,7 +1,29 @@
+### 3.5.0.development
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.4.2...v3.5.0.beta1)
+
+### 3.5.0.beta1 2016-02-06
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.4.2...v3.5.0.beta1)
+
+Enhancements:
+
+* Add a `---singularize` option for the feature spec generator (Felicity McCabe,
+  #1503)
+* Prevent leaking TestUnit methods in Rails 4+ (Fernando Seror Garcia, #1512)
+* Add support for Rails 5 (Sam Phippen, #1492)
+
+Bug fixes:
+
+* Make it possible to write nested specs within helper specs on classes that are
+  internal to helper classes. (Sam Phippen, Peter Swan, #1499).
+* Warn if a fixture method is called from a `before(:context)` block, instead of
+  crashing with a `undefined method for nil:NilClass`. (Sam Phippen, #1501)
+* Expose path to view specs (Ryan Clark, Sarah Mei, Sam Phippen, #1402)
+* Prevent installing Rails 3.2.22.1 on Ruby 1.8.7. (Jon Rowe, #1540)
+
 ### 3.4.2 / 2016-02-02
 [Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.4.1...v3.4.2)
 
-Bug fixes:
+Bug Fixes:
 
 * Cache template resolvers during path lookup to prevent performance
   regression from #1535. (Andrew White, #1544)
@@ -14,7 +36,6 @@ Bug Fixes:
 * Fix no method error when rendering templates with explicit `:file`
   parameters for Rails version `4.2.5.1`. (Andrew White, Sam Phippen, #1535)
 
-
 ### 3.4.0 / 2015-11-11
 [Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.3.3...v3.4.0)
 

data/README.md

@@ -20,7 +20,7 @@ RSpec repos as well. Add the following to your `Gemfile`:
 
 ```ruby
 %w[rspec-core rspec-expectations rspec-mocks rspec-rails rspec-support].each do |lib|
-  gem lib, :git => "git://github.com/rspec/#{lib}.git", :branch => 'master'
+  gem lib, :git => "https://github.com/rspec/#{lib}.git", :branch => 'master'
 end
 ```
 

data/lib/generators/rspec/feature/feature_generator.rb

@@ -4,12 +4,25 @@ module Rspec
   module Generators
     # @private
     class FeatureGenerator < Base
-      class_option :feature_specs, :type => :boolean, :default => true, :desc => "Generate feature specs"
+      class_option :feature_specs, :type => :boolean, :default => true,  :desc => "Generate feature specs"
+      class_option :singularize,   :type => :boolean, :default => false, :desc => "Singularize the generated feature"
 
       def generate_feature_spec
         return unless options[:feature_specs]
 
-        template 'feature_spec.rb', File.join('spec/features', class_path, "#{table_name}_spec.rb") # file_name?
+        template template_name, File.join('spec/features', class_path, filename)
+      end
+
+      def template_name
+        options[:singularize] ? 'feature_singular_spec.rb' : 'feature_spec.rb'
+      end
+
+      def filename
+        if options[:singularize]
+          "#{table_name.singularize}_spec.rb"
+        else
+          "#{table_name}_spec.rb"
+        end
       end
     end
   end

data/lib/generators/rspec/feature/templates/feature_singular_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.feature "<%= class_name.singularize %>", <%= type_metatag(:feature) %> do
+  pending "add some scenarios (or delete) #{__FILE__}"
+end

data/lib/generators/rspec/mailer/templates/mailer_spec.rb

@@ -1,10 +1,10 @@
 require "rails_helper"
 
 <% module_namespacing do -%>
-RSpec.describe <%= class_name %>, <%= type_metatag(:mailer) %> do
+RSpec.describe <%= class_name %><%= Rails.version.to_f >= 5.0 ? "Mailer" : "" %>, <%= type_metatag(:mailer) %> do
 <% for action in actions -%>
   describe "<%= action %>" do
-    let(:mail) { <%= class_name %>.<%= action %> }
+    let(:mail) { <%= class_name %><%= Rails.version.to_f >= 5.0 ? "Mailer" : "" %>.<%= action %> }
 
     it "renders the headers" do
       expect(mail.subject).to eq(<%= action.to_s.humanize.inspect %>)

data/lib/rspec/rails/adapters.rb

@@ -201,7 +201,7 @@ module RSpec
             select do |m|
               m.to_s =~ /^(assert|flunk|refute)/
             end
-          methods + [:build_message]
+          methods + test_unit_specific_methods
         end
 
         def define_assertion_delegators
@@ -211,6 +211,18 @@ module RSpec
             end
           end
         end
+
+        # Starting on Rails 4, Minitest is the default testing framework so no
+        # need to add TestUnit specific methods.
+        if ::Rails::VERSION::STRING >= '4.0.0'
+          def test_unit_specific_methods
+            []
+          end
+        else
+          def test_unit_specific_methods
+            [:build_message]
+          end
+        end
       end
 
       class AssertionDelegator

data/lib/rspec/rails/configuration.rb

@@ -36,6 +36,19 @@ module RSpec
       :feature    => %w[spec features]
     }
 
+    # Sets up the different example group modules for the different spec types
+    #
+    # @api private
+    def self.add_test_type_configurations(config)
+      config.include RSpec::Rails::ControllerExampleGroup, :type => :controller
+      config.include RSpec::Rails::HelperExampleGroup,     :type => :helper
+      config.include RSpec::Rails::ModelExampleGroup,      :type => :model
+      config.include RSpec::Rails::RequestExampleGroup,    :type => :request
+      config.include RSpec::Rails::RoutingExampleGroup,    :type => :routing
+      config.include RSpec::Rails::ViewExampleGroup,       :type => :view
+      config.include RSpec::Rails::FeatureExampleGroup,    :type => :feature
+    end
+
     # @private
     def self.initialize_configuration(config)
       config.backtrace_exclusion_patterns << /vendor\//
@@ -98,13 +111,15 @@ module RSpec
         end
       end
 
-      config.include RSpec::Rails::ControllerExampleGroup, :type => :controller
-      config.include RSpec::Rails::HelperExampleGroup,     :type => :helper
-      config.include RSpec::Rails::ModelExampleGroup,      :type => :model
-      config.include RSpec::Rails::RequestExampleGroup,    :type => :request
-      config.include RSpec::Rails::RoutingExampleGroup,    :type => :routing
-      config.include RSpec::Rails::ViewExampleGroup,       :type => :view
-      config.include RSpec::Rails::FeatureExampleGroup,    :type => :feature
+      add_test_type_configurations(config)
+
+      if defined?(::Rails::Controller::Testing)
+        [:controller, :view, :request].each do |type|
+          config.include ::Rails::Controller::Testing::TestProcess, :type => type
+          config.include ::Rails::Controller::Testing::TemplateAssertions, :type => type
+          config.include ::Rails::Controller::Testing::Integration, :type => type
+        end
+      end
 
       if defined?(ActionMailer)
         config.include RSpec::Rails::MailerExampleGroup, :type => :mailer

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

@@ -12,8 +12,15 @@ module RSpec
 
       # @private
       module ClassMethods
-        def determine_default_helper_class(_ignore)
-          described_class
+        if ::Rails::VERSION::MAJOR > 3
+          def determine_constant_from_test_name(_ignore)
+            described_class if yield(described_class)
+          end
+        else
+          def determine_default_helper_class(_ignore)
+            return unless Module === described_class && !(Class === described_class)
+            described_class
+          end
         end
       end
 

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

@@ -1,4 +1,6 @@
 require 'rspec/rails/view_assigns'
+require 'rspec/rails/view_spec_methods'
+require 'rspec/rails/view_path_builder'
 
 module RSpec
   module Rails
@@ -157,8 +159,20 @@ module RSpec
           end
 
           controller.controller_path = _controller_path
-          controller.request.path_parameters[:controller] = _controller_path
-          controller.request.path_parameters[:action]     = _inferred_action unless _inferred_action =~ /^_/
+
+          path_params_to_merge = {}
+          path_params_to_merge[:controller] = _controller_path
+          path_params_to_merge[:action] = _inferred_action unless _inferred_action =~ /^_/
+
+          path_params = controller.request.path_parameters
+
+          controller.request.path_parameters = path_params.reverse_merge(path_params_to_merge)
+          controller.request.path = ViewPathBuilder.new(::Rails.application.routes).path_for(controller.request.path_parameters)
+          ViewSpecMethods.add_to(::ActionView::TestCase::TestController)
+        end
+
+        after do
+          ViewSpecMethods.remove_from(::ActionView::TestCase::TestController)
         end
 
         let(:_default_file_to_render) do |example|

data/lib/rspec/rails/fixture_support.rb

@@ -22,8 +22,34 @@ module RSpec
           # /TODO
 
           self.fixture_path = RSpec.configuration.fixture_path
-          self.use_transactional_fixtures = RSpec.configuration.use_transactional_fixtures
+          if ::Rails::VERSION::STRING > '5'
+            self.use_transactional_tests = RSpec.configuration.use_transactional_fixtures
+          else
+            self.use_transactional_fixtures = RSpec.configuration.use_transactional_fixtures
+          end
           self.use_instantiated_fixtures  = RSpec.configuration.use_instantiated_fixtures
+
+          def self.fixtures(*args)
+            orig_methods = private_instance_methods
+            super.tap do
+              new_methods = private_instance_methods - orig_methods
+              new_methods.each do |method_name|
+                proxy_method_warning_if_called_in_before_context_scope(method_name)
+              end
+            end
+          end
+
+          def self.proxy_method_warning_if_called_in_before_context_scope(method_name)
+            orig_implementation = instance_method(method_name)
+            define_method(method_name) do |*args, &blk|
+              if inspect.include?("before(:context)")
+                RSpec.warn_with("Calling fixture method in before :context ")
+              else
+                orig_implementation.bind(self).call(*args, &blk)
+              end
+            end
+          end
+
           fixtures RSpec.configuration.global_fixtures if RSpec.configuration.global_fixtures
         end
       end

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

@@ -158,6 +158,9 @@ module RSpec
       #       HelloJob.set(wait_until: Date.tomorrow.noon, queue: "low").perform_later(42)
       #     }.to have_enqueued_job.with(42).on_queue("low").at(Date.tomorrow.noon)
       def have_enqueued_job(job = nil)
+        unless ::ActiveJob::QueueAdapters::TestAdapter === ::ActiveJob::Base.queue_adapter
+          raise StandardError, "To use have_enqueued_job matcher set `ActiveJob::Base.queue_adapter = :test`"
+        end
         ActiveJob::HaveEnqueuedJob.new(job)
       end
     end

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

@@ -41,11 +41,14 @@ module RSpec
             # Acts As Capybara Session
             # Hack to support `Capybara::Session` without having to load
             # Capybara or catch `NameError`s for the undefined constants
-            ::ActionDispatch::TestResponse.new.tap do |resp|
+            obj = ActionDispatch::Response.new.tap do |resp|
               resp.status  = obj.status_code
-              resp.headers = obj.response_headers
+              resp.headers.clear
+              resp.headers.merge!(obj.response_headers)
               resp.body    = obj.body
+              resp.request = ActionDispatch::Request.new({})
             end
+            ::ActionDispatch::TestResponse.from_response(obj)
           else
             raise TypeError, "Invalid response type: #{obj}"
           end
@@ -83,7 +86,7 @@ module RSpec
           # @return [Boolean] `true` if the numeric code matched the `response` code
           def matches?(response)
             test_response = as_test_response(response)
-            @actual = test_response.response_code
+            @actual = test_response.response_code.to_i
             expected == @actual
           rescue TypeError => _ignored
             @invalid_response = response

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

@@ -19,7 +19,7 @@ module RSpec
           end
 
           def matches?(verb_to_path_map)
-            @actual = @verb_to_path_map = verb_to_path_map
+            @actual = 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

data/lib/rspec/rails/vendor/capybara.rb

@@ -9,8 +9,10 @@ rescue LoadError
 end
 
 if defined?(Capybara)
-  require 'rspec/support/version_checker'
-  RSpec::Support::VersionChecker.new('capybara', Capybara::VERSION, '2.2.0').check_version!
+  require 'rspec/support/comparable_version'
+  unless RSpec::Support::ComparableVersion.new(Capybara::VERSION) >= '2.2.0'
+    raise "You are using capybara #{Capybara::VERSION}. RSpec requires >= 2.2.0."
+  end
 
   RSpec.configure do |c|
     if defined?(Capybara::DSL)

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.4.2'
+      STRING = '3.5.0.beta1'
     end
   end
 end

data/lib/rspec/rails/view_path_builder.rb

@@ -0,0 +1,29 @@
+module RSpec
+  module Rails
+    # Builds paths for view specs using a particular route set.
+    class ViewPathBuilder
+      def initialize(route_set)
+        self.class.send(:include, route_set.url_helpers)
+      end
+
+      # Given a hash of parameters, build a view path, if possible.
+      # Returns nil if no path can be built from the given params.
+      #
+      # @example
+      #     # path can be built because all required params are present in the hash
+      #     view_path_builder = ViewPathBuilder.new(::Rails.application.routes)
+      #     view_path_builder.path_for({ :controller => 'posts', :action => 'show', :id => '54' })
+      #     # => "/post/54"
+      #
+      # @example
+      #     # path cannot be built because the params are missing a required element (:id)
+      #     view_path_builder.path_for({ :controller => 'posts', :action => 'delete' })
+      #     # => nil
+      def path_for(path_params)
+        url_for(path_params.merge(:only_path => true))
+      rescue => e
+        e.message
+      end
+    end
+  end
+end

data/lib/rspec/rails/view_spec_methods.rb

@@ -0,0 +1,56 @@
+module RSpec
+  module Rails
+    # Adds methods (generally to ActionView::TestCase::TestController).
+    # Intended for use in view specs.
+    module ViewSpecMethods
+      module_function
+
+      # Adds methods `extra_params=` and `extra_params` to the indicated class.
+      # When class is `::ActionView::TestCase::TestController`, these methods
+      # are exposed in view specs on the `controller` object.
+      def add_to(klass)
+        return if klass.method_defined?(:extra_params) && klass.method_defined?(:extra_params=)
+
+        klass.module_exec do
+          # Set any extra parameters that rendering a URL for this view
+          # would require.
+          #
+          # @example
+          #
+          #     # In "spec/views/widgets/show.html.erb_spec.rb":
+          #     before do
+          #       widget = Widget.create!(:name => "slicer")
+          #       controller.extra_params = { :id => widget.id }
+          #     end
+          def extra_params=(hash)
+            @extra_params = hash
+            request.path =
+              ViewPathBuilder.new(::Rails.application.routes).path_for(
+                extra_params.merge(request.path_parameters)
+              )
+          end
+
+          # Use to read extra parameters that are set in the view spec.
+          #
+          # @example
+          #
+          #     # After the before in the above example:
+          #     controller.extra_params
+          #     # => { :id => 4 }
+          def extra_params
+            @extra_params ||= {}
+            @extra_params.dup.freeze
+          end
+        end
+      end
+
+      # Removes methods `extra_params=` and `extra_params` from the indicated class.
+      def remove_from(klass)
+        klass.module_exec do
+          undef extra_params= if klass.method_defined?(:extra_params=)
+          undef extra_params  if klass.method_defined?(:extra_params)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-rails
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.5.0.beta1
 platform: ruby
 authors:
 - David Chelimsky
@@ -44,7 +44,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2016-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -53,9 +53,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -63,9 +60,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -73,9 +67,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -83,9 +74,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -93,9 +81,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -103,79 +88,76 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0.beta1
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0.beta1
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0.beta1
 - !ruby/object:Gem::Dependency
   name: rspec-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0.beta1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.0
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -228,13 +210,14 @@ files:
 - ".yardopts"
 - Capybara.md
 - Changelog.md
-- License.md
+- LICENSE.md
 - README.md
 - lib/generators/rspec.rb
 - lib/generators/rspec/controller/controller_generator.rb
 - lib/generators/rspec/controller/templates/controller_spec.rb
 - lib/generators/rspec/controller/templates/view_spec.rb
 - lib/generators/rspec/feature/feature_generator.rb
+- lib/generators/rspec/feature/templates/feature_singular_spec.rb
 - lib/generators/rspec/feature/templates/feature_spec.rb
 - lib/generators/rspec/helper/helper_generator.rb
 - lib/generators/rspec/helper/templates/helper_spec.rb
@@ -297,7 +280,9 @@ files:
 - lib/rspec/rails/vendor/capybara.rb
 - lib/rspec/rails/version.rb
 - lib/rspec/rails/view_assigns.rb
+- lib/rspec/rails/view_path_builder.rb
 - lib/rspec/rails/view_rendering.rb
+- lib/rspec/rails/view_spec_methods.rb
 homepage: http://github.com/rspec/rspec-rails
 licenses:
 - MIT
@@ -314,12 +299,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: RSpec for Rails