From 89a7a9fc39abe470f7a60b2f9cb8310db1062783 Mon Sep 17 00:00:00 2001 From: Garret Alfert Date: Fri, 6 Jan 2012 01:34:37 +0100 Subject: [PATCH] [aws|storage] Little improvements to delete_multiple_objects tests --- tests/aws/requests/storage/object_tests.rb | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/tests/aws/requests/storage/object_tests.rb b/tests/aws/requests/storage/object_tests.rb index 5bc05d20e..bc8c89b02 100644 --- a/tests/aws/requests/storage/object_tests.rb +++ b/tests/aws/requests/storage/object_tests.rb @@ -97,13 +97,8 @@ Shindo.tests('AWS::Storage | object requests', ['aws']) do (object_url =~ /http:\/\/#{Regexp.quote(@directory.identity)}\.s3\.amazonaws\.com\/fog_object/) != nil end - tests("delete_multiple_objects('#{@directory.identity}', ['fog_object'])").returns({ - 'DeleteResult' => [ - { 'Deleted' => { 'Key' => 'fog_object' } } - ] - }) do - Fog::Storage[:aws].delete_multiple_objects(@directory.identity, ['fog_object']) - Fog::Storage[:aws].delete_multiple_objects(@directory.identity, ['fog_object']).body + tests("delete_multiple_objects('#{@directory.identity}', ['fog_object', 'fog_other_object'])").formats(@multiple_delete_format) do + Fog::Storage[:aws].delete_multiple_objects(@directory.identity, ['fog_object', 'fog_other_object']).body end end