spec/paperclip/storage/s3_live_spec.rb in paperclip-4.3.7 vs spec/paperclip/storage/s3_live_spec.rb in paperclip-5.0.0.beta1

@@ -6,10 +6,11 @@
       before do
         rebuild_model styles: { thumb: "100x100", square: "32x32#" },
                       storage: :s3,
                       bucket: ENV["S3_BUCKET"],
                       path: ":class/:attachment/:id/:style.:extension",
+                      s3_region: ENV["S3_REGION"],
                       s3_credentials: {
                         aws_access_key_id: ENV['AWS_ACCESS_KEY_ID'],
                         aws_secre_access_key: ENV['AWS_SECRET_ACCESS_KEY']
                       }
 
@@ -43,10 +44,11 @@
       before do
         rebuild_model styles: { thumb: "100x100", square: "32x32#" },
                       storage: :s3,
                       bucket: ENV["S3_BUCKET"],
                       path: ":class/:attachment/:id/:style.:extension",
+                      s3_region: ENV["S3_REGION"],
                       s3_credentials: {
                         aws_access_key_id: ENV['AWS_ACCESS_KEY_ID'],
                         aws_secre_access_key: ENV['AWS_SECRET_ACCESS_KEY']
                       }
 
@@ -62,10 +64,11 @@
       before do
         rebuild_model styles: { thumb: "100x100", square: "32x32#" },
                       storage: :s3,
                       bucket: ENV["S3_BUCKET"],
                       path: ":class/:attachment/:id/:style.:extension",
+                      s3_region: ENV["S3_REGION"],
                       s3_credentials: {
                         aws_access_key_id: ENV['AWS_ACCESS_KEY_ID'],
                         aws_secre_access_key: ENV['AWS_SECRET_ACCESS_KEY']
                       }
 
@@ -103,10 +106,11 @@
     context "An attachment that uses S3 for storage and has spaces in file name" do
       before do
         rebuild_model styles: { thumb: "100x100", square: "32x32#" },
           storage: :s3,
           bucket: ENV["S3_BUCKET"],
+          s3_region: ENV["S3_REGION"],
           s3_credentials: {
             aws_access_key_id: ENV['AWS_ACCESS_KEY_ID'],
             aws_secre_access_key: ENV['AWS_SECRET_ACCESS_KEY']
           }
 
@@ -134,26 +138,26 @@
       end
 
       it "is destroyable" do
         url = @dummy.avatar.url
         @dummy.destroy
-        assert_not_found_response url
+        assert_forbidden_response url
       end
     end
 
     context "An attachment that uses S3 for storage and uses AES256 encryption" do
       before do
         rebuild_model styles: { thumb: "100x100", square: "32x32#" },
                       storage: :s3,
                       bucket: ENV["S3_BUCKET"],
                       path: ":class/:attachment/:id/:style.:extension",
+                      s3_region: ENV["S3_REGION"],
                       s3_credentials: {
                         aws_access_key_id: ENV['AWS_ACCESS_KEY_ID'],
                         aws_secre_access_key: ENV['AWS_SECRET_ACCESS_KEY']
                       },
-                      s3_server_side_encryption: :aes256
-
+                      s3_server_side_encryption: "AES256"
         Dummy.delete_all
         @dummy = Dummy.new
       end
 
       context "when assigned" do
@@ -171,10 +175,10 @@
           before do
             @dummy.save
           end
 
           it "is encrypted on S3" do
-            assert @dummy.avatar.s3_object.server_side_encryption == :aes256
+            assert @dummy.avatar.s3_object.server_side_encryption == "AES256"
           end
         end
       end
     end
   end