rspec-rails 4.0.0.beta3 → 4.0.0.beta4

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

@@ -1,7 +1,9 @@
 module RSpec
   module Rails
     module Matchers
-      # @ api private
+      # @api private
+      #
+      # Base class to build matchers. Should not be instantiated directly.
       class BaseMatcher
         include RSpec::Matchers::Composable
 
@@ -119,15 +121,7 @@ module RSpec
           raise "#{self.class.name} needs to supply#{ivar_list}"
         end
 
-        if RUBY_VERSION.to_f < 1.9
-          # :nocov:
-          def present_ivars
-            instance_variables.map(&:to_sym)
-          end
-          # :nocov:
-        else
-          alias present_ivars instance_variables
-        end
+        alias present_ivars instance_variables
 
         # @private
         module HashFormatting

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

@@ -1,4 +1,7 @@
-require "rspec/mocks"
+# We require the minimum amount of rspec-mocks possible to avoid
+# conflicts with other mocking frameworks.
+# See: https://github.com/rspec/rspec-rails/issues/2252
+require "rspec/mocks/argument_matchers"
 require "rspec/rails/matchers/active_job"
 
 module RSpec
@@ -11,7 +14,7 @@ module RSpec
       class HaveEnqueuedMail < ActiveJob::HaveEnqueuedJob
         MAILER_JOB_METHOD = 'deliver_now'.freeze
 
-        include RSpec::Mocks::ExampleMethods
+        include RSpec::Mocks::ArgumentMatchers
 
         def initialize(mailer_class, method_name)
           super(nil)

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

@@ -73,7 +73,7 @@ module RSpec
         # @example
         #   expect(response).to have_http_status(404)
         #
-        # @see RSpec::Rails::Matchers.have_http_status
+        # @see RSpec::Rails::Matchers#have_http_status
         class NumericCode < RSpec::Rails::Matchers::BaseMatcher
           include HaveHttpStatus
 
@@ -123,7 +123,7 @@ module RSpec
         # @example
         #   expect(response).to have_http_status(:created)
         #
-        # @see RSpec::Rails::Matchers.have_http_status
+        # @see RSpec::Rails::Matchers#have_http_status
         # @see https://github.com/rack/rack/blob/master/lib/rack/utils.rb `Rack::Utils::SYMBOL_TO_STATUS_CODE`
         class SymbolicStatus < RSpec::Rails::Matchers::BaseMatcher
           include HaveHttpStatus
@@ -236,8 +236,8 @@ module RSpec
         #   expect(response).to have_http_status(:missing)
         #   expect(response).to have_http_status(:redirect)
         #
-        # @see RSpec::Rails::Matchers.have_http_status
-        # @see ActionDispatch::TestResponse
+        # @see RSpec::Rails::Matchers#have_http_status
+        # @see https://github.com/rails/rails/blob/6-0-stable/actionpack/lib/action_dispatch/testing/test_response.rb `ActionDispatch::TestResponse`
         class GenericStatus < RSpec::Rails::Matchers::BaseMatcher
           include HaveHttpStatus
 
@@ -293,9 +293,9 @@ module RSpec
         protected
 
           RESPONSE_METHODS = {
-            :success => 'successful',
-            :error => 'server_error',
-            :missing => 'not_found'
+            success: 'successful',
+            error: 'server_error',
+            missing: 'not_found'
           }.freeze
 
           def check_expected_status(test_response, expected)

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

@@ -14,7 +14,7 @@ module RSpec
               @expected.merge!(expected[0])
             else
               controller, action = expected[0].split('#')
-              @expected.merge!(:controller => controller, :action => action)
+              @expected.merge!(controller: controller, action: action)
             end
           end
 
@@ -26,7 +26,7 @@ module RSpec
               path, query = *verb_to_path_map.values.first.split('?')
               @scope.assert_recognizes(
                 @expected,
-                { :method => verb_to_path_map.keys.first, :path => path },
+                { method: verb_to_path_map.keys.first, path: path },
                 Rack::Utils.parse_nested_query(query)
               )
             end
@@ -50,12 +50,12 @@ module RSpec
         #
         # @example
         #
-        #     expect(:get => "/things/special").to route_to(
-        #       :controller => "things",
-        #       :action     => "special"
+        #     expect(get: "/things/special").to route_to(
+        #       controller: "things",
+        #       action:     "special"
         #     )
         #
-        #     expect(:get => "/things/special").to route_to("things#special")
+        #     expect(get: "/things/special").to route_to("things#special")
         #
         # @see https://api.rubyonrails.org/classes/ActionDispatch/Assertions/RoutingAssertions.html#method-i-assert_recognizes
         def route_to(*expected)
@@ -72,7 +72,7 @@ module RSpec
             @actual = path
             match_unless_raises ActionController::RoutingError do
               @routing_options = @scope.routes.recognize_path(
-                path.values.first, :method => path.keys.first
+                path.values.first, method: path.keys.first
               )
             end
           end
@@ -95,9 +95,9 @@ module RSpec
         # `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
+        #     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

data/lib/rspec/rails/tasks/rspec.rake

@@ -3,12 +3,12 @@ if default = Rake.application.instance_variable_get('@tasks')['default']
   default.prerequisites.delete('test')
 end
 
-task :default => :spec
+task default: :spec
 
-task :stats => "spec:statsetup"
+task stats: "spec:statsetup"
 
 desc "Run all specs in spec directory (excluding plugin specs)"
-RSpec::Core::RakeTask.new(:spec => "spec:prepare")
+RSpec::Core::RakeTask.new(spec: "spec:prepare")
 
 namespace :spec do
   types = begin
@@ -35,16 +35,6 @@ namespace :spec do
     end
   end
 
-  # RCov task only enabled for Ruby 1.8
-  if RUBY_VERSION < '1.9'
-    desc "Run all specs with rcov"
-    RSpec::Core::RakeTask.new(:rcov => "spec:prepare") do |t|
-      t.rcov = true
-      t.pattern = "./spec/**/*_spec.rb"
-      t.rcov_opts = '--exclude /gems/,/Library/,/usr/,lib/tasks,.bundle,config,/lib/rspec/,/lib/rspec-,spec'
-    end
-  end
-
   task :statsetup do
     require 'rails/code_statistics'
     types.each do |type, dir|

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

@@ -16,24 +16,24 @@ if defined?(Capybara)
 
   RSpec.configure do |c|
     if defined?(Capybara::DSL)
-      c.include Capybara::DSL, :type => :feature
+      c.include Capybara::DSL, type: :feature
       if defined?(ActionPack) && ActionPack::VERSION::STRING >= "5.1"
-        c.include Capybara::DSL, :type => :system
+        c.include Capybara::DSL, type: :system
       end
     end
 
     if defined?(Capybara::RSpecMatchers)
-      c.include Capybara::RSpecMatchers, :type => :view
-      c.include Capybara::RSpecMatchers, :type => :helper
-      c.include Capybara::RSpecMatchers, :type => :mailer
-      c.include Capybara::RSpecMatchers, :type => :controller
-      c.include Capybara::RSpecMatchers, :type => :feature
-      c.include Capybara::RSpecMatchers, :type => :system
+      c.include Capybara::RSpecMatchers, type: :view
+      c.include Capybara::RSpecMatchers, type: :helper
+      c.include Capybara::RSpecMatchers, type: :mailer
+      c.include Capybara::RSpecMatchers, type: :controller
+      c.include Capybara::RSpecMatchers, type: :feature
+      c.include Capybara::RSpecMatchers, type: :system
     end
 
     unless defined?(Capybara::RSpecMatchers) || defined?(Capybara::DSL)
-      c.include Capybara, :type => :request
-      c.include Capybara, :type => :controller
+      c.include Capybara, type: :request
+      c.include Capybara, type: :controller
     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 = '4.0.0.beta3'
+      STRING = '4.0.0.beta4'
     end
   end
 end

data/lib/rspec/rails/view_path_builder.rb

@@ -20,7 +20,7 @@ module RSpec
       #     view_path_builder.path_for({ :controller => 'posts', :action => 'delete' })
       #     # => ActionController::UrlGenerationError: No route matches {:action=>"delete", :controller=>"posts"}
       def path_for(path_params)
-        url_for(path_params.merge(:only_path => true))
+        url_for(path_params.merge(only_path: true))
       rescue => e
         e.message
       end

data/lib/rspec/rails/view_rendering.rb

@@ -55,9 +55,9 @@ module RSpec
               "",
               template.identifier,
               EmptyTemplateHandler,
-              :virtual_path => template.virtual_path,
-              :format => template_format(template),
-              :locals => []
+              virtual_path: template.virtual_path,
+              format: template_format(template),
+              locals: []
             )
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-rails
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta3
+  version: 4.0.0.beta4
 platform: ruby
 authors:
 - David Chelimsky
@@ -44,7 +44,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2019-10-18 00:00:00.000000000 Z
+date: 2020-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -94,56 +94,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rspec-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -164,14 +164,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.14.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.14.12
 - !ruby/object:Gem::Dependency
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
@@ -186,7 +186,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.2
-description: rspec-rails is a testing framework for Rails 4+.
+description: rspec-rails is a testing framework for Rails 5+.
 email: rspec@googlegroups.com
 executables: []
 extensions: []
@@ -203,6 +203,7 @@ files:
 - lib/generators/rspec/channel/templates/channel_spec.rb.erb
 - lib/generators/rspec/controller/controller_generator.rb
 - lib/generators/rspec/controller/templates/controller_spec.rb
+- lib/generators/rspec/controller/templates/request_spec.rb
 - lib/generators/rspec/controller/templates/routing_spec.rb
 - lib/generators/rspec/controller/templates/view_spec.rb
 - lib/generators/rspec/feature/feature_generator.rb
@@ -227,8 +228,6 @@ files:
 - lib/generators/rspec/model/model_generator.rb
 - lib/generators/rspec/model/templates/fixtures.yml
 - lib/generators/rspec/model/templates/model_spec.rb
-- lib/generators/rspec/observer/observer_generator.rb
-- lib/generators/rspec/observer/templates/observer_spec.rb
 - lib/generators/rspec/request/request_generator.rb
 - lib/generators/rspec/scaffold/scaffold_generator.rb
 - lib/generators/rspec/scaffold/templates/api_controller_spec.rb
@@ -295,7 +294,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rspec/rspec-rails/issues
-  changelog_uri: https://github.com/rspec/rspec-rails/blob/v4.0.0.beta3/Changelog.md
+  changelog_uri: https://github.com/rspec/rspec-rails/blob/v4.0.0.beta4/Changelog.md
   documentation_uri: https://rspec.info/documentation/
   mailing_list_uri: https://groups.google.com/forum/#!forum/rspec
   source_code_uri: https://github.com/rspec/rspec-rails
@@ -315,7 +314,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: RSpec for Rails

data/lib/generators/rspec/observer/observer_generator.rb

@@ -1,13 +0,0 @@
-require 'generators/rspec'
-
-module Rspec
-  module Generators
-    # @private
-    class ObserverGenerator < Base
-      def generate_observer_spec
-        template 'observer_spec.rb',
-                 File.join('spec', 'models', class_path, "#{file_name}_observer_spec.rb")
-      end
-    end
-  end
-end

data/lib/generators/rspec/observer/templates/observer_spec.rb

@@ -1,7 +0,0 @@
-require 'rails_helper'
-
-<% module_namespacing do -%>
-RSpec.describe <%= class_name %>Observer, <%= type_metatag(:observer) %> do
-  pending "add some examples to (or delete) #{__FILE__}"
-end
-<% end -%>