google-api-client 0.7.1 → 0.8.0

data/spec/google/api_client/simple_file_store_spec.rb

@@ -18,14 +18,10 @@ require 'spec_helper'
 
 require 'google/api_client/service/simple_file_store'
 
-describe Google::APIClient::Service::SimpleFileStore do
+RSpec.describe Google::APIClient::Service::SimpleFileStore do
 
   FILE_NAME = 'test.cache'
 
-  before(:all) do
-    File.delete(FILE_NAME) if File.exists?(FILE_NAME)
-  end
-
   describe 'with no cache file' do
     before(:each) do
       File.delete(FILE_NAME) if File.exists?(FILE_NAME)
@@ -33,35 +29,35 @@ describe Google::APIClient::Service::SimpleFileStore do
     end
 
     it 'should return nil when asked if a key exists' do
-      @cache.exist?('invalid').should be_nil
-      File.exists?(FILE_NAME).should be_false
+      expect(@cache.exist?('invalid')).to be_nil
+      expect(File.exists?(FILE_NAME)).to be_falsey
     end
 
     it 'should return nil when asked to read a key' do
-      @cache.read('invalid').should be_nil
-      File.exists?(FILE_NAME).should be_false
+      expect(@cache.read('invalid')).to be_nil
+      expect(File.exists?(FILE_NAME)).to be_falsey
     end
 
     it 'should return nil when asked to fetch a key' do
-      @cache.fetch('invalid').should be_nil
-      File.exists?(FILE_NAME).should be_false
+      expect(@cache.fetch('invalid')).to be_nil
+      expect(File.exists?(FILE_NAME)).to be_falsey
     end
 
     it 'should create a cache file when asked to fetch a key with a default' do
-      @cache.fetch('new_key') do
+      expect(@cache.fetch('new_key') do
         'value'
-      end.should == 'value'
-      File.exists?(FILE_NAME).should be_true
+      end).to eq('value')
+      expect(File.exists?(FILE_NAME)).to be_truthy
     end
 
     it 'should create a cache file when asked to write a key' do
       @cache.write('new_key', 'value')
-      File.exists?(FILE_NAME).should be_true
+      expect(File.exists?(FILE_NAME)).to be_truthy
     end
 
     it 'should return nil when asked to delete a key' do
-      @cache.delete('invalid').should be_nil
-      File.exists?(FILE_NAME).should be_false
+      expect(@cache.delete('invalid')).to be_nil
+      expect(File.exists?(FILE_NAME)).to be_falsey
     end
   end
 
@@ -73,61 +69,61 @@ describe Google::APIClient::Service::SimpleFileStore do
     end
 
     it 'should return true when asked if an existing key exists' do
-      @cache.exist?('existing_key').should be_true
+      expect(@cache.exist?('existing_key')).to be_truthy
     end
 
     it 'should return false when asked if a nonexistent key exists' do
-      @cache.exist?('invalid').should be_false
+      expect(@cache.exist?('invalid')).to be_falsey
     end
 
     it 'should return the value for an existing key when asked to read it' do
-      @cache.read('existing_key').should == 'existing_value'
+      expect(@cache.read('existing_key')).to eq('existing_value')
     end
 
     it 'should return nil for a nonexistent key when asked to read it' do
-      @cache.read('invalid').should be_nil
+      expect(@cache.read('invalid')).to be_nil
     end
 
     it 'should return the value for an existing key when asked to read it' do
-      @cache.read('existing_key').should == 'existing_value'
+      expect(@cache.read('existing_key')).to eq('existing_value')
     end
 
     it 'should return nil for a nonexistent key when asked to fetch it' do
-      @cache.fetch('invalid').should be_nil
+      expect(@cache.fetch('invalid')).to be_nil
     end
 
     it 'should return and save the default value for a nonexistent key when asked to fetch it with a default' do
-      @cache.fetch('new_key') do
+      expect(@cache.fetch('new_key') do
         'value'
-      end.should == 'value'
-      @cache.read('new_key').should == 'value'
+      end).to eq('value')
+      expect(@cache.read('new_key')).to eq('value')
     end
 
     it 'should remove an existing value and return true when asked to delete it' do
-      @cache.delete('existing_key').should be_true
-      @cache.read('existing_key').should be_nil
+      expect(@cache.delete('existing_key')).to be_truthy
+      expect(@cache.read('existing_key')).to be_nil
     end
 
     it 'should return false when asked to delete a nonexistent key' do
-      @cache.delete('invalid').should be_false
+      expect(@cache.delete('invalid')).to be_falsey
     end
 
     it 'should convert keys to strings when storing them' do
       @cache.write(:symbol_key, 'value')
-      @cache.read('symbol_key').should == 'value'
+      expect(@cache.read('symbol_key')).to eq('value')
     end
 
     it 'should convert keys to strings when reading them' do
-      @cache.read(:existing_key).should == 'existing_value'
+      expect(@cache.read(:existing_key)).to eq('existing_value')
     end
 
     it 'should convert keys to strings when fetching them' do
-      @cache.fetch(:existing_key).should == 'existing_value'
+      expect(@cache.fetch(:existing_key)).to eq('existing_value')
     end
 
     it 'should convert keys to strings when deleting them' do
-      @cache.delete(:existing_key).should be_true
-      @cache.read('existing_key').should be_nil
+      expect(@cache.delete(:existing_key)).to be_truthy
+      expect(@cache.read('existing_key')).to be_nil
     end
   end
 

data/spec/google/api_client_spec.rb

@@ -17,26 +17,25 @@ require 'spec_helper'
 require 'faraday'
 require 'signet/oauth_1/client'
 require 'google/api_client'
-require 'google/api_client/version'
 
 shared_examples_for 'configurable user agent' do
   include ConnectionHelpers
-  
+
   it 'should allow the user agent to be modified' do
     client.user_agent = 'Custom User Agent/1.2.3'
-    client.user_agent.should == 'Custom User Agent/1.2.3'
+    expect(client.user_agent).to eq('Custom User Agent/1.2.3')
   end
 
   it 'should allow the user agent to be set to nil' do
     client.user_agent = nil
-    client.user_agent.should == nil
+    expect(client.user_agent).to eq(nil)
   end
 
   it 'should not allow the user agent to be used with bogus values' do
-    (lambda do
+    expect(lambda do
       client.user_agent = 42
       client.execute(:uri=>'https://www.google.com/')
-    end).should raise_error(TypeError)
+    end).to raise_error(TypeError)
   end
 
   it 'should transmit a User-Agent header when sending requests' do
@@ -45,8 +44,8 @@ shared_examples_for 'configurable user agent' do
     conn = stub_connection do |stub|
       stub.get('/') do |env|
         headers = env[:request_headers]
-        headers.should have_key('User-Agent')
-        headers['User-Agent'].should == client.user_agent
+        expect(headers).to have_key('User-Agent')
+        expect(headers['User-Agent']).to eq(client.user_agent)
         [200, {}, ['']]
       end
     end
@@ -55,17 +54,22 @@ shared_examples_for 'configurable user agent' do
   end
 end
 
-describe Google::APIClient do
+RSpec.describe Google::APIClient do
   include ConnectionHelpers
 
   let(:client) { Google::APIClient.new(:application_name => 'API Client Tests') }
 
+  it "should pass the faraday options provided on initialization to FaraDay configuration block" do
+    client = Google::APIClient.new(faraday_option: {timeout: 999})
+    expect(client.connection.options.timeout).to be == 999
+  end
+
   it 'should make its version number available' do
-    Google::APIClient::VERSION::STRING.should be_instance_of(String)
+    expect(Google::APIClient::VERSION::STRING).to be_instance_of(String)
   end
 
   it 'should default to OAuth 2' do
-    Signet::OAuth2::Client.should === client.authorization
+    expect(Signet::OAuth2::Client).to be === client.authorization
   end
 
   describe 'configure for no authentication' do
@@ -74,7 +78,7 @@ describe Google::APIClient do
     end
     it_should_behave_like 'configurable user agent'
   end
-    
+
   describe 'configured for OAuth 1' do
     before do
       client.authorization = :oauth_1
@@ -83,15 +87,17 @@ describe Google::APIClient do
     end
 
     it 'should use the default OAuth1 client configuration' do
-      client.authorization.temporary_credential_uri.to_s.should ==
+      expect(client.authorization.temporary_credential_uri.to_s).to eq(
         'https://www.google.com/accounts/OAuthGetRequestToken'
-      client.authorization.authorization_uri.to_s.should include(
+      )
+      expect(client.authorization.authorization_uri.to_s).to include(
         'https://www.google.com/accounts/OAuthAuthorizeToken'
       )
-      client.authorization.token_credential_uri.to_s.should ==
+      expect(client.authorization.token_credential_uri.to_s).to eq(
         'https://www.google.com/accounts/OAuthGetAccessToken'
-      client.authorization.client_credential_key.should == 'anonymous'
-      client.authorization.client_credential_secret.should == 'anonymous'
+      )
+      expect(client.authorization.client_credential_key).to eq('anonymous')
+      expect(client.authorization.client_credential_secret).to eq('anonymous')
     end
 
     it_should_behave_like 'configurable user agent'
@@ -106,14 +112,14 @@ describe Google::APIClient do
     # TODO
     it_should_behave_like 'configurable user agent'
   end
-  
+
   describe 'when executing requests' do
     before do
       @prediction = client.discovered_api('prediction', 'v1.2')
       client.authorization = :oauth_2
       @connection = stub_connection do |stub|
         stub.post('/prediction/v1.2/training?data=12345') do |env|
-          env[:request_headers]['Authorization'].should == 'Bearer 12345'
+          expect(env[:request_headers]['Authorization']).to eq('Bearer 12345')
           [200, {}, '{}']
         end
       end
@@ -122,10 +128,10 @@ describe Google::APIClient do
     after do
       @connection.verify
     end
-    
+
     it 'should use default authorization' do
       client.authorization.access_token = "12345"
-      client.execute(  
+      client.execute(
         :api_method => @prediction.training.insert,
         :parameters => {'data' => '12345'},
         :connection => @connection
@@ -135,14 +141,14 @@ describe Google::APIClient do
     it 'should use request scoped authorization when provided' do
       client.authorization.access_token = "abcdef"
       new_auth = Signet::OAuth2::Client.new(:access_token => '12345')
-      client.execute(  
+      client.execute(
         :api_method => @prediction.training.insert,
         :parameters => {'data' => '12345'},
         :authorization => new_auth,
         :connection => @connection
       )
     end
-    
+
     it 'should accept options with batch/request style execute' do
       client.authorization.access_token = "abcdef"
       new_auth = Signet::OAuth2::Client.new(:access_token => '12345')
@@ -156,19 +162,19 @@ describe Google::APIClient do
         :connection => @connection
       )
     end
-    
-    
+
+
     it 'should accept options in array style execute' do
        client.authorization.access_token = "abcdef"
        new_auth = Signet::OAuth2::Client.new(:access_token => '12345')
-       client.execute(  
+       client.execute(
          @prediction.training.insert, {'data' => '12345'}, '', {},
-         { :authorization => new_auth, :connection => @connection }         
+         { :authorization => new_auth, :connection => @connection }
        )
      end
-  end  
+  end
 
-  describe 'when retiries enabled' do
+  describe 'when retries enabled' do
     before do
       client.retries = 2
     end
@@ -176,7 +182,7 @@ describe Google::APIClient do
     after do
       @connection.verify
     end
-    
+
     it 'should follow redirects' do
       client.authorization = nil
       @connection = stub_connection do |stub|
@@ -189,12 +195,12 @@ describe Google::APIClient do
       end
 
       client.execute(  
-        :uri => 'https://www.gogole.com/foo',
+        :uri => 'https://www.google.com/foo',
         :connection => @connection
       )
     end
 
-    it 'should refresh tokens on 401 tokens' do
+    it 'should refresh tokens on 401 errors' do
       client.authorization.access_token = '12345'
       expect(client.authorization).to receive(:fetch_access_token!)
 
@@ -208,11 +214,45 @@ describe Google::APIClient do
       end
 
       client.execute(  
-        :uri => 'https://www.gogole.com/foo',
+        :uri => 'https://www.google.com/foo',
+        :connection => @connection
+      )
+    end
+
+
+    it 'should not attempt multiple token refreshes' do
+      client.authorization.access_token = '12345'
+      expect(client.authorization).to receive(:fetch_access_token!).once
+
+      @connection = stub_connection do |stub|
+        stub.get('/foo') do |env|
+          [401, {}, '{}']
+        end
+      end
+
+      client.execute(  
+        :uri => 'https://www.google.com/foo',
         :connection => @connection
       )
     end
 
+    it 'should not retry on client errors' do
+      count = 0
+      @connection = stub_connection do |stub|
+        stub.get('/foo') do |env|
+          expect(count).to eq(0)
+          count += 1
+          [403, {}, '{}']
+        end
+      end
+
+      client.execute(  
+        :uri => 'https://www.google.com/foo',
+        :connection => @connection,
+        :authenticated => false
+      )
+    end
+
     it 'should retry on 500 errors' do
       client.authorization = nil
 
@@ -225,10 +265,10 @@ describe Google::APIClient do
         end
       end
 
-      client.execute(  
-        :uri => 'https://www.gogole.com/foo',
+      expect(client.execute(  
+        :uri => 'https://www.google.com/foo',
         :connection => @connection
-      ).status.should == 200
+      ).status).to eq(200)
 
     end
 
@@ -242,12 +282,71 @@ describe Google::APIClient do
         end
       end
 
-      client.execute(  
+      expect(client.execute(  
+        :uri => 'https://www.google.com/foo',
+        :connection => @connection
+      ).status).to eq(500)
+      expect(count).to eq(3)
+    end
+
+  end
+
+  describe 'when retries disabled and expired_auth_retry on (default)' do
+    before do
+      client.retries = 0
+    end
+
+    after do
+      @connection.verify
+    end
+
+    it 'should refresh tokens on 401 errors' do
+      client.authorization.access_token = '12345'
+      expect(client.authorization).to receive(:fetch_access_token!)
+
+      @connection = stub_connection do |stub|
+        stub.get('/foo') do |env|
+          [401, {}, '{}']
+        end
+        stub.get('/foo') do |env|
+          [200, {}, '{}']
+        end
+      end
+
+      client.execute(
         :uri => 'https://www.gogole.com/foo',
         :connection => @connection
-      ).status.should == 500
-      count.should == 3
+      )
+    end
+
+  end
+
+  describe 'when retries disabled and expired_auth_retry off' do
+    before do
+      client.retries = 0
+      client.expired_auth_retry = false
+    end
+
+    it 'should not refresh tokens on 401 errors' do
+      client.authorization.access_token = '12345'
+      expect(client.authorization).not_to receive(:fetch_access_token!)
+
+      @connection = stub_connection do |stub|
+        stub.get('/foo') do |env|
+          [401, {}, '{}']
+        end
+        stub.get('/foo') do |env|
+          [200, {}, '{}']
+        end
+      end
+
+      resp = client.execute(
+        :uri => 'https://www.gogole.com/foo',
+        :connection => @connection
+      )
+
+      expect(resp.response.status).to be == 401
     end
 
-  end  
+  end
 end