rspec-rails 3.9.1 → 4.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e9f2c32e485cc9a8f4a31f258f14873973ed1319ecb7061f35d3f6715c7df95
-  data.tar.gz: a8ff832abfde3703a2925a27e4918ff38b1a736dffb973e621ce2b4089fc1cab
+  metadata.gz: b1f9c4fb5342bf765774bbd2bed6d51eede79c802c1ee044a1ba1f55b4bfcfd4
+  data.tar.gz: 86ac262e680b17cdc29f2735ad5667655c83a8aa0a9fe680a7a39bc158f5d09f
 SHA512:
-  metadata.gz: cc09740e2221463f43d22b46a02623ed7ddab24f6069e9e2d844ee87e0eec53221bdbdac1754b3e220ea6b010a6c664f07a28eb935b0bf6909d8b0c2e19b0acc
-  data.tar.gz: 7721bf098cc90a53aa3c070231e225bd1d2b45f4eef9f11e520a249bc16b98e99e3eb040f7e6ccdaeeb4ea8423abeae8dc8de3953dd68c12cb901c85573fc7e6
+  metadata.gz: 1de2f6233f642593ae5be6705a31272ebc75de0a020cb11629ff7797e377d12fc79c3a879fe324686ee9e7dbc1894deb8fa6566a52ed6d95f8f93d1d2e1d50bd
+  data.tar.gz: dd509156b5951df986c555d4ada95d303631a6099f477c82973c0ae0adf0587e82e5ed6f79f672bacb6584f42cc1f783fe3af10c67bcc39cf3b97e6155a4cf94

data/Changelog.md

@@ -1,39 +1,46 @@
-### 3.9.1 / 2020-03-10
-[Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.9.0...v3.9.1)
+### 4.0 Development
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/master...4-0-dev)
+
+Enhancements:
+
+* Adds support for JRuby on Rails 5.2 and 6
 
 Bug Fixes:
 
-* Add missing require for have_enqueued_mail matcher. (Ignatius Reza, #2117)
+* `EmptyTemplateHandler.call` now needs to support an additional argument in
+  Rails 6. (Pavel Rosický, #2089)
+* Suppress warning from `SQLite3Adapter.represent_boolean_as_integer` which is
+  deprecated. (Pavel Rosický, #2092)
+* `ActionView::Template#formats` has been deprecated and replaced by
+  `ActionView::Template#format`(Seb Jacobs, #2100)
 
-### 3.9.0 / 2019-10-08
-[Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.8.2...v3.9.0)
+Breaking Changes:
 
-Enhancements
+* Drops support for Rails below 5.0
+* Drops support for Ruby below 2.3
 
-* Use `__dir__` instead of `__FILE__` in generated `rails_helper.rb` where
-  supported. (OKURA Masafumi, #2048)
-* Add `have_enqueued` matcher as a "super" matcher to the `ActiveJob` matchers
-  making it easier to match on `ActiveJob` delivered emails. (Joel Lubrano, #2047)
-* Add generator for system specs on Rails 5.1 and above. (Andrzej Sliwa, #1933)
-* Add generator for generator specs. (@ConSou, #2085)
-* Add option to generate routes when generating controller specs. (David Revelo, #2134)
+### Development
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.8.2...master)
 
 Bug Fixes:
 
 * Make the `ActiveJob` matchers fail when multiple jobs are queued for negated
   matches. e.g. `expect { job; job; }.to_not have_enqueued_job.
   (Emric Istanful, #2069)
-
-### 3.8.3 / 2019-10-03
-[Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.8.2...master)
-
-Bug Fixes:
-
 * Namespaced fixtures now generate a `/` seperated path rather than an `_`.
   (@nxlith, #2077)
 * Check the arity of `errors` before attempting to use it to generate the `be_valid`
   error message. (Kevin Kuchta, #2096)
 
+Enhancements
+
+* Use `__dir__` instead of `__FILE__` in generated `rails_helper.rb` where
+  supported. (OKURA Masafumi, #2048)
+* Add `have_enqueued` matcher as a "super" matcher to the `ActiveJob` matchers
+  making it easier to match on `ActiveJob` delivered emails. (Joel Lubrano, #2047)
+* Add generator for system specs on Rails 5.1 and above. (Andrzej Sliwa, #1933)
+* Add generator for generator specs. (@ConSou, #2085)
+
 ### 3.8.2 / 2019-01-13
 [Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.8.1...v3.8.2)
 

data/README.md

@@ -12,7 +12,7 @@ Use **[`rspec-rails` 1.x][]** for Rails 2.x.
 
 [Build Status]: https://secure.travis-ci.org/rspec/rspec-rails.svg?branch=master
 [travis-ci]: https://travis-ci.org/rspec/rspec-rails
-[Code Climate]: https://codeclimate.com/github/rspec/rspec-rails.svg
+[Code Climate]: https://img.shields.io/codeclimate/github/rspec/rspec-rails.svg
 [code-climate]: https://codeclimate.com/github/rspec/rspec-rails
 [Gem Version]: https://badge.fury.io/rb/rspec-rails.svg
 [gem-version]: https://badge.fury.io/rb/rspec-rails
@@ -28,7 +28,7 @@ Use **[`rspec-rails` 1.x][]** for Rails 2.x.
    ```ruby
    # Run against the latest stable release
    group :development, :test do
-     gem 'rspec-rails', '~> 3.9'
+     gem 'rspec-rails', '~> 3.8'
    end
 
    # Or, run against the master branch

data/lib/generators/rspec/mailer/mailer_generator.rb

@@ -20,6 +20,7 @@ module Rspec
 
       def generate_preview_files
         return unless RSpec::Rails::FeatureCheck.has_action_mailer_preview?
+
         template "preview.rb", File.join("spec/mailers/previews", class_path, "#{file_name}_preview.rb")
       end
     end

data/lib/generators/rspec/model/model_generator.rb

@@ -23,6 +23,7 @@ module Rspec
 
       def create_fixture_file
         return unless missing_fixture_replacement?
+
         template 'fixtures.yml', File.join('spec/fixtures', class_path, "#{(pluralize_table_names? ? plural_file_name : file_name)}.yml")
       end
 

data/lib/generators/rspec/request/request_generator.rb

@@ -4,7 +4,7 @@ module Rspec
   module Generators
     # @private
     class RequestGenerator < IntegrationGenerator
-      source_paths << File.expand_path("../../integration/templates", __FILE__)
+      source_paths << File.expand_path('../integration/templates', __dir__)
     end
   end
 end

data/lib/generators/rspec/scaffold/scaffold_generator.rb

@@ -6,7 +6,7 @@ module Rspec
     # @private
     class ScaffoldGenerator < Base
       include ::Rails::Generators::ResourceHelpers
-      source_paths << File.expand_path("../../helper/templates", __FILE__)
+      source_paths << File.expand_path('../helper/templates', __dir__)
       argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
 
       class_option :orm, :desc => "ORM used to generate the controller"
@@ -74,12 +74,14 @@ module Rspec
       # support for namespaced-resources
       def ns_file_name
         return file_name if ns_parts.empty?
+
         "#{ns_prefix.map(&:underscore).join('/')}_#{ns_suffix.singularize.underscore}"
       end
 
       # support for namespaced-resources
       def ns_table_name
         return table_name if ns_parts.empty?
+
         "#{ns_prefix.map(&:underscore).join('/')}/#{ns_suffix.tableize}"
       end
 

data/lib/rspec-rails.rb

@@ -39,6 +39,7 @@ module RSpec
 
       def setup_preview_path(app)
         return unless supports_action_mailer_previews?(app.config)
+
         options = app.config.action_mailer
         config_default_preview_path(options) if config_preview_path?(options)
       end
@@ -57,6 +58,7 @@ module RSpec
 
       def config_default_preview_path(options)
         return unless options.preview_path.blank?
+
         options.preview_path = "#{::Rails.root}/spec/mailers/previews"
       end
 

data/lib/rspec/rails/adapters.rb

@@ -103,6 +103,7 @@ module RSpec
           assertion_modules.each do |mod|
             mod.public_instance_methods.each do |method|
               next if method == :method_missing || method == "method_missing"
+
               define_method(method.to_sym) do |*args, &block|
                 assertion_instance.send(method.to_sym, *args, &block)
               end

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

@@ -19,6 +19,7 @@ module RSpec
         else
           def determine_default_helper_class(_ignore)
             return unless Module === described_class && !(Class === described_class)
+
             described_class
           end
         end

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

@@ -49,9 +49,7 @@ module RSpec
         begin
           require 'capybara'
           require 'action_dispatch/system_test_case'
-        # rubocop:disable Lint/HandleExceptions
         rescue LoadError => e
-          # rubocop:enable Lint/HandleExceptions
           abort """
             LoadError: #{e.message}
             System test integration requires Rails >= 5.1 and has a hard

data/lib/rspec/rails/feature_check.rb

@@ -1,13 +1,8 @@
 module RSpec
   module Rails
     # @private
-    # Disable some cops until https://github.com/bbatsov/rubocop/issues/1310
-    # rubocop:disable Style/IndentationConsistency
     module FeatureCheck
-    # rubocop:disable Style/IndentationWidth
-    module_function
-      # rubocop:enable Style/IndentationWidth
-
+      module_function
       def can_check_pending_migrations?
         has_active_record_migration? &&
           ::ActiveRecord::Migration.respond_to?(:check_pending!)
@@ -59,6 +54,5 @@ module RSpec
         end
       end
     end
-    # rubocop:enable Style/IndentationConsistency
   end
 end

data/lib/rspec/rails/matchers.rb

@@ -22,5 +22,4 @@ require 'rspec/rails/matchers/be_valid'
 require 'rspec/rails/matchers/have_http_status'
 if RSpec::Rails::FeatureCheck.has_active_job?
   require 'rspec/rails/matchers/active_job'
-  require 'rspec/rails/matchers/have_enqueued_mail'
 end

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

@@ -310,6 +310,7 @@ module RSpec
       # @private
       def check_active_job_adapter
         return if ::ActiveJob::QueueAdapters::TestAdapter === ::ActiveJob::Base.queue_adapter
+
         raise StandardError, "To use ActiveJob matchers set `ActiveJob::Base.queue_adapter = :test`"
       end
     end

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

@@ -114,6 +114,7 @@ module RSpec
 
         def assert_ivars(*expected_ivars)
           return unless (expected_ivars - present_ivars).any?
+
           ivar_list = RSpec::Matchers::EnglishPhrasing.list(expected_ivars)
           raise "#{self.class.name} needs to supply#{ivar_list}"
         end

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

@@ -6,7 +6,6 @@ module RSpec
     module Matchers
       # Matcher class for `have_enqueued_mail`. Should not be instantiated directly.
       #
-      # rubocop: disable Style/ClassLength
       # @private
       # @see RSpec::Rails::Matchers#have_enqueued_mail
       class HaveEnqueuedMail < ActiveJob::HaveEnqueuedJob
@@ -33,6 +32,7 @@ module RSpec
 
         def matches?(block)
           raise ArgumentError, 'have_enqueued_mail and enqueue_mail only work with block arguments' unless block.respond_to?(:call)
+
           check_active_job_adapter
           super
         end
@@ -89,6 +89,7 @@ module RSpec
 
         def check_active_job_adapter
           return if ::ActiveJob::QueueAdapters::TestAdapter === ::ActiveJob::Base.queue_adapter
+
           raise StandardError, "To use HaveEnqueuedMail matcher set `ActiveJob::Base.queue_adapter = :test`"
         end
 
@@ -124,8 +125,6 @@ module RSpec
           ActionMailer::DeliveryJob
         end
       end
-      # rubocop: enable Style/ClassLength
-
       # @api public
       # Passes if an email has been enqueued inside block.
       # May chain with to specify expected arguments.

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

@@ -59,6 +59,7 @@ module RSpec
         #   `@invalid_response` is present, `nil` otherwise
         def invalid_response_type_message
           return unless @invalid_response
+
           "expected a response object, but an instance of " \
           "#{@invalid_response.class} was received"
         end
@@ -174,6 +175,7 @@ module RSpec
           # @return [Symbol] representing the actual http numeric code
           def actual_status
             return unless actual
+
             @actual_status ||= compute_status_from(actual)
           end
 
@@ -254,6 +256,7 @@ module RSpec
             unless self.class.valid_statuses.include?(type)
               raise ArgumentError, "Invalid generic HTTP status: #{type.inspect}"
             end
+
             @expected = type
             @actual = nil
             @invalid_response = nil
@@ -374,6 +377,7 @@ module RSpec
       # @see https://github.com/rack/rack/blob/master/lib/rack/utils.rb `Rack::Utils::SYMBOL_TO_STATUS_CODE`
       def have_http_status(target)
         raise ArgumentError, "Invalid HTTP status: nil" unless target
+
         HaveHttpStatus.matcher_for_status(target)
       end
     end

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

@@ -29,6 +29,7 @@ module RSpec
           def check_redirect
             response = @scope.response
             return unless response.respond_to?(:redirect?) && response.redirect?
+
             @redirect_is = @scope.send(:normalize_argument_to_redirection, response.location)
           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.9.1'
+      STRING = '4.0.0.beta2'
     end
   end
 end

data/lib/rspec/rails/view_rendering.rb

@@ -56,11 +56,22 @@ module RSpec
               template.identifier,
               EmptyTemplateHandler,
               :virtual_path => template.virtual_path,
-              :format => template.formats
+              :format => template_format(template),
+              :locals => []
             )
           end
         end
 
+        if ::Rails::VERSION::STRING >= '6'
+          def self.template_format(template)
+            template.format
+          end
+        else
+          def self.template_format(template)
+            template.formats
+          end
+        end
+
         # Delegates all methods to the submitted resolver and for all methods
         # that return a collection of `ActionView::Template` instances, return
         # templates with modified source
@@ -91,7 +102,7 @@ module RSpec
         #
         # @private
         class FileSystemResolver < ::ActionView::FileSystemResolver
-        private
+          private
 
           def find_templates(*args)
             templates = super
@@ -102,7 +113,7 @@ module RSpec
 
       # @private
       class EmptyTemplateHandler
-        def self.call(_template)
+        def self.call(_template, _source = nil)
           ::Rails.logger.info("  Template rendering was prevented by rspec-rails. Use `render_views` to verify rendered view contents if necessary.")
 
           %("")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-rails
 version: !ruby/object:Gem::Version
-  version: 3.9.1
+  version: 4.0.0.beta2
 platform: ruby
 authors:
 - David Chelimsky
@@ -44,7 +44,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2019-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -52,98 +52,98 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: '3.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: '3.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: '3.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: rspec-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: '3.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -164,14 +164,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.12
+        version: 0.5.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.12
+        version: 0.5.4
 - !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 3+.
+description: rspec-rails is a testing framework for Rails 4+.
 email: rspec@googlegroups.com
 executables: []
 extensions: []
@@ -284,7 +284,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rspec/rspec-rails/issues
-  changelog_uri: https://github.com/rspec/rspec-rails/blob/v3.9.1/Changelog.md
+  changelog_uri: https://github.com/rspec/rspec-rails/blob/v4.0.0.beta2/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
@@ -300,11 +300,11 @@ 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: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: RSpec for Rails