rspec-rails 3.9.1 → 4.0.0

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

@@ -9,31 +9,26 @@ rescue LoadError
 end
 
 if defined?(Capybara)
-  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)
-      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 = '3.9.1'
+      STRING = '4.0.0'
     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,12 +55,23 @@ module RSpec
               "",
               template.identifier,
               EmptyTemplateHandler,
-              :virtual_path => template.virtual_path,
-              :format => template.formats
+              virtual_path: template.virtual_path,
+              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.")
 
           %("")

data/lib/rspec-rails.rb

@@ -15,8 +15,7 @@ module RSpec
           SourceAnnotationExtractor::Annotation.register_directories("spec")
         end
       end
-      # Rails-3.0.1 requires config.app_generators instead of 3.0.0's config.generators
-      generators = config.respond_to?(:app_generators) ? config.app_generators : config.generators
+      generators = config.app_generators
       generators.integration_tool :rspec
       generators.test_framework :rspec
 
@@ -31,14 +30,15 @@ module RSpec
       # This is called after the environment has been loaded but before Rails
       # sets the default for the `preview_path`
       initializer "rspec_rails.action_mailer",
-                  :before => "action_mailer.set_configs" do |app|
-        setup_preview_path(app)
-      end
+                  before: "action_mailer.set_configs" do |app|
+                    setup_preview_path(app)
+                  end
 
     private
 
       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
@@ -46,9 +46,7 @@ module RSpec
       def config_preview_path?(options)
         # We cannot use `respond_to?(:show_previews)` here as it will always
         # return `true`.
-        if ::Rails::VERSION::STRING < '4.2'
-          ::Rails.env.development?
-        elsif options.show_previews.nil?
+        if options.show_previews.nil?
           options.show_previews = ::Rails.env.development?
         else
           options.show_previews
@@ -57,6 +55,7 @@ module RSpec
 
       def config_default_preview_path(options)
         return unless options.preview_path.blank?
+
         options.preview_path = "#{::Rails.root}/spec/mailers/previews"
       end
 
@@ -72,7 +71,7 @@ module RSpec
         # not respond to the method. However, we cannot use
         # `config.action_mailer.respond_to?(:preview_path)` here as it will
         # always return `true`.
-        config.respond_to?(:action_mailer) && ::Rails::VERSION::STRING > '4.1'
+        config.respond_to?(:action_mailer)
       end
     end
   end

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
 platform: ruby
 authors:
 - David Chelimsky
@@ -44,120 +44,120 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2020-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  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: actionpack
+  name: activesupport
   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.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: '3.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: '3.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rspec-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: '3.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: '3.9'
 - !ruby/object:Gem::Dependency
-  name: cucumber
+  name: ammeter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 1.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -173,20 +173,20 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.14.12
 - !ruby/object:Gem::Dependency
-  name: ammeter
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.3.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
-description: rspec-rails is a testing framework for Rails 3+.
+        version: 1.3.5
+description: rspec-rails is a testing framework for Rails 5+.
 email: rspec@googlegroups.com
 executables: []
 extensions: []
@@ -199,14 +199,18 @@ files:
 - LICENSE.md
 - README.md
 - lib/generators/rspec.rb
+- lib/generators/rspec/channel/channel_generator.rb
+- 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
 - lib/generators/rspec/feature/templates/feature_singular_spec.rb
 - lib/generators/rspec/feature/templates/feature_spec.rb
-- lib/generators/rspec/generators/generator_generator.rb
-- lib/generators/rspec/generators/templates/generator_spec.rb
+- lib/generators/rspec/generator/generator_generator.rb
+- lib/generators/rspec/generator/templates/generator_spec.rb
 - lib/generators/rspec/helper/helper_generator.rb
 - lib/generators/rspec/helper/templates/helper_spec.rb
 - lib/generators/rspec/install/install_generator.rb
@@ -215,6 +219,8 @@ files:
 - 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/mailbox/mailbox_generator.rb
+- lib/generators/rspec/mailbox/templates/mailbox_spec.rb.erb
 - lib/generators/rspec/mailer/mailer_generator.rb
 - lib/generators/rspec/mailer/templates/fixture
 - lib/generators/rspec/mailer/templates/mailer_spec.rb
@@ -222,15 +228,15 @@ 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
+- lib/generators/rspec/scaffold/templates/api_request_spec.rb
 - lib/generators/rspec/scaffold/templates/controller_spec.rb
 - lib/generators/rspec/scaffold/templates/edit_spec.rb
 - lib/generators/rspec/scaffold/templates/index_spec.rb
 - lib/generators/rspec/scaffold/templates/new_spec.rb
+- lib/generators/rspec/scaffold/templates/request_spec.rb
 - lib/generators/rspec/scaffold/templates/routing_spec.rb
 - lib/generators/rspec/scaffold/templates/show_spec.rb
 - lib/generators/rspec/system/system_generator.rb
@@ -243,10 +249,12 @@ files:
 - lib/rspec/rails/adapters.rb
 - lib/rspec/rails/configuration.rb
 - lib/rspec/rails/example.rb
+- lib/rspec/rails/example/channel_example_group.rb
 - lib/rspec/rails/example/controller_example_group.rb
 - lib/rspec/rails/example/feature_example_group.rb
 - lib/rspec/rails/example/helper_example_group.rb
 - lib/rspec/rails/example/job_example_group.rb
+- lib/rspec/rails/example/mailbox_example_group.rb
 - lib/rspec/rails/example/mailer_example_group.rb
 - lib/rspec/rails/example/model_example_group.rb
 - lib/rspec/rails/example/rails_example_group.rb
@@ -261,6 +269,10 @@ files:
 - lib/rspec/rails/fixture_file_upload_support.rb
 - lib/rspec/rails/fixture_support.rb
 - lib/rspec/rails/matchers.rb
+- lib/rspec/rails/matchers/action_cable.rb
+- lib/rspec/rails/matchers/action_cable/have_broadcasted_to.rb
+- lib/rspec/rails/matchers/action_cable/have_streams.rb
+- lib/rspec/rails/matchers/action_mailbox.rb
 - lib/rspec/rails/matchers/active_job.rb
 - lib/rspec/rails/matchers/base_matcher.rb
 - lib/rspec/rails/matchers/be_a_new.rb
@@ -284,7 +296,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/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

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