X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/925f2b7278f0ff5945b039d8050b8560dba72043..f421551018ebf25f3a9896abbeabcf6918d63e09:/spec/google/api_client/discovery_spec.rb

diff --git a/spec/google/api_client/discovery_spec.rb b/spec/google/api_client/discovery_spec.rb
index f57055fa9c..9b8f0b7151 100644
--- a/spec/google/api_client/discovery_spec.rb
+++ b/spec/google/api_client/discovery_spec.rb
@@ -17,236 +17,326 @@
 
 require 'spec_helper'
 
-gem 'faraday', '~> 0.7.0'
 require 'faraday'
 require 'faraday/utils'
 require 'multi_json'
-
-gem 'signet', '~> 0.3.0'
+require 'compat/multi_json'
 require 'signet/oauth_1/client'
-
 require 'google/api_client'
 require 'google/api_client/version'
 
+def TestHandler
+  def initialize(&block)
+    @block = block
+  end
+  
+  def call(env)
+    @block.call(env)
+  end
+end
+
+def mock_connection(&block)
+    connection = Faraday.new do |builder|
+      use TestHandler block
+  end
+end
+
 describe Google::APIClient do
-  before do
-    @client = Google::APIClient.new
+  include ConnectionHelpers
+  CLIENT = Google::APIClient.new(:application_name => 'API Client Tests') unless defined?(CLIENT)
+
+  after do
+    # Reset client to not-quite-pristine state
+    CLIENT.key = nil
+    CLIENT.user_ip = nil
   end
 
   it 'should raise a type error for bogus authorization' do
     (lambda do
-      Google::APIClient.new(:authorization => 42)
+      Google::APIClient.new(:application_name => 'API Client Tests', :authorization => 42)
     end).should raise_error(TypeError)
   end
 
   it 'should not be able to retrieve the discovery document for a bogus API' do
     (lambda do
-      @client.discovery_document('bogus')
+      CLIENT.discovery_document('bogus')
     end).should raise_error(Google::APIClient::TransmissionError)
     (lambda do
-      @client.discovered_api('bogus')
+      CLIENT.discovered_api('bogus')
     end).should raise_error(Google::APIClient::TransmissionError)
   end
 
   it 'should raise an error for bogus services' do
     (lambda do
-      @client.discovered_api(42)
+      CLIENT.discovered_api(42)
     end).should raise_error(TypeError)
   end
 
   it 'should raise an error for bogus services' do
     (lambda do
-      @client.preferred_version(42)
+      CLIENT.preferred_version(42)
     end).should raise_error(TypeError)
   end
 
   it 'should raise an error for bogus methods' do
     (lambda do
-      @client.generate_request(42)
+      CLIENT.execute(42)
     end).should raise_error(TypeError)
   end
 
   it 'should not return a preferred version for bogus service names' do
-    @client.preferred_version('bogus').should == nil
+    CLIENT.preferred_version('bogus').should == nil
   end
 
   describe 'with the prediction API' do
     before do
-      @client.authorization = nil
+      CLIENT.authorization = nil
       # The prediction API no longer exposes a v1, so we have to be
       # careful about looking up the wrong API version.
-      @prediction = @client.discovered_api('prediction', 'v1.2')
+      @prediction = CLIENT.discovered_api('prediction', 'v1.2')
     end
 
     it 'should correctly determine the discovery URI' do
-      @client.discovery_uri('prediction').should ===
+      CLIENT.discovery_uri('prediction').should ===
         'https://www.googleapis.com/discovery/v1/apis/prediction/v1/rest'
     end
 
     it 'should correctly determine the discovery URI if :user_ip is set' do
-      @client.user_ip = '127.0.0.1'
-      request = @client.generate_request(
+      CLIENT.user_ip = '127.0.0.1'
+      
+      conn = stub_connection do |stub|
+        stub.get('/discovery/v1/apis/prediction/v1.2/rest?userIp=127.0.0.1') do |env|
+        end
+      end
+      CLIENT.execute(
         :http_method => 'GET',
-        :uri => @client.discovery_uri('prediction', 'v1.2'),
-        :authenticated => false
-      )
-      request.to_env(Faraday.default_connection)[:url].should === (
-        'https://www.googleapis.com/discovery/v1/apis/prediction/v1.2/rest' +
-        '?userIp=127.0.0.1'
+        :uri => CLIENT.discovery_uri('prediction', 'v1.2'),
+        :authenticated => false,
+        :connection => conn
       )
+      conn.verify
     end
 
     it 'should correctly determine the discovery URI if :key is set' do
-      @client.key = 'qwerty'
-      request = @client.generate_request(
+      CLIENT.key = 'qwerty'
+      conn = stub_connection do |stub|
+        stub.get('/discovery/v1/apis/prediction/v1.2/rest?key=qwerty') do |env|
+        end
+      end
+      request = CLIENT.execute(
         :http_method => 'GET',
-        :uri => @client.discovery_uri('prediction', 'v1.2'),
-        :authenticated => false
-      )
-      request.to_env(Faraday.default_connection)[:url].should === (
-        'https://www.googleapis.com/discovery/v1/apis/prediction/v1.2/rest' +
-        '?key=qwerty'
-      )
+        :uri => CLIENT.discovery_uri('prediction', 'v1.2'),
+        :authenticated => false,
+        :connection => conn
+        )
+        conn.verify
     end
 
     it 'should correctly determine the discovery URI if both are set' do
-      @client.key = 'qwerty'
-      @client.user_ip = '127.0.0.1'
-      request = @client.generate_request(
+      CLIENT.key = 'qwerty'
+      CLIENT.user_ip = '127.0.0.1'
+      conn = stub_connection do |stub|
+        stub.get('/discovery/v1/apis/prediction/v1.2/rest?key=qwerty&userIp=127.0.0.1') do |env|
+        end
+      end
+      request = CLIENT.execute(
         :http_method => 'GET',
-        :uri => @client.discovery_uri('prediction', 'v1.2'),
-        :authenticated => false
-      )
-      request.to_env(Faraday.default_connection)[:url].query_values.should == {
-        'key' => 'qwerty',
-        'userIp' => '127.0.0.1'
-      }
+        :uri => CLIENT.discovery_uri('prediction', 'v1.2'),
+        :authenticated => false,
+        :connection => conn
+        )
+        conn.verify
     end
 
     it 'should correctly generate API objects' do
-      @client.discovered_api('prediction', 'v1.2').name.should == 'prediction'
-      @client.discovered_api('prediction', 'v1.2').version.should == 'v1.2'
-      @client.discovered_api(:prediction, 'v1.2').name.should == 'prediction'
-      @client.discovered_api(:prediction, 'v1.2').version.should == 'v1.2'
+      CLIENT.discovered_api('prediction', 'v1.2').name.should == 'prediction'
+      CLIENT.discovered_api('prediction', 'v1.2').version.should == 'v1.2'
+      CLIENT.discovered_api(:prediction, 'v1.2').name.should == 'prediction'
+      CLIENT.discovered_api(:prediction, 'v1.2').version.should == 'v1.2'
     end
 
     it 'should discover methods' do
-      @client.discovered_method(
+      CLIENT.discovered_method(
         'prediction.training.insert', 'prediction', 'v1.2'
       ).name.should == 'insert'
-      @client.discovered_method(
+      CLIENT.discovered_method(
         :'prediction.training.insert', :prediction, 'v1.2'
       ).name.should == 'insert'
-      @client.discovered_method(
+      CLIENT.discovered_method(
         'prediction.training.delete', 'prediction', 'v1.2'
       ).name.should == 'delete'
     end
 
+    it 'should define the origin API in discovered methods' do
+      CLIENT.discovered_method(
+        'prediction.training.insert', 'prediction', 'v1.2'
+      ).api.name.should == 'prediction'
+    end
+
     it 'should not find methods that are not in the discovery document' do
-      @client.discovered_method(
+      CLIENT.discovered_method(
         'prediction.bogus', 'prediction', 'v1.2'
       ).should == nil
     end
 
     it 'should raise an error for bogus methods' do
       (lambda do
-        @client.discovered_method(42, 'prediction', 'v1.2')
+        CLIENT.discovered_method(42, 'prediction', 'v1.2')
       end).should raise_error(TypeError)
     end
 
     it 'should raise an error for bogus methods' do
       (lambda do
-        @client.generate_request(@client.discovered_api('prediction', 'v1.2'))
+        CLIENT.execute(:api_method => CLIENT.discovered_api('prediction', 'v1.2'))
       end).should raise_error(TypeError)
     end
 
     it 'should correctly determine the preferred version' do
-      @client.preferred_version('prediction').version.should_not == 'v1'
-      @client.preferred_version(:prediction).version.should_not == 'v1'
+      CLIENT.preferred_version('prediction').version.should_not == 'v1'
+      CLIENT.preferred_version(:prediction).version.should_not == 'v1'
+    end
+
+    it 'should return a batch path' do
+      CLIENT.discovered_api('prediction', 'v1.2').batch_path.should_not be_nil
     end
 
     it 'should generate valid requests' do
-      request = @client.generate_request(
+      conn = stub_connection do |stub|
+        stub.post('/prediction/v1.2/training?data=12345') do |env|
+          env[:body].should == ''
+        end
+      end
+      request = CLIENT.execute(
+        :api_method => @prediction.training.insert,
+        :parameters => {'data' => '12345'},
+        :connection => conn
+      )
+      conn.verify
+    end
+
+    it 'should generate valid requests when parameter value includes semicolon' do
+      conn = stub_connection do |stub|
+        # semicolon (;) in parameter value was being converted to 
+        # bare ampersand (&) in 0.4.7. ensure that it gets converted 
+        # to a CGI-escaped semicolon (%3B) instead.
+        stub.post('/prediction/v1.2/training?data=12345%3B67890') do |env|
+          env[:body].should == ''
+        end
+      end
+      request = CLIENT.execute(
         :api_method => @prediction.training.insert,
-        :parameters => {'data' => '12345', }
+        :parameters => {'data' => '12345;67890'},
+        :connection => conn
       )
-      request.method.should == :post
-      request.to_env(Faraday.default_connection)[:url].should ===
-        'https://www.googleapis.com/prediction/v1.2/training?data=12345'
-      request.headers.should be_empty
-      request.body.should == ''
+      conn.verify
     end
 
     it 'should generate valid requests when repeated parameters are passed' do
-      request = @client.generate_request(
+      pending("This is caused by Faraday's encoding of query parameters.")
+      conn = stub_connection do |stub|
+         stub.post('/prediction/v1.2/training?data=1&data=2') do |env|
+           env[:params]['data'].should include('1', '2')
+         end
+       end
+      request = CLIENT.execute(
         :api_method => @prediction.training.insert,
-        :parameters => [['data', '1'],['data','2']]
+        :parameters => [['data', '1'], ['data','2']],
+        :connection => conn
       )
-      request.method.should == :post
-      request.to_env(Faraday.default_connection)[:url].should ===
-        'https://www.googleapis.com/prediction/v1.2/training?data=1&data=2'
+      conn.verify
     end
 
     it 'should generate requests against the correct URIs' do
-      request = @client.generate_request(
+      conn = stub_connection do |stub|
+         stub.post('/prediction/v1.2/training?data=12345') do |env|
+         end
+       end
+      request = CLIENT.execute(
         :api_method => @prediction.training.insert,
-        :parameters => {'data' => '12345'}
+        :parameters => {'data' => '12345'},
+        :connection => conn
       )
-      request.to_env(Faraday.default_connection)[:url].should ===
-        'https://www.googleapis.com/prediction/v1.2/training?data=12345'
+      conn.verify
     end
 
     it 'should generate requests against the correct URIs' do
-      request = @client.generate_request(
+      conn = stub_connection do |stub|
+        stub.post('/prediction/v1.2/training?data=12345') do |env|
+        end
+      end
+      request = CLIENT.execute(
         :api_method => @prediction.training.insert,
-        :parameters => {'data' => '12345'}
+        :parameters => {'data' => '12345'},
+        :connection => conn
       )
-      request.to_env(Faraday.default_connection)[:url].should ===
-        'https://www.googleapis.com/prediction/v1.2/training?data=12345'
+      conn.verify
     end
 
     it 'should allow modification to the base URIs for testing purposes' do
-      prediction = @client.discovered_api('prediction', 'v1.2')
-      prediction.method_base =
-        'https://testing-domain.googleapis.com/prediction/v1.2/'
-      request = @client.generate_request(
-        :api_method => prediction.training.insert,
-        :parameters => {'data' => '123'}
-      )
-      request.to_env(Faraday.default_connection)[:url].should === (
-        'https://testing-domain.googleapis.com/' +
-        'prediction/v1.2/training?data=123'
+      # Using a new client instance here to avoid caching rebased discovery doc
+      prediction_rebase =
+        Google::APIClient.new(:application_name => 'API Client Tests').discovered_api('prediction', 'v1.2')
+      prediction_rebase.method_base =
+        'https://testing-domain.example.com/prediction/v1.2/'
+
+      conn = stub_connection do |stub|
+        stub.post('/prediction/v1.2/training') do |env|
+          env[:url].host.should == 'testing-domain.example.com'
+        end
+      end
+        
+      request = CLIENT.execute(
+        :api_method => prediction_rebase.training.insert,
+        :parameters => {'data' => '123'},
+        :connection => conn
       )
+      conn.verify
     end
 
     it 'should generate OAuth 1 requests' do
-      @client.authorization = :oauth_1
-      @client.authorization.token_credential_key = '12345'
-      @client.authorization.token_credential_secret = '12345'
-      request = @client.generate_request(
+      CLIENT.authorization = :oauth_1
+      CLIENT.authorization.token_credential_key = '12345'
+      CLIENT.authorization.token_credential_secret = '12345'
+
+      conn = stub_connection do |stub|
+        stub.post('/prediction/v1.2/training?data=12345') do |env|
+          env[:request_headers].should have_key('Authorization')
+          env[:request_headers]['Authorization'].should =~ /^OAuth/
+        end
+      end
+
+      request = CLIENT.execute(
         :api_method => @prediction.training.insert,
-        :parameters => {'data' => '12345'}
+        :parameters => {'data' => '12345'},
+        :connection => conn
       )
-      request.headers.should have_key('Authorization')
-      request.headers['Authorization'].should =~ /^OAuth/
+      conn.verify
     end
 
     it 'should generate OAuth 2 requests' do
-      @client.authorization = :oauth_2
-      @client.authorization.access_token = '12345'
-      request = @client.generate_request(
+      CLIENT.authorization = :oauth_2
+      CLIENT.authorization.access_token = '12345'
+
+      conn = stub_connection do |stub|
+        stub.post('/prediction/v1.2/training?data=12345') do |env|
+          env[:request_headers].should have_key('Authorization')
+          env[:request_headers]['Authorization'].should =~ /^Bearer/
+        end
+      end
+
+      request = CLIENT.execute(
         :api_method => @prediction.training.insert,
-        :parameters => {'data' => '12345'}
+        :parameters => {'data' => '12345'},
+        :connection => conn
       )
-      request.headers.should have_key('Authorization')
-      request.headers['Authorization'].should =~ /^Bearer/
+      conn.verify
     end
 
     it 'should not be able to execute improperly authorized requests' do
-      @client.authorization = :oauth_1
-      @client.authorization.token_credential_key = '12345'
-      @client.authorization.token_credential_secret = '12345'
-      result = @client.execute(
+      CLIENT.authorization = :oauth_1
+      CLIENT.authorization.token_credential_key = '12345'
+      CLIENT.authorization.token_credential_secret = '12345'
+      result = CLIENT.execute(
         @prediction.training.insert,
         {'data' => '12345'}
       )
@@ -254,9 +344,9 @@ describe Google::APIClient do
     end
 
     it 'should not be able to execute improperly authorized requests' do
-      @client.authorization = :oauth_2
-      @client.authorization.access_token = '12345'
-      result = @client.execute(
+      CLIENT.authorization = :oauth_2
+      CLIENT.authorization.access_token = '12345'
+      result = CLIENT.execute(
         @prediction.training.insert,
         {'data' => '12345'}
       )
@@ -265,10 +355,10 @@ describe Google::APIClient do
 
     it 'should not be able to execute improperly authorized requests' do
       (lambda do
-        @client.authorization = :oauth_1
-        @client.authorization.token_credential_key = '12345'
-        @client.authorization.token_credential_secret = '12345'
-        result = @client.execute!(
+        CLIENT.authorization = :oauth_1
+        CLIENT.authorization.token_credential_key = '12345'
+        CLIENT.authorization.token_credential_secret = '12345'
+        result = CLIENT.execute!(
           @prediction.training.insert,
           {'data' => '12345'}
         )
@@ -277,9 +367,9 @@ describe Google::APIClient do
 
     it 'should not be able to execute improperly authorized requests' do
       (lambda do
-        @client.authorization = :oauth_2
-        @client.authorization.access_token = '12345'
-        result = @client.execute!(
+        CLIENT.authorization = :oauth_2
+        CLIENT.authorization.access_token = '12345'
+        result = CLIENT.execute!(
           @prediction.training.insert,
           {'data' => '12345'}
         )
@@ -287,64 +377,79 @@ describe Google::APIClient do
     end
 
     it 'should correctly handle unnamed parameters' do
-      @client.authorization = :oauth_2
-      @client.authorization.access_token = '12345'
-      result = @client.execute(
-        @prediction.training.insert,
-        {},
-        MultiJson.dump({"id" => "bucket/object"}),
-        {'Content-Type' => 'application/json'}
+      conn = stub_connection do |stub|
+        stub.post('/prediction/v1.2/training') do |env|
+          env[:request_headers].should have_key('Content-Type')
+          env[:request_headers]['Content-Type'].should == 'application/json'
+        end
+      end
+      CLIENT.authorization = :oauth_2
+      CLIENT.authorization.access_token = '12345'
+      CLIENT.execute(
+        :api_method => @prediction.training.insert,
+        :body => MultiJson.dump({"id" => "bucket/object"}),
+        :headers => {'Content-Type' => 'application/json'},
+        :connection => conn
       )
-      result.request.headers['Content-Type'].should == 'application/json'
+      conn.verify
     end
   end
 
   describe 'with the plus API' do
     before do
-      @client.authorization = nil
-      @plus = @client.discovered_api('plus')
+      CLIENT.authorization = nil
+      @plus = CLIENT.discovered_api('plus')
     end
 
     it 'should correctly determine the discovery URI' do
-      @client.discovery_uri('plus').should ===
+      CLIENT.discovery_uri('plus').should ===
         'https://www.googleapis.com/discovery/v1/apis/plus/v1/rest'
     end
 
     it 'should find APIs that are in the discovery document' do
-      @client.discovered_api('plus').name.should == 'plus'
-      @client.discovered_api('plus').version.should == 'v1'
-      @client.discovered_api(:plus).name.should == 'plus'
-      @client.discovered_api(:plus).version.should == 'v1'
+      CLIENT.discovered_api('plus').name.should == 'plus'
+      CLIENT.discovered_api('plus').version.should == 'v1'
+      CLIENT.discovered_api(:plus).name.should == 'plus'
+      CLIENT.discovered_api(:plus).version.should == 'v1'
     end
 
     it 'should find methods that are in the discovery document' do
       # TODO(bobaman) Fix this when the RPC names are correct
-      @client.discovered_method(
+      CLIENT.discovered_method(
         'plus.activities.list', 'plus'
       ).name.should == 'list'
     end
 
+    it 'should define the origin API in discovered methods' do
+      CLIENT.discovered_method(
+        'plus.activities.list', 'plus'
+      ).api.name.should == 'plus'
+    end
+
     it 'should not find methods that are not in the discovery document' do
-      @client.discovered_method('plus.bogus', 'plus').should == nil
+      CLIENT.discovered_method('plus.bogus', 'plus').should == nil
     end
 
     it 'should generate requests against the correct URIs' do
-      request = @client.generate_request(
+      conn = stub_connection do |stub|
+        stub.get('/plus/v1/people/107807692475771887386/activities/public') do |env|
+        end
+      end
+      
+      request = CLIENT.execute(
         :api_method => @plus.activities.list,
         :parameters => {
           'userId' => '107807692475771887386', 'collection' => 'public'
         },
-        :authenticated => false
-      )
-      request.to_env(Faraday.default_connection)[:url].should === (
-        'https://www.googleapis.com/plus/v1/' +
-        'people/107807692475771887386/activities/public'
+        :authenticated => false,
+        :connection => conn
       )
+      conn.verify
     end
 
     it 'should correctly validate parameters' do
       (lambda do
-        @client.generate_request(
+        CLIENT.execute(
           :api_method => @plus.activities.list,
           :parameters => {'alt' => 'json'},
           :authenticated => false
@@ -354,173 +459,126 @@ describe Google::APIClient do
 
     it 'should correctly validate parameters' do
       (lambda do
-        @client.generate_request(
+        CLIENT.execute(
           :api_method => @plus.activities.list,
           :parameters => {
             'userId' => '107807692475771887386', 'collection' => 'bogus'
           },
           :authenticated => false
-        )
+        ).to_env(Faraday.default_connection)
       end).should raise_error(ArgumentError)
     end
   end
-
+  
   describe 'with the latitude API' do
     before do
-      @client.authorization = nil
-      @latitude = @client.discovered_api('latitude')
+      CLIENT.authorization = nil
+      @latitude = CLIENT.discovered_api('latitude')
     end
 
     it 'should correctly determine the discovery URI' do
-      @client.discovery_uri('latitude').should ===
+      CLIENT.discovery_uri('latitude').should ===
         'https://www.googleapis.com/discovery/v1/apis/latitude/v1/rest'
     end
 
     it 'should find APIs that are in the discovery document' do
-      @client.discovered_api('latitude').name.should == 'latitude'
-      @client.discovered_api('latitude').version.should == 'v1'
+      CLIENT.discovered_api('latitude').name.should == 'latitude'
+      CLIENT.discovered_api('latitude').version.should == 'v1'
+    end
+
+    it 'should return a batch path' do
+      CLIENT.discovered_api('latitude').batch_path.should_not be_nil
     end
 
     it 'should find methods that are in the discovery document' do
-      @client.discovered_method(
+      CLIENT.discovered_method(
         'latitude.currentLocation.get', 'latitude'
       ).name.should == 'get'
     end
 
+    it 'should define the origin API in discovered methods' do
+      CLIENT.discovered_method(
+        'latitude.currentLocation.get', 'latitude'
+      ).api.name.should == 'latitude'
+    end
+
     it 'should not find methods that are not in the discovery document' do
-      @client.discovered_method('latitude.bogus', 'latitude').should == nil
+      CLIENT.discovered_method('latitude.bogus', 'latitude').should == nil
     end
 
     it 'should generate requests against the correct URIs' do
-      request = @client.generate_request(
-        :api_method => 'latitude.currentLocation.get',
+      request = CLIENT.generate_request(
+        :api_method => @latitude.current_location.get,
         :authenticated => false
       )
-      request.to_env(Faraday.default_connection)[:url].should ===
+      request.to_env(Faraday.default_connection)[:url].to_s.should ===
         'https://www.googleapis.com/latitude/v1/currentLocation'
     end
 
     it 'should generate requests against the correct URIs' do
-      request = @client.generate_request(
+      request = CLIENT.generate_request(
         :api_method => @latitude.current_location.get,
         :authenticated => false
       )
-      request.to_env(Faraday.default_connection)[:url].should ===
+      request.to_env(Faraday.default_connection)[:url].to_s.should ===
         'https://www.googleapis.com/latitude/v1/currentLocation'
     end
 
     it 'should not be able to execute requests without authorization' do
-      result = @client.execute(
-        :api_method => 'latitude.currentLocation.get',
-        :authenticated => false
-      )
-      result.response.status.should == 401
-    end
-  end
-
-  describe 'with the moderator API' do
-    before do
-      @client.authorization = nil
-      @moderator = @client.discovered_api('moderator')
-    end
-
-    it 'should correctly determine the discovery URI' do
-      @client.discovery_uri('moderator').should ===
-        'https://www.googleapis.com/discovery/v1/apis/moderator/v1/rest'
-    end
-
-    it 'should find APIs that are in the discovery document' do
-      @client.discovered_api('moderator').name.should == 'moderator'
-      @client.discovered_api('moderator').version.should == 'v1'
-    end
-
-    it 'should find methods that are in the discovery document' do
-      @client.discovered_method(
-        'moderator.profiles.get', 'moderator'
-      ).name.should == 'get'
-    end
-
-    it 'should not find methods that are not in the discovery document' do
-      @client.discovered_method('moderator.bogus', 'moderator').should == nil
-    end
-
-    it 'should generate requests against the correct URIs' do
-      request = @client.generate_request(
-        :api_method => 'moderator.profiles.get',
-        :authenticated => false
-      )
-      request.to_env(Faraday.default_connection)[:url].should ===
-        'https://www.googleapis.com/moderator/v1/profiles/@me'
-    end
-
-    it 'should generate requests against the correct URIs' do
-      request = @client.generate_request(
-        :api_method => @moderator.profiles.get,
+      result = CLIENT.execute(
+        :api_method => @latitude.current_location.get,
         :authenticated => false
       )
-      request.to_env(Faraday.default_connection)[:url].should ===
-        'https://www.googleapis.com/moderator/v1/profiles/@me'
-    end
-
-    it 'should not be able to execute requests without authorization' do
-      result = @client.execute(
-        'moderator.profiles.get',
-        {},
-        '',
-        [],
-        {:authenticated => false}
-      )
       result.response.status.should == 401
     end
   end
 
   describe 'with the adsense API' do
     before do
-      @client.authorization = nil
-      @adsense = @client.discovered_api('adsense', 'v1')
+      CLIENT.authorization = nil
+      @adsense = CLIENT.discovered_api('adsense', 'v1')
     end
 
     it 'should correctly determine the discovery URI' do
-      @client.discovery_uri('adsense').should ===
+      CLIENT.discovery_uri('adsense').should ===
         'https://www.googleapis.com/discovery/v1/apis/adsense/v1/rest'
     end
 
     it 'should find APIs that are in the discovery document' do
-      @client.discovered_api('adsense').name.should == 'adsense'
-      @client.discovered_api('adsense').version.should == 'v1'
+      CLIENT.discovered_api('adsense').name.should == 'adsense'
+      CLIENT.discovered_api('adsense').version.should == 'v1'
+    end
+
+    it 'should return a batch path' do
+      CLIENT.discovered_api('adsense').batch_path.should_not be_nil
     end
 
     it 'should find methods that are in the discovery document' do
-      @client.discovered_method(
+      CLIENT.discovered_method(
         'adsense.reports.generate', 'adsense'
       ).name.should == 'generate'
     end
 
     it 'should not find methods that are not in the discovery document' do
-      @client.discovered_method('adsense.bogus', 'adsense').should == nil
+      CLIENT.discovered_method('adsense.bogus', 'adsense').should == nil
     end
 
     it 'should generate requests against the correct URIs' do
-      request = @client.generate_request(
-        :api_method => 'adsense.adclients.list',
-        :authenticated => false
-      )
-      request.to_env(Faraday.default_connection)[:url].should ===
-        'https://www.googleapis.com/adsense/v1/adclients'
-    end
-
-    it 'should generate requests against the correct URIs' do
-      request = @client.generate_request(
+      conn = stub_connection do |stub|
+        stub.get('/adsense/v1/adclients') do |env|
+        end
+      end
+      request = CLIENT.execute(
         :api_method => @adsense.adclients.list,
-        :authenticated => false
+        :authenticated => false,
+        :connection => conn
       )
-      request.to_env(Faraday.default_connection)[:url].should ===
-        'https://www.googleapis.com/adsense/v1/adclients'
+      conn.verify
     end
 
     it 'should not be able to execute requests without authorization' do
-      result = @client.execute(
-        :api_method => 'adsense.adclients.list',
+      result = CLIENT.execute(
+        :api_method => @adsense.adclients.list,
         :authenticated => false
       )
       result.response.status.should == 401
@@ -528,7 +586,7 @@ describe Google::APIClient do
 
     it 'should fail when validating missing required parameters' do
       (lambda do
-        @client.generate_request(
+        CLIENT.execute(
           :api_method => @adsense.reports.generate,
           :authenticated => false
         )
@@ -536,8 +594,12 @@ describe Google::APIClient do
     end
 
     it 'should succeed when validating parameters in a correct call' do
+      conn = stub_connection do |stub|
+        stub.get('/adsense/v1/reports?dimension=DATE&endDate=2010-01-01&metric=PAGE_VIEWS&startDate=2000-01-01') do |env|
+        end
+      end
       (lambda do
-        @client.generate_request(
+        CLIENT.execute(
           :api_method => @adsense.reports.generate,
           :parameters => {
             'startDate' => '2000-01-01',
@@ -545,14 +607,16 @@ describe Google::APIClient do
             'dimension' => 'DATE',
             'metric' => 'PAGE_VIEWS'
           },
-          :authenticated => false
+          :authenticated => false,
+          :connection => conn
         )
       end).should_not raise_error
+      conn.verify
     end
 
     it 'should fail when validating parameters with invalid values' do
       (lambda do
-        @client.generate_request(
+        CLIENT.execute(
           :api_method => @adsense.reports.generate,
           :parameters => {
             'startDate' => '2000-01-01',
@@ -566,8 +630,14 @@ describe Google::APIClient do
     end
 
     it 'should succeed when validating repeated parameters in a correct call' do
+      conn = stub_connection do |stub|
+        stub.get('/adsense/v1/reports?dimension%5B%5D=DATE&dimension%5B%5D=PRODUCT_CODE'+
+                 '&endDate=2010-01-01&metric%5B%5D=CLICKS&metric%5B%5D=PAGE_VIEWS&'+
+                 'startDate=2000-01-01') do |env|
+        end
+      end
       (lambda do
-        @client.generate_request(
+        CLIENT.execute(
           :api_method => @adsense.reports.generate,
           :parameters => {
             'startDate' => '2000-01-01',
@@ -575,14 +645,16 @@ describe Google::APIClient do
             'dimension' => ['DATE', 'PRODUCT_CODE'],
             'metric' => ['PAGE_VIEWS', 'CLICKS']
           },
-          :authenticated => false
+          :authenticated => false,
+          :connection => conn
         )
       end).should_not raise_error
+      conn.verify
     end
 
     it 'should fail when validating incorrect repeated parameters' do
       (lambda do
-        @client.generate_request(
+        CLIENT.execute(
           :api_method => @adsense.reports.generate,
           :parameters => {
             'startDate' => '2000-01-01',
@@ -595,4 +667,27 @@ describe Google::APIClient do
       end).should raise_error(ArgumentError)
     end
   end
+
+  describe 'with the Drive API' do
+    before do
+      CLIENT.authorization = nil
+      @drive = CLIENT.discovered_api('drive', 'v1')
+    end
+
+    it 'should include media upload info methods' do
+      @drive.files.insert.media_upload.should_not == nil
+    end
+
+    it 'should include accepted media types' do
+      @drive.files.insert.media_upload.accepted_types.should_not be_empty
+    end
+
+    it 'should have an upload path' do
+      @drive.files.insert.media_upload.uri_template.should_not == nil
+    end
+
+    it 'should have a max file size' do
+      @drive.files.insert.media_upload.max_size.should_not == nil
+    end
+  end
 end