multipart_upload_tests.rb in fog-0.9.0

- old
+ new

@@ -1,8 +1,8 @@
-Shindo.tests('AWS::Storage | object requests', ['aws']) do
+Shindo.tests('Fog::Storage[:aws] | object requests', [:aws]) do
 
-  @directory = AWS[:storage].directories.create(:key => 'fogmultipartuploadtests')
+  @directory = Fog::Storage[:aws].directories.create(:key => 'fogmultipartuploadtests')
 
   tests('success') do
 
     @initiate_multipart_upload_format = {
       'Bucket'    => String,
@@ -10,11 +10,11 @@
       'UploadId'  => String
     }
 
     tests("#initiate_multipart_upload('#{@directory.identity}')", 'fog_multipart_upload').formats(@initiate_multipart_upload_format) do
       pending if Fog.mocking?
-      data = AWS[:storage].initiate_multipart_upload(@directory.identity, 'fog_multipart_upload').body
+      data = Fog::Storage[:aws].initiate_multipart_upload(@directory.identity, 'fog_multipart_upload').body
       @upload_id = data['UploadId']
       data
     end
 
     @list_multipart_uploads_format = {
@@ -41,18 +41,18 @@
       'UploadIdMarker'      => NilClass,
     }
 
     tests("#list_multipart_uploads('#{@directory.identity})").formats(@list_multipart_uploads_format) do
       pending if Fog.mocking?
-      AWS[:storage].list_multipart_uploads(@directory.identity).body
+      Fog::Storage[:aws].list_multipart_uploads(@directory.identity).body
     end
 
     @parts = []
 
     tests("#upload_part('#{@directory.identity}', 'fog_multipart_upload', '#{@upload_id}', 1, ('x' * 6 * 1024 * 1024))").succeeds do
       pending if Fog.mocking?
-      data = AWS[:storage].upload_part(@directory.identity, 'fog_multipart_upload', @upload_id, 1, ('x' * 6 * 1024 * 1024))
+      data = Fog::Storage[:aws].upload_part(@directory.identity, 'fog_multipart_upload', @upload_id, 1, ('x' * 6 * 1024 * 1024))
       @parts << data.headers['ETag']
     end
 
     @list_parts_format = {
       'Bucket'            => String,
@@ -75,15 +75,15 @@
       'UploadId'          => String
     }
 
     tests("#list_parts('#{@directory.identity}', 'fog_multipart_upload', '#{@upload_id}')").formats(@list_parts_format) do
       pending if Fog.mocking?
-      AWS[:storage].list_parts(@directory.identity, 'fog_multipart_upload', @upload_id).body
+      Fog::Storage[:aws].list_parts(@directory.identity, 'fog_multipart_upload', @upload_id).body
     end
 
     if !Fog.mocking?
-      @parts << AWS[:storage].upload_part(@directory.identity, 'fog_multipart_upload', @upload_id, 2, ('x' * 4 * 1024 * 1024)).headers['ETag']
+      @parts << Fog::Storage[:aws].upload_part(@directory.identity, 'fog_multipart_upload', @upload_id, 2, ('x' * 4 * 1024 * 1024)).headers['ETag']
     end
 
     @complete_multipart_upload_format = {
       'Bucket'    => String,
       'ETag'      => String,
@@ -91,31 +91,31 @@
       'Location'  => String
     }
 
     tests("#complete_multipart_upload('#{@directory.identity}', 'fog_multipart_upload', '#{@upload_id}', #{@parts.inspect})").formats(@complete_multipart_upload_format) do
       pending if Fog.mocking?
-      AWS[:storage].complete_multipart_upload(@directory.identity, 'fog_multipart_upload', @upload_id, @parts).body
+      Fog::Storage[:aws].complete_multipart_upload(@directory.identity, 'fog_multipart_upload', @upload_id, @parts).body
     end
 
     tests("#get_object('#{@directory.identity}', 'fog_multipart_upload').body").succeeds do
       pending if Fog.mocking?
-      data = AWS[:storage].get_object(@directory.identity, 'fog_multipart_upload').body
+      data = Fog::Storage[:aws].get_object(@directory.identity, 'fog_multipart_upload').body
       unless data == ('x' * 10 * 1024 * 1024)
         raise 'content mismatch'
       end
     end
 
     if !Fog.mocking?
       @directory.files.new(:key => 'fog_multipart_upload').destroy
     end
 
     if !Fog.mocking?
-      @upload_id = AWS[:storage].initiate_multipart_upload(@directory.identity, 'fog_multipart_abort').body['UploadId']
+      @upload_id = Fog::Storage[:aws].initiate_multipart_upload(@directory.identity, 'fog_multipart_abort').body['UploadId']
     end
 
     tests("#abort_multipart_upload('#{@directory.identity}', 'fog_multipart_abort', '#{@upload_id}')").succeeds do
       pending if Fog.mocking?
-      AWS[:storage].abort_multipart_upload(@directory.identity, 'fog_multipart_abort', @upload_id)
+      Fog::Storage[:aws].abort_multipart_upload(@directory.identity, 'fog_multipart_abort', @upload_id)
     end
 
   end
 
   tests('failure') do