rspec-rails 4.0.0.beta3 → 4.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ae59820fb98850c1f67442c749ce42e76895fca3a17f952ac36d752903fd986
-  data.tar.gz: 713bb7441b6d66036dc73f2f9fa448419390627890ab0bf6a535c84800758939
+  metadata.gz: 51903b359e44b4d8c3323a4af3caa9de3495e02009b61da605af24d7ae588b0b
+  data.tar.gz: 11e9ff4ad45a88a32e9f0a4294cd6c8f7c75febd5ba07c1382fed86ebdcd64aa
 SHA512:
-  metadata.gz: 691dc937903a8aaac3e23feff435710e521082a0ace9bddc00cba9bd9ecb52610104b66458c900ababcf19a74e341affa78c109eb589faa7c25f7320db82954a
-  data.tar.gz: 56d7c5dbd4a1e437f5f011274f084a6e1a835b0795d369fe56e53b993dbf4a199067b96f73e2ae2aad7b6c556ee6dcb6b24cd46fd12a967bfe15e50450367bce
+  metadata.gz: 8e9b40e1404bb29508e00c460db05b7d499ca86daa332cbe3e517dfd922ec860302023e6f71e15e7445f07c7eb39979306cd98ef296b7794ae2c87e3d5865b59
+  data.tar.gz: bb8b7f0411f6d1eff0550b952117bbd58aa59ca082c54d2a145e808fc14a400de0885bb8a8b5503b04baef787527b50a08054e471444123e433d3138c8b45fe1

data/Capybara.md

@@ -73,5 +73,5 @@ behavior and accepting the risks associated with doing so:
 
     # not recommended!
     RSpec.configure do |c|
-      c.include Capybara::DSL, :file_path => "spec/requests"
+      c.include Capybara::DSL, file_path: "spec/requests"
     end

data/Changelog.md

@@ -1,9 +1,28 @@
-### Development
-[Full Changelog](https://github.com/rspec/rspec-rails/compare/v3.9.0...master)
+### 4.0.0.beta4
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v4.0.0.beta3...v4.0.0.beta4)
+
+Enhancements:
+
+* Add argument matcher support to `have_enqueued_*` matchers. (Phil Pirozhkov, #2206)
+* Switch generated templates to use ruby 1.9 hash keys. (Tanbir Hasan, #2224)
+* Add `have_been_performed`/`have_performed_job`/`perform_job` ActiveJob
+  matchers (Isaac Seymour, #1785)
+* Default to generating request specs rather than controller specs when
+  generating a controller (Luka Lüdicke, #2222)
+
+Bug Fixes:
+
+* Prevent `driven_by(:selenium)` being called due to hook precedence.
+  (Takumi Shotoku, #2188)
+* Prevent a `WrongScopeError` being thrown during loading fixtures on Rails
+  6.1 development version. (Edouard Chin, #2215)
+* Fix Mocha mocking support with `should`. (Phil Pirozhkov, #2256)
+
+### 4.0.0.beta3
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v4.0.0.beta2...v4.0.0.beta3)
 
 Enhancements:
 
-* Adds support for Rails 6. (Penelope Phippen, Benoit Tigeot, Jon Rowe, #2071)
 * Adds support for JRuby on Rails 5.2 and 6
 * Add support for parameterised mailers (Ignatius Reza, #2125)
 * Add ActionMailbox spec helpers and test type (James Dabbs, #2119)
@@ -17,17 +36,34 @@ Enhancements:
 
 Bug Fixes:
 
+* Replace `before_teardown` as well as `after_teardown` to ensure screenshots
+  are generated correctly. (Jon Rowe, #2164)
+* `ActionView::FixtureResolver#hash` has been renamed to `ActionView::FixtureResolver#data`.
+  (Penelope Phippen, #2076)
+* Add missing require for `have_enqueued_mail` matcher.  (Ignatius Reza, #2117)
+
+### 4.0.0.beta2
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v4.0.0.beta1...v4.0.0.beta2)
+
+Bug Fixes:
+
+* Fix version dependencies in gemspec.
+
+### 4.0.0.beta1
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v3.9.0...v4.0.0.beta1)
+
+Enhancements:
+
+* Adds support for Rails 6. (Penelope Phippen, Benoit Tigeot, Jon Rowe, #2071)
+
+Bug Fixes:
+
 * `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)
-* Replace `before_teardown` as well as `after_teardown` to ensure screenshots
-  are generated correctly. (Jon Rowe, #2164)
-* `ActionView::FixtureResolver#hash` has been renamed to `ActionView::FixtureResolver#data`.
-  (Penelope Phippen, #2076)
-* Add missing require for `have_enqueued_mail` matcher.  (Ignatius Reza, #2117)
 
 Breaking Changes:
 
@@ -341,10 +377,10 @@ Enhancements:
 * Improve controller and routing spec calls to `routes` by using `yield`
   instead of `call`. (Anton Davydov, #1308)
 * Add support for `ActiveJob` specs as standard `RSpec::Rails::RailsExampleGoup`s
-  via both `:type => :job` and inferring type from spec directory `spec/jobs`.
+  via both `type: :job` and inferring type from spec directory `spec/jobs`.
   (Gabe Martin-Dempesy, #1361)
 * Include `RSpec::Rails::FixtureSupport` into example groups using metadata
-  `:use_fixtures => true`. (Aaron Kromer, #1372)
+  `use_fixtures: true`. (Aaron Kromer, #1372)
 * Include `rspec:request` generator for generating request specs; this is an
   alias of `rspec:integration` (Aaron Kromer, #1378)
 * Update `rails_helper` generator with a default check to abort the spec run
@@ -485,7 +521,7 @@ Enhancements:
 Bug Fixes:
 
 * Fix an inconsistency in the generated scaffold specs for a controller. (Andy Waite)
-* Ensure `config.before(:all, :type => <type>)` hooks run before groups
+* Ensure `config.before(:all, type: <type>)` hooks run before groups
   of the given type, even when the type is inferred by the file
   location. (Jon Rowe, Myron Marston)
 * Switch to parsing params with `Rack::Utils::parse_nested_query` to match Rails.
@@ -935,7 +971,7 @@ This release is compatible with rails-3.1.0.rc1, but not rails-3.1.0.beta1
 * Enhancements
   * include ApplicationHelper in helper object in helper specs
   * include request spec extensions in files in spec/integration
-  * include controller spec extensions in groups that use :type => :controller
+  * include controller spec extensions in groups that use type: :controller
     * same for :model, :view, :helper, :mailer, :request, :routing
 
 * Bug fixes

data/README.md

@@ -28,14 +28,14 @@ Use **[`rspec-rails` 1.x][]** for Rails 2.x.
    ```ruby
    # Run against the latest stable release
    group :development, :test do
-     gem 'rspec-rails', '~> 3.8'
+     gem 'rspec-rails', '~> 4.0'
    end
 
    # Or, run against the master branch
    # (requires master-branch versions of all related RSpec libraries)
    group :development, :test do
      %w[rspec-core rspec-expectations rspec-mocks rspec-rails rspec-support].each do |lib|
-       gem lib, :git => "https://github.com/rspec/#{lib}.git", :branch => 'master'
+       gem lib, git: "https://github.com/rspec/#{lib}.git", branch: 'master'
      end
    end
    ```
@@ -119,8 +119,7 @@ $ bundle exec rspec --help
 ```
 
 **Optional:** If `bundle exec rspec` is too verbose for you,
-you can generate a binstub at `bin/rspec`
-and use that instead (Rails 4+ only):
+you can generate a binstub at `bin/rspec` and use that instead:
 
  ```sh
  $ bundle binstubs rspec-core

data/lib/generators/rspec.rb

@@ -18,12 +18,6 @@ module Rspec
           @_rspec_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'rspec', generator_name, 'templates'))
         end
       end
-
-      if ::Rails::VERSION::STRING < '3.1'
-        def module_namespacing
-          yield if block_given?
-        end
-      end
     end
   end
 end

data/lib/generators/rspec/controller/controller_generator.rb

@@ -4,12 +4,20 @@ module Rspec
   module Generators
     # @private
     class ControllerGenerator < Base
-      argument :actions, :type => :array, :default => [], :banner => "action action"
+      argument :actions, type: :array, default: [], banner: "action action"
 
-      class_option :template_engine, :desc => "Template engine to generate view files"
-      class_option :controller_specs, :type => :boolean, :default => true, :desc => "Generate controller specs"
-      class_option :view_specs,       :type => :boolean, :default => true, :desc => "Generate view specs"
-      class_option :routing_specs,    :type => :boolean, :default => false, :desc => "Generate routing specs"
+      class_option :template_engine,  desc: "Template engine to generate view files"
+      class_option :request_specs,    type: :boolean, default: true, desc: "Generate request specs"
+      class_option :controller_specs, type: :boolean, default: false, desc: "Generate controller specs"
+      class_option :view_specs,       type: :boolean, default: true, desc: "Generate view specs"
+      class_option :routing_specs,    type: :boolean, default: false, desc: "Generate routing specs"
+
+      def generate_request_spec
+        return unless options[:request_specs]
+
+        template 'request_spec.rb',
+                 File.join('spec/requests', class_path, "#{file_name}_request_spec.rb")
+      end
 
       def generate_controller_spec
         return unless options[:controller_specs]

data/lib/generators/rspec/controller/templates/request_spec.rb

@@ -0,0 +1,14 @@
+require 'rails_helper'
+
+RSpec.describe "<%= class_name.pluralize %>", <%= type_metatag(:request) %> do
+<% namespaced_path = regular_class_path.join('/') %>
+<% for action in actions -%>
+  describe "GET /<%= action %>" do
+    it "returns http success" do
+      get "<%= "/#{namespaced_path}" if namespaced_path != '' %>/<%= file_name %>/<%= action %>"
+      expect(response).to have_http_status(:success)
+    end
+  end
+
+<% end -%>
+end

data/lib/generators/rspec/controller/templates/routing_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe '<%= class_name %>Controller', <%= type_metatag(:routing) %> do
   describe 'routing' do
 <% for action in actions -%>
     it 'routes to #<%= action %>' do
-      expect(:get => "/<%= class_name.underscore %>/<%= action %>").to route_to("<%= class_name.underscore %>#<%= action  %>")
+      expect(get: "/<%= class_name.underscore %>/<%= action %>").to route_to("<%= class_name.underscore %>#<%= action  %>")
     end
 <% end -%>
   end

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

@@ -4,8 +4,8 @@ module Rspec
   module Generators
     # @private
     class FeatureGenerator < Base
-      class_option :feature_specs, :type => :boolean, :default => true,  :desc => "Generate feature specs"
-      class_option :singularize,   :type => :boolean, :default => false, :desc => "Singularize the generated feature"
+      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]

data/lib/generators/rspec/generators/generator_generator.rb

@@ -4,7 +4,7 @@ module Rspec
   module Generators
     # @private
     class GeneratorsGenerator < Base
-      class_option :generator_specs, :type => :boolean, :default => false,  :desc => "Generate generator specs"
+      class_option :generator_specs, type: :boolean, default: false,  desc: "Generate generator specs"
 
       def generate_generator_spec
         return unless options[:generator_specs]

data/lib/generators/rspec/helper/helper_generator.rb

@@ -4,7 +4,7 @@ module Rspec
   module Generators
     # @private
     class HelperGenerator < Base
-      class_option :helper_specs, :type => :boolean, :default => true
+      class_option :helper_specs, type: :boolean, default: true
 
       def generate_helper_spec
         return unless options[:helper_specs]

data/lib/generators/rspec/install/install_generator.rb

@@ -32,8 +32,8 @@ DESC
 
       def generate_rspec_init(tmpdir)
         initializer = ::RSpec::Core::ProjectInitializer.new(
-          :destination => tmpdir,
-          :report_stream => StringIO.new
+          destination: tmpdir,
+          report_stream: StringIO.new
         )
         initializer.run
 
@@ -47,7 +47,7 @@ DESC
         gsub_file spec_helper_path,
                   'rspec --init',
                   'rails generate rspec:install',
-                  :verbose => false
+                  verbose: false
       end
 
       def remove_warnings_configuration(spec_helper_path)
@@ -56,7 +56,7 @@ DESC
         gsub_file spec_helper_path,
                   /#{empty_line}(#{comment_line})+\s+config\.warnings = true\n/,
                   '',
-                  :verbose => false
+                  verbose: false
       end
     end
   end

data/lib/generators/rspec/install/templates/spec/rails_helper.rb

@@ -1,11 +1,7 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 require 'spec_helper'
 ENV['RAILS_ENV'] ||= 'test'
-<% if RUBY_VERSION >= '2.0.0' %>
 require File.expand_path('../config/environment', __dir__)
-<% else %>
-require File.expand_path('../../config/environment', __FILE__)
-<% end %>
 # Prevent database truncation if the environment is production
 abort("The Rails environment is running in production mode!") if Rails.env.production?
 require 'rspec/rails'
@@ -26,7 +22,7 @@ require 'rspec/rails'
 #
 # Dir[Rails.root.join('spec', 'support', '**', '*.rb')].each { |f| require f }
 
-<% if RSpec::Rails::FeatureCheck.can_maintain_test_schema? -%>
+<% if RSpec::Rails::FeatureCheck.has_active_record_migration? -%>
 # Checks for pending migrations and applies them before tests are run.
 # If you are not using ActiveRecord, you can remove these lines.
 begin
@@ -35,15 +31,6 @@ rescue ActiveRecord::PendingMigrationError => e
   puts e.to_s.strip
   exit 1
 end
-<% elsif RSpec::Rails::FeatureCheck.can_check_pending_migrations? -%>
-# Checks for pending migrations before tests are run.
-# If you are not using ActiveRecord, you can remove these lines.
-begin
-  ActiveRecord::Migration.check_pending!
-rescue ActiveRecord::PendingMigrationError => e
-  puts e.to_s.strip
-  exit 1
-end
 <% end -%>
 RSpec.configure do |config|
 <% if RSpec::Rails::FeatureCheck.has_active_record? -%>
@@ -63,7 +50,7 @@ RSpec.configure do |config|
   # You can disable this behaviour by removing the line below, and instead
   # explicitly tag your specs with their type, e.g.:
   #
-  #     RSpec.describe UsersController, :type => :controller do
+  #     RSpec.describe UsersController, type: :controller do
   #       # ...
   #     end
   #

data/lib/generators/rspec/integration/integration_generator.rb

@@ -7,9 +7,9 @@ module Rspec
       # Add a deprecation for this class, before rspec-rails 4, to use the
       # `RequestGenerator` instead
       class_option :request_specs,
-                   :type => :boolean,
-                   :default => true,
-                   :desc => "Generate request specs"
+                   type: :boolean,
+                   default: true,
+                   desc: "Generate request specs"
 
       def generate_request_spec
         return unless options[:request_specs]

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

@@ -5,7 +5,7 @@ module Rspec
   module Generators
     # @private
     class MailerGenerator < Base
-      argument :actions, :type => :array, :default => [], :banner => "method method"
+      argument :actions, type: :array, default: [], banner: "method method"
 
       def generate_mailer_spec
         template "mailer_spec.rb", File.join('spec/mailers', class_path, "#{file_name}_spec.rb")

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

@@ -5,10 +5,10 @@ module Rspec
     # @private
     class ModelGenerator < Base
       argument :attributes,
-               :type => :array,
-               :default => [],
-               :banner => "field:type field:type"
-      class_option :fixture, :type => :boolean
+               type: :array,
+               default: [],
+               banner: "field:type field:type"
+      class_option :fixture, type: :boolean
 
       def create_model_spec
         template_file = File.join(

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

@@ -7,17 +7,17 @@ module Rspec
     class ScaffoldGenerator < Base
       include ::Rails::Generators::ResourceHelpers
       source_paths << File.expand_path('../helper/templates', __dir__)
-      argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
+      argument :attributes, type: :array, default: [], banner: "field:type field:type"
 
-      class_option :orm, :desc => "ORM used to generate the controller"
-      class_option :template_engine, :desc => "Template engine to generate view files"
-      class_option :singleton, :type => :boolean, :desc => "Supply to create a singleton controller"
-      class_option :api, :type => :boolean, :desc => "Skip specs unnecessary for API-only apps"
+      class_option :orm, desc: "ORM used to generate the controller"
+      class_option :template_engine, desc: "Template engine to generate view files"
+      class_option :singleton, type: :boolean, desc: "Supply to create a singleton controller"
+      class_option :api, type: :boolean, desc: "Skip specs unnecessary for API-only apps"
 
-      class_option :controller_specs, :type => :boolean, :default => true,  :desc => "Generate controller specs"
-      class_option :view_specs,       :type => :boolean, :default => true,  :desc => "Generate view specs"
-      class_option :helper_specs,     :type => :boolean, :default => true,  :desc => "Generate helper specs"
-      class_option :routing_specs,    :type => :boolean, :default => true,  :desc => "Generate routing specs"
+      class_option :controller_specs, type: :boolean, default: true,  desc: "Generate controller specs"
+      class_option :view_specs,       type: :boolean, default: true,  desc: "Generate view specs"
+      class_option :helper_specs,     type: :boolean, default: true,  desc: "Generate helper specs"
+      class_option :routing_specs,    type: :boolean, default: true,  desc: "Generate routing specs"
 
       def initialize(*args, &blk)
         @generator_args = args.first
@@ -60,7 +60,7 @@ module Rspec
         template 'routing_spec.rb', template_file
       end
 
-      hook_for :integration_tool, :as => :integration
+      hook_for :integration_tool, as: :integration
 
     protected
 

data/lib/generators/rspec/scaffold/templates/api_controller_spec.rb

@@ -46,11 +46,7 @@ RSpec.describe <%= controller_class_name %>Controller, <%= type_metatag(:control
   describe "GET #index" do
     it "returns a success response" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
-<% if RUBY_VERSION < '1.9.3' -%>
-      get :index, {}, valid_session
-<% else -%>
       get :index, params: {}, session: valid_session
-<% end -%>
       expect(response).to be_successful
     end
   end
@@ -59,11 +55,7 @@ RSpec.describe <%= controller_class_name %>Controller, <%= type_metatag(:control
   describe "GET #show" do
     it "returns a success response" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
-<% if RUBY_VERSION < '1.9.3' -%>
-      get :show, {:id => <%= file_name %>.to_param}, valid_session
-<% else -%>
       get :show, params: {id: <%= file_name %>.to_param}, session: valid_session
-<% end -%>
       expect(response).to be_successful
     end
   end
@@ -72,20 +64,12 @@ RSpec.describe <%= controller_class_name %>Controller, <%= type_metatag(:control
     context "with valid params" do
       it "creates a new <%= class_name %>" do
         expect {
-<% if RUBY_VERSION < '1.9.3' -%>
-          post :create, {:<%= ns_file_name %> => valid_attributes}, valid_session
-<% else -%>
           post :create, params: {<%= ns_file_name %>: valid_attributes}, session: valid_session
-<% end -%>
         }.to change(<%= class_name %>, :count).by(1)
       end
 
       it "renders a JSON response with the new <%= ns_file_name %>" do
-<% if RUBY_VERSION < '1.9.3' -%>
-        post :create, {:<%= ns_file_name %> => valid_attributes}, valid_session
-<% else %>
         post :create, params: {<%= ns_file_name %>: valid_attributes}, session: valid_session
-<% end -%>
         expect(response).to have_http_status(:created)
         expect(response.content_type).to eq('application/json')
         expect(response.location).to eq(<%= ns_file_name %>_url(<%= class_name %>.last))
@@ -94,11 +78,7 @@ RSpec.describe <%= controller_class_name %>Controller, <%= type_metatag(:control
 
     context "with invalid params" do
       it "renders a JSON response with errors for the new <%= ns_file_name %>" do
-<% if RUBY_VERSION < '1.9.3' -%>
-        post :create, {:<%= ns_file_name %> => invalid_attributes}, valid_session
-<% else %>
         post :create, params: {<%= ns_file_name %>: invalid_attributes}, session: valid_session
-<% end -%>
         expect(response).to have_http_status(:unprocessable_entity)
         expect(response.content_type).to eq('application/json')
       end
@@ -113,22 +93,14 @@ RSpec.describe <%= controller_class_name %>Controller, <%= type_metatag(:control
 
       it "updates the requested <%= ns_file_name %>" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
-<% if RUBY_VERSION < '1.9.3' -%>
-        put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => new_attributes}, valid_session
-<% else -%>
         put :update, params: {id: <%= file_name %>.to_param, <%= ns_file_name %>: new_attributes}, session: valid_session
-<% end -%>
         <%= file_name %>.reload
         skip("Add assertions for updated state")
       end
 
       it "renders a JSON response with the <%= ns_file_name %>" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
-<% if RUBY_VERSION < '1.9.3' -%>
-        put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => valid_attributes}, valid_session
-<% else %>
         put :update, params: {id: <%= file_name %>.to_param, <%= ns_file_name %>: valid_attributes}, session: valid_session
-<% end -%>
         expect(response).to have_http_status(:ok)
         expect(response.content_type).to eq('application/json')
       end
@@ -137,11 +109,7 @@ RSpec.describe <%= controller_class_name %>Controller, <%= type_metatag(:control
     context "with invalid params" do
       it "renders a JSON response with errors for the <%= ns_file_name %>" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
-<% if RUBY_VERSION < '1.9.3' -%>
-        put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => invalid_attributes}, valid_session
-<% else %>
         put :update, params: {id: <%= file_name %>.to_param, <%= ns_file_name %>: invalid_attributes}, session: valid_session
-<% end -%>
         expect(response).to have_http_status(:unprocessable_entity)
         expect(response.content_type).to eq('application/json')
       end
@@ -152,11 +120,7 @@ RSpec.describe <%= controller_class_name %>Controller, <%= type_metatag(:control
     it "destroys the requested <%= ns_file_name %>" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
       expect {
-<% if RUBY_VERSION < '1.9.3' -%>
-        delete :destroy, {:id => <%= file_name %>.to_param}, valid_session
-<% else -%>
         delete :destroy, params: {id: <%= file_name %>.to_param}, session: valid_session
-<% end -%>
       }.to change(<%= class_name %>, :count).by(-1)
     end
   end