From b11bd23da24544193bbb24ded5f03a8c9b4e00c2 Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Thu, 18 Aug 2011 11:13:00 -0700
Subject: [PATCH] Revert "Revert "remove uploaded test images after running the
specs/cucumber"" -- using == now instead of =
This reverts commit 7969b52035fd709c6b14d87a9f658b5d940b1206.
---
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, 18 insertions(+), 2 deletions(-)
diff --git a/app/uploaders/processed_image.rb b/app/uploaders/processed_image.rb
index 226fe0df47..5992fa2eef 100644
--- a/app/uploaders/processed_image.rb
+++ b/app/uploaders/processed_image.rb
@@ -14,7 +14,10 @@ class ProcessedImage < CarrierWave::Uploader::Base
end
def filename
- model.random_string + File.extname(@filename) if @filename
+ fn = model.random_string
+ fn += "-test" if Rails.env == 'test'
+ fn += File.extname(@filename) if @filename
+ fn
end
version :thumb_small do
diff --git a/app/uploaders/unprocessed_image.rb b/app/uploaders/unprocessed_image.rb
index 5792412531..c21ca20918 100644
--- a/app/uploaders/unprocessed_image.rb
+++ b/app/uploaders/unprocessed_image.rb
@@ -14,7 +14,10 @@ class UnprocessedImage < CarrierWave::Uploader::Base
end
def filename
- model.random_string + File.extname(@filename) if @filename
+ fn = model.random_string
+ fn += "-test" if Rails.env == 'test'
+ fn += File.extname(@filename) if @filename
+ fn
end
version :thumb_small
diff --git a/features/support/env.rb b/features/support/env.rb
index a00b282683..a304a6cb2d 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -52,6 +52,13 @@ 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 c232f4e477..ef4eef7cb4 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -41,7 +41,10 @@ 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
--
GitLab