fixed tests

qoobaa · Feb 21, 2014 · 386361c · 386361c
1 parent 3979fa6
commit 386361c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    s3 (0.3.20)
+    s3 (0.3.21)
       proxies (~> 0.2.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    metaclass (0.0.2)
+    metaclass (0.0.4)
     mocha (1.0.0)
       metaclass (~> 0.0.1)
     proxies (0.2.1)

diff --git a/lib/s3/bucket.rb b/lib/s3/bucket.rb
@@ -147,7 +147,7 @@ def location_constraint
 
     def list_bucket(params = {})
       response = bucket_request(:get, :params => params)
-      max_keys = options[:max_keys]
+      max_keys = params[:max_keys]
       objects_attributes = parse_list_bucket_result(response.body)
 
       # If there are more than 1000 objects S3 truncates listing and
@@ -160,7 +160,7 @@ def list_bucket(params = {})
           next_request_options[:max_keys] = max_keys - objects_attributes.length
         end
 
-        response = bucket_request(:get, :params => options.merge(next_request_options))
+        response = bucket_request(:get, :params => params.merge(next_request_options))
         objects_attributes += parse_list_bucket_result(response.body)
       end