rspec · JonRowe · Dec 18, 2019 · Dec 18, 2019 · Dec 16, 2019 · Dec 19, 2019
diff --git a/.travis.yml b/.travis.yml
@@ -85,16 +85,4 @@ matrix:
     - rvm: 2.3.8
       env: RAILS_VERSION='~> 5.0.0'
 
-    # Rails 4.2 Builds >= 1.9.3
-    - rvm: 2.5.5
-      env: RAILS_VERSION='~> 4.2.0'
-    - rvm: 2.4.6
-      env: RAILS_VERSION='~> 4.2.0'
-    - rvm: 2.4.6
-      env: RAILS_VERSION='~> 4.2.0'
-    - rvm: 2.3.8
-      env: RAILS_VERSION='~> 4.2.0'
-    - rvm: 2.3.8
-      env: RAILS_VERSION='~> 4.2.0'
-
   fast_finish: true
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-# This file was generated on 2019-07-24T15:33:53+02:00 from the rspec-dev repo.
+# This file was generated on 2019-12-18T14:01:39+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.
 
 version: "{build}"

diff --git a/example_app_generator/spec/verify_mailer_preview_path_spec.rb b/example_app_generator/spec/verify_mailer_preview_path_spec.rb
@@ -25,6 +25,7 @@ def capture_exec(*ops)
     # Necessary to ignore warnings from Rails code base
     out =  io.readlines.
               reject { |line| line =~ /warning: circular argument reference/ }.
+              reject { |line| line =~ /Gem::Specification#rubyforge_project=/ }.
               join.
               chomp
     CaptureExec.new(out, $?.exitstatus)

diff --git a/features/support/env.rb b/features/support/env.rb
@@ -6,9 +6,30 @@ def run_command(cmd, timeout = nil)
     exec_cmd = cmd =~ /^rspec/ ? "bin/#{cmd}" : cmd
     # Ensure bundler env vars are unset
     unset_bundler_env_vars
-    # Ensure the correct Gemfile is found
+    # Ensure the correct Gemfile and binstubs are found
     in_current_directory do
-      super(exec_cmd, timeout)
+      with_unbundled_env do
+        super(exec_cmd, timeout)
+      end
+    end
+  end
+
+  def unset_bundler_env_vars
+    empty_env = with_environment { with_unbundled_env { ENV.to_h } }
+    aruba_env = aruba.environment.to_h
+    (aruba_env.keys - empty_env.keys).each do |key|
+      delete_environment_variable key
+    end
+    empty_env.each do |k, v|
+      set_environment_variable k, v
+    end
+  end
+
+  def with_unbundled_env
+    if Bundler.respond_to?(:with_unbundled_env)
+      Bundler.with_unbundled_env { yield }
+    else
+      Bundler.with_clean_env { yield }
     end
   end
 end

diff --git a/script/after_update_travis_build.sh b/script/after_update_travis_build.sh
@@ -3,3 +3,6 @@ set -e
 
 echo "Restoring custom Travis config"
 mv .travis.yml{.update_backup,}
+
+echo "Removing Base rubocop, Rspec-Rails does not use it"
+rm '.rubocop_rspec_base.yml'
diff --git a/script/clone_all_rspec_repos b/script/clone_all_rspec_repos
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2019-07-24T15:33:53+02:00 from the rspec-dev repo.
+# This file was generated on 2019-12-18T14:01:39+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.
 
 set -e

diff --git a/script/custom_build_functions.sh b/script/custom_build_functions.sh
@@ -1,6 +1,6 @@
 function run_cukes {
   if is_mri_192_plus; then
-    bin/rake acceptance --trace
+    (unset RUBYOPT; bin/rake acceptance --trace)
     return $?
   elif is_jruby; then
     bin/rake smoke:app

diff --git a/script/functions.sh b/script/functions.sh
@@ -1,12 +1,12 @@
-# This file was generated on 2019-07-24T15:33:53+02:00 from the rspec-dev repo.
+# This file was generated on 2019-12-18T14:01:39+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.
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source $SCRIPT_DIR/travis_functions.sh
 source $SCRIPT_DIR/predicate_functions.sh
 
 # If JRUBY_OPTS isn't set, use these.
-# see http://docs.travis-ci.com/user/ci-environment/
+# see https://docs.travis-ci.com/user/ci-environment/
 export JRUBY_OPTS=${JRUBY_OPTS:-"--server -Xcompile.invokedynamic=false"}
 SPECS_HAVE_RUN_FILE=specs.out
 MAINTENANCE_BRANCH=`cat maintenance-branch`
@@ -187,7 +187,9 @@ function run_all_spec_suites {
   fold "rspec-core specs" run_spec_suite_for "rspec-core"
   fold "rspec-expectations specs" run_spec_suite_for "rspec-expectations"
   fold "rspec-mocks specs" run_spec_suite_for "rspec-mocks"
-  fold "rspec-rails specs" run_spec_suite_for "rspec-rails"
+  if rspec_rails_compatible; then
+    fold "rspec-rails specs" run_spec_suite_for "rspec-rails"
+  fi
 
   if rspec_support_compatible; then
     fold "rspec-support specs" run_spec_suite_for "rspec-support"

diff --git a/script/predicate_functions.sh b/script/predicate_functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2019-07-24T15:33:53+02:00 from the rspec-dev repo.
+# This file was generated on 2019-12-18T14:01:39+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.
 
 function is_mri {
@@ -57,16 +57,16 @@ function is_mri_2plus {
   fi
 }
 
-function is_ruby_23 {
-  if ruby -e "exit(RUBY_VERSION.to_f == 2.3)"; then
+function is_ruby_23_plus {
+  if ruby -e "exit(RUBY_VERSION.to_f >= 2.3)"; then
     return 0
   else
     return 1
   fi
 }
 
-function is_ruby_23_plus {
-  if ruby -e "exit(RUBY_VERSION.to_f >= 2.3)"; then
+function rspec_rails_compatible {
+  if is_ruby_23_plus; then
     return 0
   else
     return 1

diff --git a/script/run_build b/script/run_build
@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2019-07-24T15:33:53+02:00 from the rspec-dev repo.
+# This file was generated on 2019-12-18T14:01:39+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.
 
 set -e

diff --git a/script/travis_functions.sh b/script/travis_functions.sh
@@ -1,4 +1,4 @@
-# This file was generated on 2019-07-24T15:33:53+02:00 from the rspec-dev repo.
+# This file was generated on 2019-12-18T14:01:39+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.
 
 # Taken from:

diff --git a/script/update_rubygems_and_install_bundler b/script/update_rubygems_and_install_bundler
@@ -1,13 +1,13 @@
 #!/bin/bash
-# This file was generated on 2019-07-24T15:33:53+02:00 from the rspec-dev repo.
+# This file was generated on 2019-12-18T14:01:39+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.
 
 set -e
 source script/functions.sh
 
 if is_ruby_23_plus; then
   yes | gem update --system
-  gem install bundler
+  yes | gem install bundler
 else
   echo "Warning installing older versions of Rubygems / Bundler"
   gem update --system '2.7.8'

diff --git a/spec/sanity_check_spec.rb b/spec/sanity_check_spec.rb
@@ -34,7 +34,7 @@ def with_clean_env
     end
   end
 
-  it "passes when libraries are required" do
+  it "passes when libraries are required", unless: RSpec::Support::Ruby.jruby? do
     script = tmp_root.join("pass_sanity_check")
     File.open(script, "w") do |f|
       f.write <<-EOF.gsub(/^\s+\|/, '')