From 21c786e856a9cf3c211468edf12825b390da7b6a Mon Sep 17 00:00:00 2001
From: Teddy Wing
Date: Tue, 14 Nov 2017 16:38:52 +0100
Subject: schema_spec: Use Ruby 2.2-compatible heredoc

Apparently the Jenkins server runs Ruby 2.2.0.

Sample log output:

    /usr/bin/ruby2.2 -I/var/lib/jenkins/workspace/stif-boiv-branches/vendor/bundle-201746/ruby/2.2.0/gems/rspec-core-3.5.4/lib:/var/lib/jenkins/workspace/stif-boiv-branches/vendor/bundle-201746/ruby/2.2.0/gems/rspec-support-3.5.0/lib /var/lib/jenkins/workspace/stif-boiv-branches/vendor/bundle-201746/ruby/2.2.0/gems/rspec-core-3.5.4/exe/rspec --pattern spec/\*\*\{,/\*/\*\*\}/\*_spec.rb

WTF? I thought we were all using Ruby 2.3.

Here's the error:

    /var/lib/jenkins/workspace/stif-boiv-branches/spec/db/schema_spec.rb:38: syntax error, unexpected << (SyntaxError)
        <<~EOS
          ^
    /var/lib/jenkins/workspace/stif-boiv-branches/spec/db/schema_spec.rb:40: syntax error, unexpected ':', expecting keyword_end
          Diff: #{diff}
               ^

Convert the tilde-heredoc to a dash-heredoc to make Jenkins happy.

Refs #4951
---
 spec/db/schema_spec.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'spec/db')

diff --git a/spec/db/schema_spec.rb b/spec/db/schema_spec.rb
index 92c553205..b06e27bc7 100644
--- a/spec/db/schema_spec.rb
+++ b/spec/db/schema_spec.rb
@@ -35,9 +35,9 @@ RSpec::Matchers.define :use_bigint_keys do
   end
 
   failure_message do |filename|
-    <<~EOS
-      expected #{filename.inspect} to use bigint keys
-      Diff: #{diff}
+    <<-EOS
+expected #{filename.inspect} to use bigint keys
+Diff: #{diff}
     EOS
   end
 
-- 
cgit v1.2.3