diff options
| -rw-r--r-- | spec/support/carrierwave.rb | 2 | ||||
| -rw-r--r-- | spec/support/setup_builds_storage.rb | 17 |
2 files changed, 9 insertions, 10 deletions
diff --git a/spec/support/carrierwave.rb b/spec/support/carrierwave.rb index aa89afd8fb3..72af2c70324 100644 --- a/spec/support/carrierwave.rb +++ b/spec/support/carrierwave.rb @@ -1,7 +1,7 @@ CarrierWave.root = 'tmp/tests/uploads' RSpec.configure do |config| - config.after(:suite) do + config.after(:each) do FileUtils.rm_rf('tmp/tests/uploads') end end diff --git a/spec/support/setup_builds_storage.rb b/spec/support/setup_builds_storage.rb index a4f21e95338..2e7c88bfc09 100644 --- a/spec/support/setup_builds_storage.rb +++ b/spec/support/setup_builds_storage.rb @@ -1,19 +1,18 @@ RSpec.configure do |config| def builds_path - Rails.root.join('tmp/builds') + Rails.root.join('tmp/tests/builds') end - config.before(:each) do - FileUtils.mkdir_p(builds_path) - FileUtils.touch(File.join(builds_path, ".gitkeep")) + config.before(:suite) do Settings.gitlab_ci['builds_path'] = builds_path end - config.after(:suite) do - Dir[File.join(builds_path, '*')].each do |path| - next if File.basename(path) == '.gitkeep' + config.before(:all) do + FileUtils.mkdir_p(builds_path) + end - FileUtils.rm_rf(path) - end + config.before(:each) do + FileUtils.rm_rf(builds_path) + FileUtils.mkdir_p(builds_path) end end |