From 7b11da632a60c99443ca98dd689aae2416b798b5 Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Tue, 29 Mar 2016 10:26:26 +0200 Subject: [PATCH 1/3] Isolate CarrierWave uploads in test enviroment --- spec/spec_helper.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 596d607f2a..a769bcb2a5 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -45,6 +45,10 @@ RSpec.configure do |config| config.before(:suite) do TestEnv.init end + + config.after(:suite) do + FileUtils.rm_rf('tmp/tests/files') + end end FactoryGirl::SyntaxRunner.class_eval do @@ -58,3 +62,4 @@ RSpec::Rails::ViewRendering::EmptyTemplatePathSetDecorator.class_eval do end ActiveRecord::Migration.maintain_test_schema! +CarrierWave.root = 'tmp/tests/files' From 6e747d720de3d91d75b3ce189ac7d95cf5bbc74c Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Wed, 30 Mar 2016 13:57:01 +0200 Subject: [PATCH 2/3] Move CarrierWave test env config to separate file --- spec/spec_helper.rb | 5 ----- spec/support/carrierwave.rb | 7 +++++++ 2 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 spec/support/carrierwave.rb diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index a769bcb2a5..596d607f2a 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -45,10 +45,6 @@ RSpec.configure do |config| config.before(:suite) do TestEnv.init end - - config.after(:suite) do - FileUtils.rm_rf('tmp/tests/files') - end end FactoryGirl::SyntaxRunner.class_eval do @@ -62,4 +58,3 @@ RSpec::Rails::ViewRendering::EmptyTemplatePathSetDecorator.class_eval do end ActiveRecord::Migration.maintain_test_schema! -CarrierWave.root = 'tmp/tests/files' diff --git a/spec/support/carrierwave.rb b/spec/support/carrierwave.rb new file mode 100644 index 0000000000..aa89afd8fb --- /dev/null +++ b/spec/support/carrierwave.rb @@ -0,0 +1,7 @@ +CarrierWave.root = 'tmp/tests/uploads' + +RSpec.configure do |config| + config.after(:suite) do + FileUtils.rm_rf('tmp/tests/uploads') + end +end From 6f0cba11daea49cbb60166558e350e0ca61b7796 Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Wed, 30 Mar 2016 15:40:49 +0200 Subject: [PATCH 3/3] Ensure uploads dir exists when running backup specs --- spec/tasks/gitlab/backup_rake_spec.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spec/tasks/gitlab/backup_rake_spec.rb b/spec/tasks/gitlab/backup_rake_spec.rb index 320be9a0b6..05fc4c4554 100644 --- a/spec/tasks/gitlab/backup_rake_spec.rb +++ b/spec/tasks/gitlab/backup_rake_spec.rb @@ -7,8 +7,12 @@ describe 'gitlab:app namespace rake task' do Rake.application.rake_require 'tasks/gitlab/backup' Rake.application.rake_require 'tasks/gitlab/shell' Rake.application.rake_require 'tasks/gitlab/db' + # empty task as env is already loaded Rake::Task.define_task :environment + + # We need this directory to run `gitlab:backup:create` task + FileUtils.mkdir_p('public/uploads') end def run_rake_task(task_name)