Merge pull request #360 from rspec/update-travis-build-scripts-2018-12-25-for-master

Updates from rspec-dev (2018-12-25)

Author: JonRowe

.rubocop_rspec_base.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2018-12-21T13:15:34+00:00 from the rspec-dev repo.
+# This file was generated on 2018-12-25T18:01:30+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.
 
 # This file contains defaults for RSpec projects. Individual projects

.travis.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2018-12-21T13:15:34+00:00 from the rspec-dev repo.
+# This file was generated on 2018-12-25T18:01:30+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.
 
 language: ruby
@@ -25,6 +25,7 @@ rvm:
   - 2.3.8
   - 2.4.5
   - 2.5.3
+  - 2.6.0
   - ruby-head
   - ree
   - rbx-3

appveyor.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2018-12-21T13:15:34+00:00 from the rspec-dev repo.
+# This file was generated on 2018-12-25T18:01:30+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}"

script/clone_all_rspec_repos

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2018-12-21T13:15:34+00:00 from the rspec-dev repo.
+# This file was generated on 2018-12-25T18:01:30+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,4 +1,4 @@
-# This file was generated on 2018-12-21T13:15:34+00:00 from the rspec-dev repo.
+# This file was generated on 2018-12-25T18:01:30+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 )"

script/predicate_functions.sh

@@ -1,4 +1,4 @@
-# This file was generated on 2018-12-21T13:15:34+00:00 from the rspec-dev repo.
+# This file was generated on 2018-12-25T18:01:30+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 {

script/run_build

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2018-12-21T13:15:34+00:00 from the rspec-dev repo.
+# This file was generated on 2018-12-25T18:01:30+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 2018-12-21T13:15:34+00:00 from the rspec-dev repo.
+# This file was generated on 2018-12-25T18:01:30+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:

spec/rspec/support/source_spec.rb

@@ -79,10 +79,19 @@ module RSpec::Support
     describe '#nodes_by_line_number' do
       it 'returns a hash containing nodes for each line number' do
         expect(source.nodes_by_line_number).to match(
-          1 => [
-            an_object_having_attributes(:type => :@int),
-            an_object_having_attributes(:type => :@ident)
-          ],
+          1 =>
+            if RUBY_VERSION >= '2.6.0'
+              [
+                an_object_having_attributes(:type => :@int),
+                an_object_having_attributes(:type => :@period),
+                an_object_having_attributes(:type => :@ident)
+              ]
+            else
+              [
+                an_object_having_attributes(:type => :@int),
+                an_object_having_attributes(:type => :@ident)
+              ]
+            end,
           2 => [
             an_object_having_attributes(:type => :@ident),
             an_object_having_attributes(:type => :@ident)