chiu
/
google-api-ruby-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small fix to service account spec with JRuby >= 1.9

This commit is contained in:
Sérgio Gomes 2014-08-14 17:37:47 +01:00
parent 20e9a9bdc6
commit 73e58f3098
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spec/google/api_client/service_account_spec.rb
View File

@ -20,14 +20,18 @@ fixtures_path = File.expand_path('../../../fixtures', __FILE__)
describe Google::APIClient::KeyUtils do describe Google::APIClient::KeyUtils do
it 'should read PKCS12 files from the filesystem' 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) path = File.expand_path('files/privatekey.p12', fixtures_path)
key = Google::APIClient::KeyUtils.load_from_pkcs12(path, 'notasecret') key = Google::APIClient::KeyUtils.load_from_pkcs12(path, 'notasecret')
expect(key).not_to eq(nil) expect(key).not_to eq(nil)
end end
it 'should read PKCS12 files from loaded files' do 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) path = File.expand_path('files/privatekey.p12', fixtures_path)
content = File.read(path) content = File.read(path)
key = Google::APIClient::KeyUtils.load_from_pkcs12(content, 'notasecret') key = Google::APIClient::KeyUtils.load_from_pkcs12(content, 'notasecret')