Rebase master to 4-0-dev

.rubocop.yml

@@ -43,3 +43,30 @@ PerlBackrefs:
     # We probably can refactor the backref out, but for now excluding it since
     # we can't use named matches in 1.8.7
     - lib/generators/rspec/scaffold/scaffold_generator.rb
+
+Style/AccessModifierDeclarations:
+  Enabled: false
+
+Naming/MemoizedInstanceVariableName:
+  Enabled: false
+
+Naming/UncommunicativeMethodParamName:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+Metrics/BlockLength:
+  Enabled: false
+
+Lint/AssignmentInCondition:
+  Enabled: false
+
+Lint/EmptyExpression:
+  Enabled: false
+
+Layout/AlignHash:
+  Enabled: false
+
+Naming/RescuedExceptionsVariableName:
+  Enabled: false

.rubocop_rspec_base.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2019-04-01T20:23:57+02:00 from the rspec-dev repo.
+# This file was generated on 2019-07-24T15:33:53+02:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 # This file contains defaults for RSpec projects. Individual projects
@@ -22,7 +22,7 @@ CaseEquality:
   Enabled: false
 
 # Warns when the class is excessively long.
-ClassLength:
+Metrics/ClassLength:
   Max: 100
 
 CollectionMethods:
@@ -66,7 +66,7 @@ LineLength:
   Max: 100
 
 # Over time we'd like to get this down, but this is what we're at now.
-MethodLength:
+Metrics/MethodLength:
   Max: 15
 
 # Who cares what we call the argument for binary operator methods?
@@ -115,7 +115,10 @@ StringLiterals:
 Style/SpecialGlobalVars:
   Enabled: false
 
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
+  Enabled: false
+
+Style/TrailingCommaInHashLiteral:
   Enabled: false
 
 Style/TrailingCommaInArguments:
@@ -150,6 +153,9 @@ Style/EmptyMethod:
 Style/FormatStringToken:
   Enabled: false
 
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
 Style/GuardClause:
   Enabled: false
 
@@ -162,7 +168,10 @@ Style/IfUnlessModifier:
 Style/IfUnlessModifierOfIfUnless:
   Enabled: false
 
-Style/MethodMissing:
+Style/MethodMissingSuper:
+  Enabled: false
+
+Style/MissingRespondToMissing:
   Enabled: false
 
 Style/MixinUsage:
@@ -243,11 +252,6 @@ Style/StderrPuts:
 Style/TernaryParentheses:
   Enabled: false
 
-# This could likely be enabled, but it had a false positive on rspec-mocks
-# (suggested change was not behaviour preserving) so I don't trust it.
-Performance/HashEachMethods:
-  Enabled: false
-
 Naming/HeredocDelimiterNaming:
   Enabled: false
 
@@ -307,3 +311,6 @@ Style/TrailingUnderscoreVariable:
 
 Layout/EmptyLinesAroundAccessModifier:
   Enabled: false
+
+Metrics/AbcSize:
+  Enabled: false

.travis.yml

@@ -32,17 +32,26 @@ before_script:
 
 script: "script/run_build 2>&1"
 
+# In order to install old Rubies, we need to use old Ubuntu distibution.
+dist: trusty
+
 matrix:
   include:
-    # Rails dev / 6 builds >= 2.4.4
+    # Rails 6 builds
+    - rvm: jruby-head
+      env:
+        - RAILS_VERSION=6-0-stable
+        - JRUBY_OPT=--dev
     - rvm: 2.6.3
-      env: RAILS_VERSION=master
+      env: RAILS_VERSION=6-0-stable
     - rvm: 2.5.3
-      env: RAILS_VERSION=master
-    - rvm: 2.4.4
-      env: RAILS_VERSION=master
+      env: RAILS_VERSION=6-0-stable
 
     # Rails 5.2 builds >= 2.2.2
+    - rvm: jruby-head
+      env:
+        - RAILS_VERSION='~> 5.2.0'
+        - JRUBY_OPT=--dev
     - rvm: 2.6.3
       env: RAILS_VERSION='~> 5.2.0'
     - rvm: 2.5.3
@@ -51,8 +60,6 @@ matrix:
       env: RAILS_VERSION='~> 5.2.0'
     - rvm: 2.3.7
       env: RAILS_VERSION='~> 5.2.0'
-    - rvm: 2.2.10
-      env: RAILS_VERSION='~> 5.2.0'
 
     # Rails 5.1 Builds >= 2.2.2
     - rvm: 2.6.3
@@ -63,8 +70,6 @@ matrix:
       env: RAILS_VERSION='~> 5.1.0'
     - rvm: 2.3.7
       env: RAILS_VERSION='~> 5.1.0'
-    - rvm: 2.2.10
-      env: RAILS_VERSION='~> 5.1.0'
 
     # Rails 5.0 Builds >= 2.2.2
     - rvm: 2.6.3
@@ -75,10 +80,10 @@ matrix:
       env: RAILS_VERSION='~> 5.0.0'
     - rvm: 2.3.7
       env: RAILS_VERSION='~> 5.0.0'
-    - rvm: 2.2.10
-      env: RAILS_VERSION='~> 5.0.0'
 
     # Rails 4.2 Builds >= 1.9.3
+    - rvm: 2.5.3
+      env: RAILS_VERSION='~> 4.2.0'
     - rvm: 2.4.4
       env: RAILS_VERSION='~> 4.2.0'
     - rvm: 2.4.4
@@ -87,127 +92,5 @@ matrix:
       env: RAILS_VERSION='~> 4.2.0'
     - rvm: 2.3.7
       env: RAILS_VERSION=4-2-stable
-    - rvm: 2.2.10
-      env: RAILS_VERSION='~> 4.2.0'
-    - rvm: 2.2.10
-      env: RAILS_VERSION=4-2-stable
-    - rvm: 2.1.10
-      env: RAILS_VERSION='~> 4.2.0'
-    - rvm: 2.1.10
-      env: RAILS_VERSION=4-2-stable
-    - rvm: 2.0.0
-      env: RAILS_VERSION='~> 4.2.0'
-    - rvm: 2.0.0
-      env: RAILS_VERSION=4-2-stable
-    - rvm: 1.9.3
-      env: RAILS_VERSION='~> 4.2.0'
-    - rvm: 1.9.3
-      env: RAILS_VERSION=4-2-stable
 
-    # Rails 4.1 Builds >= 1.9.3, < 2.4
-    - rvm: 2.3.7
-      env: RAILS_VERSION='~> 4.1.0'
-    - rvm: 2.3.7
-      env: RAILS_VERSION=4-1-stable
-    - rvm: 2.2.10
-      env: RAILS_VERSION='~> 4.1.0'
-    - rvm: 2.2.10
-      env: RAILS_VERSION=4-1-stable
-    - rvm: 2.1.10
-      env: RAILS_VERSION='~> 4.1.0'
-    - rvm: 2.1.10
-      env: RAILS_VERSION=4-1-stable
-    - rvm: 2.0.0
-      env: RAILS_VERSION='~> 4.1.0'
-    - rvm: 2.0.0
-      env: RAILS_VERSION=4-1-stable
-    - rvm: 1.9.3
-      env: RAILS_VERSION='~> 4.1.0'
-    - rvm: 1.9.3
-      env: RAILS_VERSION=4-1-stable
-
-    # Rails 4.0 Builds >= 1.8.11, < 2.4
-    - rvm: 2.3.7
-      env: RAILS_VERSION='~> 4.0.4'
-    - rvm: 2.3.7
-      env: RAILS_VERSION=4-0-stable
-    - rvm: 2.2.10
-      env: RAILS_VERSION='~> 4.0.4'
-    - rvm: 2.2.10
-      env: RAILS_VERSION=4-0-stable
-    - rvm: 2.1.10
-      env: RAILS_VERSION='~> 4.0.4'
-    - rvm: 2.1.10
-      env: RAILS_VERSION=4-0-stable
-    - rvm: 2.0.0
-      env: RAILS_VERSION='~> 4.0.4'
-    - rvm: 2.0.0
-      env: RAILS_VERSION=4-0-stable
-    - rvm: 1.9.3
-      env: RAILS_VERSION='~> 4.0.4'
-    - rvm: 1.9.3
-      env: RAILS_VERSION=4-0-stable
-
-    # Rails 3.2 Builds < 2.4
-    - rvm: 2.3.7
-      env: RAILS_VERSION='~> 3.2.17'
-    - rvm: 2.3.7
-      env: RAILS_VERSION=3-2-stable
-    - rvm: 2.2.10
-      env: RAILS_VERSION='~> 3.2.17'
-    - rvm: 2.2.10
-      env: RAILS_VERSION=3-2-stable
-    - rvm: 2.1.10
-      env: RAILS_VERSION='~> 3.2.17'
-    - rvm: 2.1.10
-      env: RAILS_VERSION=3-2-stable
-    - rvm: 2.0.0
-      env: RAILS_VERSION='~> 3.2.17'
-    - rvm: 2.0.0
-      env: RAILS_VERSION=3-2-stable
-    - rvm: 1.9.3
-      env: RAILS_VERSION='~> 3.2.17'
-    - rvm: 1.9.3
-      env: RAILS_VERSION=3-2-stable
-    - rvm: 1.9.2
-      env: RAILS_VERSION='~> 3.2.17'
-    - rvm: 1.9.2
-      env: RAILS_VERSION=3-2-stable
-    - rvm: 1.8.7
-      env: RAILS_VERSION='~> 3.2.17'
-    - rvm: 1.8.7
-      env: RAILS_VERSION=3-2-stable
-
-    # Rails 3.1 Builds, < 2.2
-    - rvm: 2.1.10
-      env: RAILS_VERSION='~> 3.1.12'
-    - rvm: 2.0.0
-      env: RAILS_VERSION='~> 3.1.12'
-    - rvm: 1.9.3
-      env: RAILS_VERSION='~> 3.1.12'
-    - rvm: 1.9.2
-      env: RAILS_VERSION='~> 3.1.12'
-    - rvm: 1.8.7
-      env: RAILS_VERSION='~> 3.1.12'
-
-    # Rails 3.0 Builds, < 2
-    - rvm: 1.9.3
-      env: RAILS_VERSION='~> 3.0.20'
-    - rvm: 1.9.2
-      env: RAILS_VERSION='~> 3.0.20'
-    - rvm: 1.8.7
-      env: RAILS_VERSION='~> 3.0.20'
-
-  allow_failures:
-    - rvm: 2.6.3
-      env: RAILS_VERSION=master
-    - rvm: 2.5.3
-      env: RAILS_VERSION=master
-    - rvm: 2.4.4
-      env: RAILS_VERSION=master
   fast_finish: true
-
-branches:
-  only:
-    - master
-    - /^\d+-\d+-maintenance$/

CONTRIBUTING.md

@@ -50,3 +50,21 @@ immediately. These are good ones to tackle to help us actively fix bugs.
 Maintenance branches are how we manage the different supported point releases
 of RSpec. As such, while they might look like good candidates to merge into
 master, please do not open pull requests to merge them.
+
+## How do the cukes work?
+
+The cucumber features for RSpec rails document how it works, but are also quasi
+executable tests for the framework. They execute in the context of a pre-setup
+Rails app.
+
+1. Before the cucumber specs run, the directory `tmp/aruba` is cleared
+2. If the example app hasn't already been created,
+   `bundle exec rake generate:app generate:stuff` is executed.
+3. The example app is copied in to `tmp/aruba`
+4. Everything in `tmp/aruba/spec/*` is deleted apart from `spec/spec_helper.rb` and
+   `spec/rails_helper.rb`
+5. the cucumber suite executes, creating files in that app and executing them
+
+The best way to debug the app is to run a failing cucumber feature, which will
+leave the test files intact in `tmp/aruba`, then you can cd in to that director
+and run it in the bundle context of the aruba app.

Changelog.md

@@ -1,3 +1,29 @@
+### 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
+* Add support for parameterised mailers (Ignatius Reza, #2125)
+* Add ActionMailbox spec helpers and test type (James Dabbs, #2119)
+* Add ActionCable spec helpers and test type (Vladimir Dementyev, #2113)
+* Add support for partial args when using `have_enqueued_mail`
+  (Ignatius Reza, #2125)
+
+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)
+
+Breaking Changes:
+
+* Drops support for Rails below 5.0
+* Drops support for Ruby below 2.3
+
 ### Development
 [Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.8.2...master)
 
@@ -19,6 +45,7 @@ Enhancements
   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)
 
 ### 3.8.2 / 2019-01-13
 [Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.8.1...v3.8.2)