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

.travis.yml

@@ -13,6 +13,7 @@ script: "rake spec:all"
 before_install:
  - sudo apt-get update
  - sudo apt-get install idn
+ - gem update bundler
 notifications:
   email:
     recipients:

lib/google/apis/core/http_command.rb

@@ -144,7 +144,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

spec/google/apis/core/http_command_spec.rb

@@ -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