Begin consolidation of request building in reference. Further changes coming to simpl...

[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 30abbfff011068db3b48e1d10876765876803966..9f14b69c9c705a83dc64aa1d6f0baaa0dc5c49b1 100644 (file)
--- a/spec/google/api_client/discovery_spec.rb
+++ b/spec/google/api_client/discovery_spec.rb
@@ -17,20 +17,16 @@
 
 require 'spec_helper'
 
-gem 'faraday', '~> 0.8.1'
 require 'faraday'
 require 'faraday/utils'
 require 'multi_json'
 require 'compat/multi_json'
-
-gem 'signet', '~> 0.4.0'
 require 'signet/oauth_1/client'
-
 require 'google/api_client'
 require 'google/api_client/version'
 
 describe Google::APIClient do
-  CLIENT ||= Google::APIClient.new
+  CLIENT = Google::APIClient.new unless defined?(CLIENT)
 
   after do
     # Reset client to not-quite-pristine state
@@ -95,7 +91,7 @@ describe Google::APIClient do
         :uri => CLIENT.discovery_uri('prediction', 'v1.2'),
         :authenticated => false
       )
-      request.to_env(Faraday.default_connection)[:url].to_s.should === (
+      request.to_http_request.to_env(Faraday.default_connection)[:url].to_s.should === (
         'https://www.googleapis.com/discovery/v1/apis/prediction/v1.2/rest' +
         '?userIp=127.0.0.1'
       )
@@ -108,7 +104,7 @@ describe Google::APIClient do
         :uri => CLIENT.discovery_uri('prediction', 'v1.2'),
         :authenticated => false
       )
-      request.to_env(Faraday.default_connection)[:url].to_s.should === (
+      request.to_http_request.to_env(Faraday.default_connection)[:url].to_s.should === (
         'https://www.googleapis.com/discovery/v1/apis/prediction/v1.2/rest' +
         '?key=qwerty'
       )
@@ -123,7 +119,7 @@ describe Google::APIClient do
         :authenticated => false
       )
       Addressable::URI.parse(
-        request.to_env(Faraday.default_connection)[:url]
+        request.to_http_request.to_env(Faraday.default_connection)[:url]
       ).query_values.should == {
         'key' => 'qwerty',
         'userIp' => '127.0.0.1'
@@ -187,8 +183,8 @@ describe Google::APIClient do
         :api_method => @prediction.training.insert,
         :parameters => {'data' => '12345'}
       )
-      request.method.should == :post
-      request.to_env(Faraday.default_connection)[:url].to_s.should ===
+      request.to_http_request.method.should == :post
+      request.to_http_request.to_env(Faraday.default_connection)[:url].to_s.should ===
         'https://www.googleapis.com/prediction/v1.2/training?data=12345'
       request.headers.should be_empty
       request.body.should == ''
@@ -200,8 +196,8 @@ describe Google::APIClient do
         :api_method => @prediction.training.insert,
         :parameters => [['data', '1'], ['data','2']]
       )
-      request.method.should == :post
-      request.to_env(Faraday.default_connection)[:url].to_s.should ===
+      request.to_http_request.method.should == :post
+      request.to_http_request.to_env(Faraday.default_connection)[:url].to_s.should ===
         'https://www.googleapis.com/prediction/v1.2/training?data=1&data=2'
     end
 
@@ -210,7 +206,7 @@ describe Google::APIClient do
         :api_method => @prediction.training.insert,
         :parameters => {'data' => '12345'}
       )
-      request.to_env(Faraday.default_connection)[:url].to_s.should ===
+      request.to_http_request.to_env(Faraday.default_connection)[:url].to_s.should ===
         'https://www.googleapis.com/prediction/v1.2/training?data=12345'
     end
 
@@ -219,7 +215,7 @@ describe Google::APIClient do
         :api_method => @prediction.training.insert,
         :parameters => {'data' => '12345'}
       )
-      request.to_env(Faraday.default_connection)[:url].to_s.should ===
+      request.to_http_request.to_env(Faraday.default_connection)[:url].to_s.should ===
         'https://www.googleapis.com/prediction/v1.2/training?data=12345'
     end
 
@@ -233,7 +229,7 @@ describe Google::APIClient do
         :api_method => prediction_rebase.training.insert,
         :parameters => {'data' => '123'}
       )
-      request.to_env(Faraday.default_connection)[:url].to_s.should === (
+      request.to_http_request.to_env(Faraday.default_connection)[:url].to_s.should === (
         'https://testing-domain.example.com/' +
         'prediction/v1.2/training?data=123'
       )
@@ -247,8 +243,9 @@ describe Google::APIClient do
         :api_method => @prediction.training.insert,
         :parameters => {'data' => '12345'}
       )
-      request.headers.should have_key('Authorization')
-      request.headers['Authorization'].should =~ /^OAuth/
+      http_request = request.to_http_request
+      http_request.headers.should have_key('Authorization')
+      http_request.headers['Authorization'].should =~ /^OAuth/
     end
 
     it 'should generate OAuth 2 requests' do
@@ -258,8 +255,9 @@ describe Google::APIClient do
         :api_method => @prediction.training.insert,
         :parameters => {'data' => '12345'}
       )
-      request.headers.should have_key('Authorization')
-      request.headers['Authorization'].should =~ /^Bearer/
+      http_request = request.to_http_request
+      http_request.headers.should have_key('Authorization')
+      http_request.headers['Authorization'].should =~ /^Bearer/
     end
 
     it 'should not be able to execute improperly authorized requests' do
@@ -315,7 +313,7 @@ describe Google::APIClient do
         MultiJson.dump({"id" => "bucket/object"}),
         {'Content-Type' => 'application/json'}
       )
-      result.request.headers['Content-Type'].should == 'application/json'
+      result.reference.to_http_request.headers['Content-Type'].should == 'application/json'
     end
   end
 
@@ -362,7 +360,7 @@ describe Google::APIClient do
         },
         :authenticated => false
       )
-      request.to_env(Faraday.default_connection)[:url].to_s.should === (
+      request.to_http_request.to_env(Faraday.default_connection)[:url].to_s.should === (
         'https://www.googleapis.com/plus/v1/' +
         'people/107807692475771887386/activities/public'
       )
@@ -374,7 +372,7 @@ describe Google::APIClient do
           :api_method => @plus.activities.list,
           :parameters => {'alt' => 'json'},
           :authenticated => false
-        )
+        ).to_http_request
       end).should raise_error(ArgumentError)
     end
 
@@ -386,11 +384,12 @@ describe Google::APIClient do
             'userId' => '107807692475771887386', 'collection' => 'bogus'
           },
           :authenticated => false
-        )
+        ).to_http_request
       end).should raise_error(ArgumentError)
     end
   end
-
+  
+=begin
   describe 'with the latitude API' do
     before do
       CLIENT.authorization = nil
@@ -432,7 +431,7 @@ describe Google::APIClient do
         :api_method => 'latitude.currentLocation.get',
         :authenticated => false
       )
-      request.to_env(Faraday.default_connection)[:url].to_s.should ===
+      request.to_http_request.to_env(Faraday.default_connection)[:url].to_s.should ===
         'https://www.googleapis.com/latitude/v1/currentLocation'
     end
 
@@ -441,7 +440,7 @@ describe Google::APIClient do
         :api_method => @latitude.current_location.get,
         :authenticated => false
       )
-      request.to_env(Faraday.default_connection)[:url].to_s.should ===
+      request.to_http_request.to_env(Faraday.default_connection)[:url].to_s.should ===
         'https://www.googleapis.com/latitude/v1/currentLocation'
     end
 
@@ -453,6 +452,7 @@ describe Google::APIClient do
       result.response.status.should == 401
     end
   end
+=end
 
   describe 'with the moderator API' do
     before do
@@ -495,7 +495,7 @@ describe Google::APIClient do
         :api_method => 'moderator.profiles.get',
         :authenticated => false
       )
-      request.to_env(Faraday.default_connection)[:url].to_s.should ===
+      request.to_http_request.to_env(Faraday.default_connection)[:url].to_s.should ===
         'https://www.googleapis.com/moderator/v1/profiles/@me'
     end
 
@@ -504,7 +504,7 @@ describe Google::APIClient do
         :api_method => @moderator.profiles.get,
         :authenticated => false
       )
-      request.to_env(Faraday.default_connection)[:url].to_s.should ===
+      request.to_http_request.to_env(Faraday.default_connection)[:url].to_s.should ===
         'https://www.googleapis.com/moderator/v1/profiles/@me'
     end
 
@@ -555,7 +555,7 @@ describe Google::APIClient do
         :api_method => 'adsense.adclients.list',
         :authenticated => false
       )
-      request.to_env(Faraday.default_connection)[:url].to_s.should ===
+      request.to_http_request.to_env(Faraday.default_connection)[:url].to_s.should ===
         'https://www.googleapis.com/adsense/v1/adclients'
     end
 
@@ -564,7 +564,7 @@ describe Google::APIClient do
         :api_method => @adsense.adclients.list,
         :authenticated => false
       )
-      request.to_env(Faraday.default_connection)[:url].to_s.should ===
+      request.to_http_request.to_env(Faraday.default_connection)[:url].to_s.should ===
         'https://www.googleapis.com/adsense/v1/adclients'
     end
 
@@ -581,7 +581,7 @@ describe Google::APIClient do
         CLIENT.generate_request(
           :api_method => @adsense.reports.generate,
           :authenticated => false
-        )
+        ).to_http_request
       end).should raise_error(ArgumentError)
     end
 
@@ -596,7 +596,7 @@ describe Google::APIClient do
             'metric' => 'PAGE_VIEWS'
           },
           :authenticated => false
-        )
+        ).to_http_request
       end).should_not raise_error
     end
 
@@ -611,7 +611,7 @@ describe Google::APIClient do
             'metric' => 'PAGE_VIEWS'
           },
           :authenticated => false
-        )
+        ).to_http_request
       end).should raise_error(ArgumentError)
     end
 
@@ -641,7 +641,7 @@ describe Google::APIClient do
             'metric' => ['PAGE_VIEWS', 'CLICKS']
           },
           :authenticated => false
-        )
+        ).to_http_request
       end).should raise_error(ArgumentError)
     end
   end