Merge pull request #326 from rspec/update-travis-build-scripts-2017-08-10-for-master

Updates from rspec-dev (2017-08-10)

Author: yujinakayama

.rubocop_rspec_base.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2017-07-15T20:27:05+07:00 from the rspec-dev repo.
+# This file was generated on 2017-08-10T01:31:46+09: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

.travis.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2017-07-15T20:27:05+07:00 from the rspec-dev repo.
+# This file was generated on 2017-08-10T01:31:46+09:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 language: ruby
@@ -28,16 +28,18 @@ rvm:
   - rbx
   - jruby
   - jruby-head
-  - jruby-18mode
-  - jruby-9.1.2.0
+  - jruby-1.7
+env:
+  - JRUBY_OPTS='--dev'
 matrix:
+  include:
+    - rvm: jruby-1.7
+      env: JRUBY_OPTS='--dev --1.8'
   allow_failures:
     - rvm: jruby-head
     - rvm: ruby-head
     - rvm: rbx
   fast_finish: true
-env:
-  - JRUBY_OPTS='--dev'
 branches:
   only:
     - master

appveyor.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2017-07-15T20:27:05+07:00 from the rspec-dev repo.
+# This file was generated on 2017-08-10T01:31:46+09: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}"

lib/rspec/support/ruby_features.rb

@@ -80,9 +80,9 @@ def supports_exception_cause?
 
       if Ruby.jruby?
         ripper_requirements.push(Ruby.jruby_version >= '1.7.5')
-        # Ripper on JRuby 9.0.0.0.rc1 or later reports wrong line number
+        # Ripper on JRuby 9.0.0.0.rc1 - 9.1.8.0 reports wrong line number
         # or cannot parse source including `:if`.
-        ripper_requirements.push(Ruby.jruby_version < '9.0.0.0.rc1')
+        ripper_requirements.push(!Ruby.jruby_version.between?('9.0.0.0.rc1', '9.1.8.0'))
       end
 
       if ripper_requirements.all?

script/clone_all_rspec_repos

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2017-07-15T20:27:05+07:00 from the rspec-dev repo.
+# This file was generated on 2017-08-10T01:31:46+09: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,4 +1,4 @@
-# This file was generated on 2017-07-15T20:27:05+07:00 from the rspec-dev repo.
+# This file was generated on 2017-08-10T01:31:46+09: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 )"

script/predicate_functions.sh

@@ -1,4 +1,4 @@
-# This file was generated on 2017-07-15T20:27:05+07:00 from the rspec-dev repo.
+# This file was generated on 2017-08-10T01:31:46+09: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 {

script/run_build

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2017-07-15T20:27:05+07:00 from the rspec-dev repo.
+# This file was generated on 2017-08-10T01:31:46+09: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 2017-07-15T20:27:05+07:00 from the rspec-dev repo.
+# This file was generated on 2017-08-10T01:31:46+09: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:

spec/rspec/support/object_formatter_spec.rb

@@ -93,6 +93,11 @@ def with_date_loaded
           it 'includes a conventional representation of the decimal' do
             in_sub_process_if_possible do
               require 'bigdecimal'
+              # Suppress warning on JRuby 1.7:
+              #   file:/Users/me/.rbenv/versions/jruby-1.7.26/lib/jruby.jar!/jruby/bigdecimal.rb:1
+              #   warning: loading in progress, circular require considered harmful - bigdecimal.jar
+              $stderr.reset!
+
               expect(formatted_decimal).to include('3.3 (#<BigDecimal')
             end
           end
@@ -136,6 +141,11 @@ def with_delegate_loaded
           it 'formats the underlying object normally' do
             with_delegate_loaded do
               require 'bigdecimal'
+              # Suppress warning on JRuby 1.7:
+              #   file:/Users/me/.rbenv/versions/jruby-1.7.26/lib/jruby.jar!/jruby/bigdecimal.rb:1
+              #   warning: loading in progress, circular require considered harmful - bigdecimal.jar
+              $stderr.reset!
+
               expect(ObjectFormatter.format(delegator)).to eq "#<SimpleDelegator(#{formatted_decimal})>"
             end
           end