spec/paperclip/storage/s3_live_spec.rb in kt-paperclip-5.4.0 vs spec/paperclip/storage/s3_live_spec.rb in kt-paperclip-6.2.0

- old
+ new

@@ -1,19 +1,19 @@ -require 'spec_helper' +require "spec_helper" unless ENV["S3_BUCKET"].blank? - describe Paperclip::Storage::S3, 'Live S3' do + describe Paperclip::Storage::S3, "Live S3" do context "when assigning an S3 attachment directly to another model" 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: { - access_key_id: ENV['AWS_ACCESS_KEY_ID'], - secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'] + access_key_id: ENV["AWS_ACCESS_KEY_ID"], + secret_access_key: ENV["AWS_SECRET_ACCESS_KEY"] } @file = File.new(fixture_file("5k.png")) end @@ -46,12 +46,12 @@ storage: :s3, bucket: ENV["S3_BUCKET"], path: ":class/:attachment/:id/:style.:extension", s3_region: ENV["S3_REGION"], s3_credentials: { - access_key_id: ENV['AWS_ACCESS_KEY_ID'], - secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'] + access_key_id: ENV["AWS_ACCESS_KEY_ID"], + secret_access_key: ENV["AWS_SECRET_ACCESS_KEY"] } @dummy = Dummy.new end @@ -66,12 +66,12 @@ storage: :s3, bucket: ENV["S3_BUCKET"], path: ":class/:attachment/:id/:style.:extension", s3_region: ENV["S3_REGION"], s3_credentials: { - access_key_id: ENV['AWS_ACCESS_KEY_ID'], - secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'] + access_key_id: ENV["AWS_ACCESS_KEY_ID"], + secret_access_key: ENV["AWS_SECRET_ACCESS_KEY"] } Dummy.delete_all @dummy = Dummy.new end @@ -80,11 +80,11 @@ assert Dummy.new.avatar.is_a?(Paperclip::Storage::S3) end context "when assigned" do before do - @file = File.new(fixture_file('5k.png'), 'rb') + @file = File.new(fixture_file("5k.png"), "rb") @dummy.avatar = @file end after do @file.close @@ -104,22 +104,22 @@ end 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"], - url: ":s3_domain_url", - path: "/:class/:attachment/:id_partition/:style/:filename", - s3_credentials: { - access_key_id: ENV['AWS_ACCESS_KEY_ID'], - secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'] - } + storage: :s3, + bucket: ENV["S3_BUCKET"], + s3_region: ENV["S3_REGION"], + url: ":s3_domain_url", + path: "/:class/:attachment/:id_partition/:style/:filename", + s3_credentials: { + access_key_id: ENV["AWS_ACCESS_KEY_ID"], + secret_access_key: ENV["AWS_SECRET_ACCESS_KEY"] + } Dummy.delete_all - @file = File.new(fixture_file('spaced file.png'), 'rb') + @file = File.new(fixture_file("spaced file.png"), "rb") @dummy = Dummy.new @dummy.avatar = @file @dummy.save end @@ -152,20 +152,20 @@ storage: :s3, bucket: ENV["S3_BUCKET"], path: ":class/:attachment/:id/:style.:extension", s3_region: ENV["S3_REGION"], s3_credentials: { - access_key_id: ENV['AWS_ACCESS_KEY_ID'], - secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'] + access_key_id: ENV["AWS_ACCESS_KEY_ID"], + secret_access_key: ENV["AWS_SECRET_ACCESS_KEY"] }, s3_server_side_encryption: "AES256" Dummy.delete_all @dummy = Dummy.new end context "when assigned" do before do - @file = File.new(fixture_file('5k.png'), 'rb') + @file = File.new(fixture_file("5k.png"), "rb") @dummy.avatar = @file end after do @file.close