Commit 3b67a747 by Matthew Schulkind Committed by Jon Yurek

Fix a failing test.

Fixes #913
parent 526ced32
...@@ -294,6 +294,7 @@ module Paperclip ...@@ -294,6 +294,7 @@ module Paperclip
saved_only_process, @options[:only_process] = @options[:only_process], style_args saved_only_process, @options[:only_process] = @options[:only_process], style_args
begin begin
assign(self) assign(self)
save
instance.save instance.save
rescue Errno::EACCES => e rescue Errno::EACCES => e
warn "#{e} - skipping file." warn "#{e} - skipping file."
......
...@@ -466,7 +466,7 @@ class IntegrationTest < Test::Unit::TestCase ...@@ -466,7 +466,7 @@ class IntegrationTest < Test::Unit::TestCase
@dummy.avatar.options[:styles][:mini] = "25x25#" @dummy.avatar.options[:styles][:mini] = "25x25#"
@dummy.avatar.instance_variable_set :@normalized_styles, nil @dummy.avatar.instance_variable_set :@normalized_styles, nil
Time.stubs(:now => Time.now + 10) Time.stubs(:now => Time.now + 10)
@dummy.avatar.reprocess! 'mini' @dummy.avatar.reprocess!
@dummy.reload @dummy.reload
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment