Merge pull request #2147 from rspec/update-travis-build-scripts-2016-01-01-for-master

Updates from rspec-dev (2016-01-01)

Author: yujinakayama

.rubocop_rspec_base.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2015-10-13T18:52:08-07:00 from the rspec-dev repo.
+# This file was generated on 2016-01-01T10:42:16+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 2015-10-13T18:52:08-07:00 from the rspec-dev repo.
+# This file was generated on 2016-01-01T10:42:16+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
@@ -19,6 +19,7 @@ rvm:
   - 2.0.0
   - 2.1
   - 2.2
+  - 2.3.0
   - ruby-head
   - ree
   - rbx

appveyor.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2015-10-13T18:52:08-07:00 from the rspec-dev repo.
+# This file was generated on 2016-01-01T10:42:16+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/core/metadata.rb

@@ -47,7 +47,9 @@ def self.relative_path(line)
         return nil if line == '-e:1'.freeze
         line
       rescue SecurityError
+        # :nocov:
         nil
+        # :nocov:
       end
 
       # @private

script/clone_all_rspec_repos

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2015-10-13T18:52:08-07:00 from the rspec-dev repo.
+# This file was generated on 2016-01-01T10:42:16+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 2015-10-13T18:52:08-07:00 from the rspec-dev repo.
+# This file was generated on 2016-01-01T10:42:16+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 2015-10-13T18:52:08-07:00 from the rspec-dev repo.
+# This file was generated on 2016-01-01T10:42:16+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 2015-10-13T18:52:08-07:00 from the rspec-dev repo.
+# This file was generated on 2016-01-01T10:42:16+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 2015-10-13T18:52:08-07:00 from the rspec-dev repo.
+# This file was generated on 2016-01-01T10:42:16+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/core/formatters/exception_presenter_spec.rb

@@ -464,9 +464,9 @@ def read_failed_lines
         let(:exception) { instance_double(Exception, :backtrace => [ "#{__FILE__}:#{__LINE__}"]) }
 
         it "is handled gracefully" do
-          with_safe_set_to_level_that_triggers_security_errors do
-            expect { read_failed_lines }.not_to raise_error
-          end
+          expect {
+            with_safe_set_to_level_that_triggers_security_errors { read_failed_lines }
+          }.not_to raise_error
         end
       end
 

spec/rspec/core/formatters/html_snippet_extractor_spec.rb

@@ -13,9 +13,8 @@ module Formatters
         end
 
         it "falls back on a default message when it gets a security error" do
-          message = nil
-          with_safe_set_to_level_that_triggers_security_errors do
-            message = RSpec::Core::Formatters::HtmlSnippetExtractor.new.lines_around("blech", 8)
+          message = with_safe_set_to_level_that_triggers_security_errors do
+            RSpec::Core::Formatters::HtmlSnippetExtractor.new.lines_around("blech".taint, 8)
           end
           expect(message).to eq("# Couldn't get snippet for blech")
         end

spec/rspec/core/metadata_spec.rb

@@ -17,11 +17,13 @@ module Core
         it "gracefully returns nil if run in a secure thread" do
           # Ensure our call to `File.expand_path` is not cached as that is the insecure operation.
           Metadata.instance_eval { @relative_path_regex = nil }
-          with_safe_set_to_level_that_triggers_security_errors do
-            value = Metadata.relative_path(".")
-            # on some rubies, File.expand_path is not a security error, so accept "." as well
-            expect([nil, "."]).to include(value)
+
+          value = with_safe_set_to_level_that_triggers_security_errors do
+            Metadata.relative_path(".")
           end
+
+          # on some rubies, File.expand_path is not a security error, so accept "." as well
+          expect([nil, "."]).to include(value)
         end
 
         it 'should not transform directories beginning with the same prefix' do

spec/support/helper_methods.rb

@@ -14,15 +14,19 @@ def ignoring_warnings
   end
 
   def with_safe_set_to_level_that_triggers_security_errors
+    result = nil
+
     Thread.new do
       ignoring_warnings { $SAFE = SAFE_LEVEL_THAT_TRIGGERS_SECURITY_ERRORS }
-      yield
+      result = yield
     end.join
 
     # $SAFE is not supported on Rubinius
     unless defined?(Rubinius)
       expect($SAFE).to eql 0 # $SAFE should not have changed in this thread.
     end
+
+    result
   end
 
 end