From 7969b52035fd709c6b14d87a9f658b5d940b1206 Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Thu, 18 Aug 2011 11:11:08 -0700
Subject: [PATCH] Revert "remove uploaded test images after running the
 specs/cucumber"

This reverts commit a6eb275c7acc93cc42bc1a4e365d111ab516ff83.
---
 app/uploaders/processed_image.rb   | 5 +----
 app/uploaders/unprocessed_image.rb | 5 +----
 features/support/env.rb            | 7 -------
 spec/spec_helper.rb                | 3 ---
 4 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/app/uploaders/processed_image.rb b/app/uploaders/processed_image.rb
index 1d79e07ba..226fe0df4 100644
--- a/app/uploaders/processed_image.rb
+++ b/app/uploaders/processed_image.rb
@@ -14,10 +14,7 @@ class ProcessedImage < CarrierWave::Uploader::Base
   end
 
   def filename
-    fn = model.random_string
-    fn += "-test" if Rails.env = 'test'
-    fn += File.extname(@filename) if @filename
-    fn
+    model.random_string + File.extname(@filename) if @filename
   end
 
   version :thumb_small do
diff --git a/app/uploaders/unprocessed_image.rb b/app/uploaders/unprocessed_image.rb
index d6a4cb319..579241253 100644
--- a/app/uploaders/unprocessed_image.rb
+++ b/app/uploaders/unprocessed_image.rb
@@ -14,10 +14,7 @@ class UnprocessedImage < CarrierWave::Uploader::Base
   end
 
   def filename
-    fn = model.random_string
-    fn += "-test" if Rails.env = 'test'
-    fn += File.extname(@filename) if @filename
-    fn
+    model.random_string + File.extname(@filename) if @filename
   end
 
   version :thumb_small
diff --git a/features/support/env.rb b/features/support/env.rb
index a304a6cb2..a00b28268 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -52,13 +52,6 @@ Before do
   Devise.mailer.deliveries = []
 end
 
-After do
-  # Rollback any images created during the features.
-  `rm -rf #{Rails.root}/tmp/uploads/*`
-  `rm -rf #{Rails.root}/public/uploads/images/*-test.png`
-  `rm -rf #{Rails.root}/public/uploads/tmp/`
-end
-
 silence_warnings do
   SERVICES['facebook'] = {'app_id' => :fake, 'app_secret' => 'sdoigjosdfijg'}
   AppConfig[:configured_services] << 'facebook'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index ef4eef7cb..c232f4e47 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -41,10 +41,7 @@ RSpec.configure do |config|
   end
 
   config.after(:all) do
-    # Rollback any images created during the specs
     `rm -rf #{Rails.root}/tmp/uploads/*`
-    `rm -rf #{Rails.root}/public/uploads/images/*-test.png`
-    `rm -rf #{Rails.root}/public/uploads/tmp/`
   end
 end