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

Merge branch 'master' of https://github.com/google/google-api-ruby-client into new_programming_interface

This commit is contained in:
Sergio Gomes 2013-10-04 14:48:58 +01:00
parent d7bd7126d3 5c31b69356
commit 00f66633e0
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spec/google/api_client/batch_spec.rb
View File

@ -53,7 +53,7 @@ describe Google::APIClient::BatchRequest do
@call1 = { @call1 = {
:api_method => @discovery.apis.get_rest, :api_method => @discovery.apis.get_rest,
:parameters => { :parameters => {
'api' => 'adsense', 'api' => 'plus',
'version' => 'v1' 'version' => 'v1'
} }
} }
@ -118,7 +118,7 @@ describe Google::APIClient::BatchRequest do
@call1 = { @call1 = {
:api_method => @discovery.apis.get_rest, :api_method => @discovery.apis.get_rest,
:parameters => { :parameters => {
'api' => 'adsense', 'api' => 'plus',
'version' => 'v1' 'version' => 'v1'
} }
} }
@ -244,6 +244,6 @@ describe Google::APIClient::BatchRequest do
#request[:body].read.gsub("\r", "").should =~ expected_body #request[:body].read.gsub("\r", "").should =~ expected_body
end end
end end
end end
end end

14
spec/google/api_client/discovery_spec.rb
View File

@ -86,7 +86,7 @@ describe Google::APIClient do
it 'should correctly determine the discovery URI if :user_ip is set' do it 'should correctly determine the discovery URI if :user_ip is set' do
CLIENT.user_ip = '127.0.0.1' CLIENT.user_ip = '127.0.0.1'
conn = stub_connection do |stub| conn = stub_connection do |stub|
stub.get('/discovery/v1/apis/prediction/v1.2/rest?userIp=127.0.0.1') do |env| stub.get('/discovery/v1/apis/prediction/v1.2/rest?userIp=127.0.0.1') do |env|
end end
@ -199,8 +199,8 @@ describe Google::APIClient do
it 'should generate valid requests when parameter value includes semicolon' do it 'should generate valid requests when parameter value includes semicolon' do
conn = stub_connection do |stub| conn = stub_connection do |stub|
# semicolon (;) in parameter value was being converted to # semicolon (;) in parameter value was being converted to
# bare ampersand (&) in 0.4.7. ensure that it gets converted # bare ampersand (&) in 0.4.7. ensure that it gets converted
# to a CGI-escaped semicolon (%3B) instead. # to a CGI-escaped semicolon (%3B) instead.
stub.post('/prediction/v1.2/training?data=12345%3B67890') do |env| stub.post('/prediction/v1.2/training?data=12345%3B67890') do |env|
env[:body].should == '' env[:body].should == ''
@ -266,7 +266,7 @@ describe Google::APIClient do
env[:url].host.should == 'testing-domain.example.com' env[:url].host.should == 'testing-domain.example.com'
end end
end end
request = CLIENT.execute( request = CLIENT.execute(
:api_method => prediction_rebase.training.insert, :api_method => prediction_rebase.training.insert,
:parameters => {'data' => '123'}, :parameters => {'data' => '123'},
@ -417,7 +417,7 @@ describe Google::APIClient do
stub.get('/plus/v1/people/107807692475771887386/activities/public') do |env| stub.get('/plus/v1/people/107807692475771887386/activities/public') do |env|
end end
end end
request = CLIENT.execute( request = CLIENT.execute(
:api_method => @plus.activities.list, :api_method => @plus.activities.list,
:parameters => { :parameters => {
@ -474,12 +474,12 @@ describe Google::APIClient do
it 'should find methods that are in the discovery document' do it 'should find methods that are in the discovery document' do
CLIENT.discovered_method( CLIENT.discovered_method(
'adsense.reports.generate', 'adsense' 'adsense.reports.generate', 'adsense', 'v1.3'
).name.should == 'generate' ).name.should == 'generate'
end end
it 'should not find methods that are not in the discovery document' do 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', 'v1.3').should == nil
end end
it 'should generate requests against the correct URIs' do it 'should generate requests against the correct URIs' do