Merge pull request #1531 from thoughtbot/ap-fix-spec

Fix intermittently failing spec

paperclip.gemspec

@@ -47,4 +47,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency('railties')
   s.add_development_dependency('railties')
   s.add_development_dependency('actionmailer', '>= 3.0.0')
   s.add_development_dependency('actionmailer', '>= 3.0.0')
   s.add_development_dependency('generator_spec')
   s.add_development_dependency('generator_spec')
+  s.add_development_dependency('timecop')
 end
 end

spec/paperclip/storage/fog_spec.rb

 require 'spec_helper'
 require 'spec_helper'
 require 'fog'
 require 'fog'
+require 'timecop'
 
 
 describe Paperclip::Storage::Fog do
 describe Paperclip::Storage::Fog do
   context "" do
   context "" do
@@ -319,11 +320,15 @@ describe Paperclip::Storage::Fog do
 
 
       context "generating an expiring url" do
       context "generating an expiring url" do
         it "generates the same url when using Times and Integer offsets" do
         it "generates the same url when using Times and Integer offsets" do
-          rebuild_model(@options)
-          dummy = Dummy.new
-          dummy.avatar = StringIO.new('.')
-
-          assert_equal dummy.avatar.expiring_url(1234), dummy.avatar.expiring_url(Time.now + 1234)
+          Timecop.freeze do
+            offset = 1234
+            rebuild_model(@options)
+            dummy = Dummy.new
+            dummy.avatar = StringIO.new('.')
+
+            assert_equal dummy.avatar.expiring_url(offset),
+              dummy.avatar.expiring_url(Time.now + offset )
+          end
         end
         end
 
 
         it 'matches the default url if there is no assignment' do
         it 'matches the default url if there is no assignment' do