Merge pull request #2244 from rspec/update-travis-build-scripts-2019-12-20-for-master

Update travis build scripts 2019 12 20 for master

Author: JonRowe

Gemfile-rails-dependencies

@@ -43,6 +43,12 @@ else
   if version >= '5-1-stable' && RUBY_VERSION  >= "2.2"
     gem "puma"
   end
+
+  if version.gsub(/[^\d\.]/,'').to_f >= 6.0
+    gem "activerecord-jdbcsqlite3-adapter", "~> 60.0.rc1", platforms: [:jruby]
+  else
+    gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
+  end
 end
 
 gem "i18n", '< 0.7.0' if RUBY_VERSION < '1.9.3'

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}"

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)

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'

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

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"

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 {
@@ -69,16 +69,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

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

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:

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
-  gem update --system
-  gem install bundler
+  yes | gem update --system
+  yes | gem install bundler
 else
   echo "Warning installing older versions of Rubygems / Bundler"
   gem update --system '2.7.8'

spec/sanity_check_spec.rb

@@ -26,7 +26,7 @@
     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+\|/, '')