[core] Syncing older travis changes

This commit was imported from rspec/rspec-core@b91a276.
yujinakayama · Dec 28, 2019 · c91b197 · c91b197
1 parent 7a3749e
commit c91b197
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/rspec-core/script/functions.sh b/rspec-core/script/functions.sh
@@ -6,7 +6,7 @@ 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,10 @@ 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/rspec-core/script/predicate_functions.sh b/rspec-core/script/predicate_functions.sh
@@ -77,6 +77,14 @@ function is_ruby_23_plus {
   fi
 }
 
+function rspec_rails_compatible {
+  if is_ruby_23_plus; then
+    return 0
+  else
+    return 1
+  fi
+}
+
 function rspec_support_compatible {
   if [ "$MAINTENANCE_BRANCH" != "2-99-maintenance" ] && [ "$MAINTENANCE_BRANCH" != "2-14-maintenance" ]; then
     return 0

diff --git a/rspec-core/script/update_rubygems_and_install_bundler b/rspec-core/script/update_rubygems_and_install_bundler
@@ -6,8 +6,8 @@ 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'