Fix duplication of parameters in qeuery string

[arvados.git] / 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 10899ab73d7322999116e561e2a990e157e06d70..9b8f0b7151b6635e31a9e08e7be82e83f8c0f213 100644 (file)
--- a/spec/google/api_client/discovery_spec.rb
+++ b/spec/google/api_client/discovery_spec.rb
@@ -43,7 +43,7 @@ end
 
 describe Google::APIClient do
   include ConnectionHelpers
-  CLIENT = Google::APIClient.new unless defined?(CLIENT)
+  CLIENT = Google::APIClient.new(:application_name => 'API Client Tests') unless defined?(CLIENT)
 
   after do
     # Reset client to not-quite-pristine state
@@ -53,7 +53,7 @@ describe Google::APIClient do
 
   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
 
@@ -275,7 +275,7 @@ describe Google::APIClient do
     it 'should allow modification to the base URIs for testing purposes' do
       # Using a new client instance here to avoid caching rebased discovery doc
       prediction_rebase =
-        Google::APIClient.new.discovered_api('prediction', 'v1.2')
+        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/'
 
@@ -432,8 +432,7 @@ describe Google::APIClient do
 
     it 'should generate requests against the correct URIs' do
       conn = stub_connection do |stub|
-        stub.get('/plus/v1/people/107807692475771887386/activities/public' +
-                  '?collection=public&userId=107807692475771887386') do |env|
+        stub.get('/plus/v1/people/107807692475771887386/activities/public') do |env|
         end
       end
       
@@ -471,7 +470,6 @@ describe Google::APIClient do
     end
   end
   
-=begin
   describe 'with the latitude API' do
     before do
       CLIENT.authorization = nil
@@ -510,7 +508,7 @@ describe Google::APIClient do
 
     it 'should generate requests against the correct URIs' do
       request = CLIENT.generate_request(
-        :api_method => 'latitude.currentLocation.get',
+        :api_method => @latitude.current_location.get,
         :authenticated => false
       )
       request.to_env(Faraday.default_connection)[:url].to_s.should ===
@@ -528,74 +526,12 @@ describe Google::APIClient do
 
     it 'should not be able to execute requests without authorization' do
       result = CLIENT.execute(
-        :api_method => 'latitude.currentLocation.get',
+        :api_method => @latitude.current_location.get,
         :authenticated => false
       )
       result.response.status.should == 401
     end
   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 define the origin API in discovered methods' do
-      CLIENT.discovered_method(
-        'moderator.profiles.get', 'moderator'
-      ).api.name.should == 'moderator'
-    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 return a batch path' do
-      CLIENT.discovered_api('moderator').batch_path.should_not be_nil
-    end
-
-    it 'should generate requests against the correct URIs' do
-      conn = stub_connection do |stub|
-        stub.get('/moderator/v1/profiles/@me') do |env|
-        end
-      end
-      request = CLIENT.execute(
-        :api_method => @moderator.profiles.get,
-        :authenticated => false,
-        :connection => conn
-      )
-      conn.verify
-    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