features/step_definitions/s3_steps.rb in paperclip-4.3.7 vs features/step_definitions/s3_steps.rb in paperclip-5.0.0.beta1

- old
+ new

@@ -1,12 +1,16 @@ When /^I attach the file "([^"]*)" to "([^"]*)" on S3$/ do |file_path, field| definition = Paperclip::AttachmentRegistry.definitions_for(User)[field.downcase.to_sym] - path = "https://paperclip.s3.amazonaws.com#{definition[:path]}" + path = if defined?(::AWS) + "https://paperclip.s3.amazonaws.com#{definition[:path]}" + else + "https://paperclip.s3-us-west-2.amazonaws.com#{definition[:path]}" + end path.gsub!(':filename', File.basename(file_path)) path.gsub!(/:([^\/\.]+)/) do |match| "([^\/\.]+)" end - FakeWeb.register_uri(:put, Regexp.new(path), :body => "OK") + FakeWeb.register_uri(:put, Regexp.new(path), :body => defined?(::AWS) ? "OK" : "<xml></xml>") step "I attach the file \"#{file_path}\" to \"#{field}\"" end Then /^the file at "([^"]*)" should be uploaded to S3$/ do |url| FakeWeb.registered_uri?(:put, url)