Merge pull request #320 from railscard/http_command_query_params
Allow http command to keep initial query parameters
This commit is contained in:
		
						commit
						1de66ddedb
					
				| 
						 | 
				
			
			@ -143,7 +143,7 @@ module Google
 | 
			
		|||
        def prepare!
 | 
			
		||||
          header.update(options.header) if options && options.header
 | 
			
		||||
          self.url = url.expand(params) if url.is_a?(Addressable::Template)
 | 
			
		||||
          url.query_values = query
 | 
			
		||||
          url.query_values = query.merge(url.query_values || {})
 | 
			
		||||
        end
 | 
			
		||||
 | 
			
		||||
        # Release any resources used by this command
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -264,4 +264,12 @@ RSpec.describe Google::Apis::Core::HttpCommand do
 | 
			
		|||
    command.query['a'] = [1,2,3]
 | 
			
		||||
    command.execute(client)
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  it 'should not remove initial query parameters' do
 | 
			
		||||
    stub_request(:get, 'https://www.googleapis.com/zoo/animals?a=1&a=2&a=3&foo=bar')
 | 
			
		||||
      .to_return(status: [200, ''])
 | 
			
		||||
    command = Google::Apis::Core::HttpCommand.new(:get, 'https://www.googleapis.com/zoo/animals?foo=bar')
 | 
			
		||||
    command.query['a'] = [1,2,3]
 | 
			
		||||
    command.execute(client)
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue