Merge branch 'main' into rails-6-1-dev

JonRowe · web-flow · commit b45312a716d2 · 2021-03-06T09:45:33.000Z
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1,5 +1,5 @@
-# This file was generated on 2019-12-05T21:32:23+00:00 from the rspec-dev repo.
+# This file was generated on 2020-12-25T18:48:30+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
-github: [JonRowe]
+github: [JonRowe, benoittgt]
 open_collective: rspec
diff --git a/.rspec b/.rspec
@@ -1,3 +1,2 @@
 --warnings
---color
 --require spec_helper
diff --git a/BUILD_DETAIL.md b/BUILD_DETAIL.md
@@ -1,5 +1,5 @@
 <!---
-This file was generated on 2019-12-05T21:32:23+00:00 from the rspec-dev repo.
+This file was generated on 2020-12-25T18:48:30+00:00 from the rspec-dev repo.
 DO NOT modify it by hand as your changes will get lost the next time it is generated.
 -->
 
@@ -112,22 +112,23 @@ $ bundle exec yard doc --no-cache
 $ bin/yard doc --no-cache
 ```
 
-## Rubocop
+## RuboCop
 
-We use [Rubocop](https://github.com/rubocop-hq/rubocop) to enforce style conventions on the project so
-that the code has stylistic consistency throughout. Run with:
+We use [RuboCop](https://github.com/rubocop-hq/rubocop) to enforce style
+conventions on the project so that the code has stylistic consistency
+throughout. Run with:
 
 ```
-$ bundle exec rubocop
+$ bundle exec rubocop lib
 
 # or, if you installed your bundle with `--standalone --binstubs`:
 
-$ bin/rubocop
+$ bin/rubocop lib
 ```
 
-Our Rubocop configuration is a work-in-progress, so if you get a failure
-due to a Rubocop default, feel free to ask about changing the
-configuration. Otherwise, you'll need to address the Rubocop failure,
+Our RuboCop configuration is a work-in-progress, so if you get a failure
+due to a RuboCop default, feel free to ask about changing the
+configuration. Otherwise, you'll need to address the RuboCop failure,
 or, as a measure of last resort, by wrapping the offending code in
 comments like `# rubocop:disable SomeCheck` and `# rubocop:enable SomeCheck`.
 
@@ -161,4 +162,3 @@ build for another repo, so our CI build includes a spec that runs the
 spec suite of each of the _other_ project repos. Note that we only run
 the spec suite, not the full build, of the other projects, as the spec
 suite runs very quickly compared to the full build.
-
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -1,5 +1,5 @@
 <!---
-This file was generated on 2019-12-05T21:32:23+00:00 from the rspec-dev repo.
+This file was generated on 2020-12-25T18:48:30+00:00 from the rspec-dev repo.
 DO NOT modify it by hand as your changes will get lost the next time it is generated.
 -->
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,5 +1,5 @@
 <!---
-This file was generated on 2019-12-05T21:32:23+00:00 from the rspec-dev repo.
+This file was generated on 2020-12-25T18:48:30+00:00 from the rspec-dev repo.
 DO NOT modify it by hand as your changes will get lost the next time it is generated.
 -->
 
diff --git a/Changelog.md b/Changelog.md
@@ -1,15 +1,10 @@
-### Rails 6.1 Development
-[Full Changelog](https://github.com/rspec/rspec-rails/compare/main...rails-6-1-dev)
+### Development
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v4.1.0...main)
 
 * Support new #file_fixture_path and new fixture test support code. (Jon Rowe, #2398)
+* Support for Rails 6.1. (Benoit Tigeot, Jon Rowe, Phil Pirozhkov, and more #2398)
 
-Bug Fixes:
-
-* Prevent collisions with `let(:name)` for Rails 6.1 and `let(:method_name)` on older
-  Rails. (Benoit Tigeot, #2461)
-
-### Development
-[Full Changelog](https://github.com/rspec/rspec-rails/compare/v4.0.1...main)
+### 4.1.0 / 2021-03-06
 
 Enhancements:
 
@@ -22,6 +17,11 @@ Enhancements:
 * Improve request spec "controller" scafold when no action is specified.
   (Thomas Hareau, #2399)
 * Introduce testing snippets concept (Phil Pirozhkov, Benoit Tigeot, #2423)
+* Prevent collisions with `let(:name)` for Rails 6.1 and `let(:method_name)` on older
+  Rails. (Benoit Tigeot, #2461)
+
+### 4.0.2 / 2020-12-26
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v4.0.1...v4.0.2)
 
 Bug Fixes:
 
diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
@@ -1,5 +1,5 @@
 <!---
-This file was generated on 2019-12-05T21:32:23+00:00 from the rspec-dev repo.
+This file was generated on 2020-12-25T18:48:30+00:00 from the rspec-dev repo.
 DO NOT modify it by hand as your changes will get lost the next time it is generated.
 -->
 
diff --git a/Gemfile b/Gemfile
@@ -8,7 +8,7 @@ gem 'yard', '~> 0.9.24', require: false
 
 group :documentation do
   gem 'github-markup', '~> 3.0.3'
-  gem 'redcarpet', '~> 3.4.0', platforms: [:ruby]
+  gem 'redcarpet', '~> 3.5.1', platforms: [:ruby]
   gem 'relish', '~> 0.7.1'
 end
 
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# rspec-rails [![Build Status][]][travis-ci] [![Code Climate][]][code-climate] [![Gem Version][]](gem-version)
+# rspec-rails [![Code Climate][]][code-climate] [![Gem Version][]][gem-version]
 
 `rspec-rails` brings the [RSpec][] testing framework to [Ruby on Rails][]
 as a drop-in alternative to its default testing framework, Minitest.
@@ -25,15 +25,15 @@ Use **[`rspec-rails` 1.x][]** for Rails 2.x.
 ## Installation
 
 **IMPORTANT** This README / branch refers to the current development build.
-See the `4-0-maintenance` branch on Github if you want or require the latest stable release.
+See the [`4-1-maintenance` branch on Github](https://github.com/rspec/rspec-rails/tree/4-0-maintenance) if you want or require the latest stable release.
 
 1. Add `rspec-rails` to **both** the `:development` and `:test` groups
    of your app’s `Gemfile`:
 
    ```ruby
    # Run against the latest stable release
    group :development, :test do
-     gem 'rspec-rails', '~> 4.0.1'
+     gem 'rspec-rails', '~> 4.1.0'
    end
 
    # Or, run against the main branch
diff --git a/lib/rspec/rails/extensions/active_record/proxy.rb b/lib/rspec/rails/extensions/active_record/proxy.rb
@@ -1,7 +1,10 @@
 RSpec.configure do |rspec|
   # Delay this in order to give users a chance to configure `expect_with`...
   rspec.before(:suite) do
-    if defined?(RSpec::Matchers) && RSpec::Matchers.configuration.syntax.include?(:should) && defined?(ActiveRecord::Associations)
+    if defined?(RSpec::Matchers) &&
+        RSpec::Matchers.configuration.respond_to?(:syntax) && # RSpec 4 dropped support for monkey-patching `should` syntax
+        RSpec::Matchers.configuration.syntax.include?(:should) &&
+        defined?(ActiveRecord::Associations)
       RSpec::Matchers.configuration.add_should_and_should_not_to ActiveRecord::Associations::CollectionProxy
     end
   end
diff --git a/lib/rspec/rails/matchers/relation_match_array.rb b/lib/rspec/rails/matchers/relation_match_array.rb
@@ -1,3 +1,3 @@
-if defined?(ActiveRecord::Relation)
+if defined?(ActiveRecord::Relation) && defined?(RSpec::Matchers::BuiltIn::OperatorMatcher) # RSpec 4 removed OperatorMatcher
   RSpec::Matchers::BuiltIn::OperatorMatcher.register(ActiveRecord::Relation, '=~', RSpec::Matchers::BuiltIn::ContainExactly)
 end
diff --git a/lib/rspec/rails/version.rb b/lib/rspec/rails/version.rb
@@ -3,7 +3,7 @@ module Rails
     # Version information for RSpec Rails.
     module Version
       # Current version of RSpec Rails, in semantic versioning format.
-      STRING = '4.1.0.pre'
+      STRING = '5.0.0.pre'
     end
   end
 end
diff --git a/rspec-rails.gemspec b/rspec-rails.gemspec
@@ -46,7 +46,7 @@ Gem::Specification.new do |s|
   # get released.
   %w[core expectations mocks support].each do |name|
     if ENV['RSPEC_CI']
-      s.add_runtime_dependency "rspec-#{name}", "= 4.0.0.pre"
+      s.add_runtime_dependency "rspec-#{name}", ENV.fetch('RSPEC_VERSION', '3.11.0.pre')
     elsif RSpec::Rails::Version::STRING =~ /pre/ # prerelease builds
       expected_rspec_version = "3.11.0.pre"
       s.add_runtime_dependency "rspec-#{name}", "= #{expected_rspec_version}"
@@ -56,7 +56,7 @@ Gem::Specification.new do |s|
     end
   end
 
-  s.add_development_dependency 'ammeter',  '~> 1.1.2'
+  s.add_development_dependency 'ammeter',  '~> 1.1.5'
   s.add_development_dependency 'aruba',    '~> 0.14.12'
   s.add_development_dependency 'cucumber', '~> 1.3.5'
 end
diff --git a/spec/rspec/rails/fixture_support_spec.rb b/spec/rspec/rails/fixture_support_spec.rb
@@ -12,7 +12,7 @@ module RSpec::Rails
       end
     end
 
-    it "will allow #setup_fixture to run successfully", if: Rails.version.to_f > 6.0 do
+    it "will allow #setup_fixture to run successfully", skip: Rails.version.to_f <= 6.0 do
       group = RSpec::Core::ExampleGroup.describe do
         include FixtureSupport
 
diff --git a/spec/sanity_check_spec.rb b/spec/sanity_check_spec.rb
@@ -33,7 +33,7 @@ def with_clean_env
     end
   end
 
-  it "passes when libraries are required", unless: RSpec::Support::Ruby.jruby? do
+  it "passes when libraries are required", skip: RSpec::Support::Ruby.jruby? do
     script = tmp_root.join("pass_sanity_check")
     File.open(script, "w") do |f|
       f.write <<-EOF.gsub(/^\s+\|/, '')
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -38,7 +38,8 @@ def self.run_all(reporter = nil)
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
   config.expect_with :rspec do |expectations|
-    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+    # include_chain_clauses_in_custom_matcher_descriptions is removed in RSpec Expectations 4
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true if expectations.respond_to?(:include_chain_clauses_in_custom_matcher_descriptions=)
     expectations.max_formatted_output_length = 1000
   end
 
@@ -47,15 +48,16 @@ def self.run_all(reporter = nil)
     mocks.verify_doubled_constant_names = true
   end
 
-  config.filter_run :focus
-  config.run_all_when_everything_filtered = true
+  config.filter_run_when_matching :focus
 
   config.order = :random
   Kernel.srand config.seed
 
-  config.shared_context_metadata_behavior = :apply_to_host_groups
+  # shared_context_metadata_behavior is removed in RSpec 4
+  config.shared_context_metadata_behavior = :apply_to_host_groups if config.respond_to?(:shared_context_metadata_behavior=)
 
-  config.disable_monkey_patching!
+  # Zero monkey patching mode is the default and only mode in RSpec 4
+  config.disable_monkey_patching! if config.respond_to?(:disable_monkey_patching!)
 
   config.warnings = true
   config.raise_on_warning = true
diff --git a/spec/support/generators.rb b/spec/support/generators.rb
@@ -20,7 +20,7 @@ def self.included(klass)
           klass.include(RSpec::Rails::FeatureCheck)
         end
 
-        shared_examples_for 'a model generator with fixtures' do |name, class_name|
+        RSpec.shared_examples_for 'a model generator with fixtures' do |name, class_name|
           before { run_generator [name, '--fixture'] }
 
           describe 'the spec' do
@@ -38,7 +38,7 @@ def self.included(klass)
           end
         end
 
-        shared_examples_for "a request spec generator" do
+        RSpec.shared_examples_for "a request spec generator" do
           describe 'generated with flag `--no-request-specs`' do
             before do
               run_generator %w[posts --no-request-specs]
diff --git a/spec/support/shared_examples.rb b/spec/support/shared_examples.rb
@@ -1,6 +1,6 @@
 require 'pathname'
 
-shared_examples_for "an rspec-rails example group mixin" do |type, *paths|
+RSpec.shared_examples_for "an rspec-rails example group mixin" do |type, *paths|
   let(:mixin) { described_class }
 
   def define_group_in(path, group_definition)

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`--warnings`
`2`		`---color`
`3`	`2`	`--require spec_helper`