Allow http command to keep initial query parameters

railscard · Dec 14, 2015 · f51a4f2 · f51a4f2
1 parent 6c75e89
commit f51a4f2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/lib/google/apis/core/http_command.rb b/lib/google/apis/core/http_command.rb
@@ -143,7 +143,7 @@ def authorization_refreshable?
         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

diff --git a/spec/google/apis/core/http_command_spec.rb b/spec/google/apis/core/http_command_spec.rb
@@ -264,4 +264,12 @@
     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