From: Sérgio Gomes <sgomes@google.com>
Date: Thu, 14 Aug 2014 16:37:47 +0000 (+0100)
Subject: Small fix to service account spec with JRuby >= 1.9
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/73e58f3098534db6250da2a1b567636f926bb909?hp=20e9a9bdc6c209c579f8bb47af9cd3713cfd339b

Small fix to service account spec with JRuby >= 1.9
---

diff --git a/spec/google/api_client/service_account_spec.rb b/spec/google/api_client/service_account_spec.rb
index c1dd8754ca..f700dfe19d 100644
--- a/spec/google/api_client/service_account_spec.rb
+++ b/spec/google/api_client/service_account_spec.rb
@@ -20,14 +20,18 @@ fixtures_path = File.expand_path('../../../fixtures', __FILE__)
 
 describe Google::APIClient::KeyUtils do
   it 'should read PKCS12 files from the filesystem' do
-    pending "Reading from PKCS12 not supported on jruby" if RUBY_PLATFORM == 'java'
+    if RUBY_PLATFORM == 'java' && RUBY_VERSION.start_with?('1.8')
+      pending "Reading from PKCS12 not supported on jruby 1.8.x"
+    end
     path =  File.expand_path('files/privatekey.p12', fixtures_path)
     key = Google::APIClient::KeyUtils.load_from_pkcs12(path, 'notasecret')
     expect(key).not_to eq(nil)
   end
 
   it 'should read PKCS12 files from loaded files' do
-    pending "Reading from PKCS12 not supported on jruby" if RUBY_PLATFORM == 'java'
+    if RUBY_PLATFORM == 'java' && RUBY_VERSION.start_with?('1.8')
+      pending "Reading from PKCS12 not supported on jruby 1.8.x"
+    end
     path =  File.expand_path('files/privatekey.p12', fixtures_path)
     content = File.read(path)
     key = Google::APIClient::KeyUtils.load_from_pkcs12(content, 'notasecret')