Commit a4b71afc

@@ -2,8 +2,8 @@ class Photo < ActiveRecord::Base
   belongs_to :creation, :counter_cache => true
   validates :image,  :presence => true
   mount_uploader :image, PhotoUploader
-  #process_in_background :image
-  store_in_background :image
+  process_in_background :image if Rails.env.test?
+  store_in_background :image unless Rails.env.test?
 
   def to_jq_upload
     {

@@ -32,6 +32,7 @@ describe PhotosController do
     before :each do
       creation.photos << photo
       creation.save!
+      photo.update_attribute(:image_processing, nil)
       delete :destroy, :creation_id => creation.id, :id => photo.id
     end
 
@@ -48,12 +49,11 @@ describe PhotosController do
       {
         :files => [
         {
-           :name=>"example.png",
-           :size=>359791,
-           :url=>"/uploads/photo/image/#{photo.id}/example.png",
-           :thumbnail_url=>"/uploads/photo/image/#{photo.id}/thumb_example.png",
-           :delete_url=>photo.id,
-           :delete_type=>"DELETE"
+           :name => "example.png",
+           :url => "/uploads/photo/image/#{photo.id}/example.png",
+           :thumbnail_url => "/uploads/photo/image/#{photo.id}/thumb_example.png",
+           :delete_url => photo.id,
+           :delete_type => "DELETE"
         }]
       }.to_json
     end

@@ -1,5 +1,5 @@
 FactoryGirl.define do
   factory :photo, class: Photo do
-    image { File.new(File.join( Rails.root, 'spec/fixtures/images/example.png')) }
+    image { File.new(File.join(Rails.root, 'spec/fixtures/images/example.png')) }
   end
 end

@@ -37,7 +37,7 @@ describe User do
     describe "when the url is not valid" do
       let(:user) { User.new }
 
-      before(:each) { user.update_attribute(:website, 'blah') }
+      before(:each) { user.update_attributes(:website => 'blah') }
 
       it "cannot validate" do
         user.errors[:website].any?.should == true