From a3f8d9288cbcf9eae7658b466b6dda0d9ec7f2e8 Mon Sep 17 00:00:00 2001 From: Anthony Davis Date: Sat, 1 Feb 2014 19:30:23 -0600 Subject: [PATCH] VRFS-923 - deleting at the object level instead. works fine on my machine. --- ruby/spec/support/utilities.rb | 4 +++- web/spec/spec_helper.rb | 4 +--- web/spec/support/utilities.rb | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ruby/spec/support/utilities.rb b/ruby/spec/support/utilities.rb index 980456958..bcfd399ac 100644 --- a/ruby/spec/support/utilities.rb +++ b/ruby/spec/support/utilities.rb @@ -94,7 +94,9 @@ def wipe_s3_test_bucket :secret_access_key => test_config.aws_secret_access_key) test_bucket = s3.buckets[JAMKAZAM_TESTING_BUCKET] if test_bucket.name == JAMKAZAM_TESTING_BUCKET - #test_bucket.clear! + test_bucket.objects.each do |obj| + obj.delete + end end end end \ No newline at end of file diff --git a/web/spec/spec_helper.rb b/web/spec/spec_helper.rb index 6466c3e01..5dcd63570 100644 --- a/web/spec/spec_helper.rb +++ b/web/spec/spec_helper.rb @@ -96,10 +96,9 @@ Spork.prefork do config.include Requests::JsonHelpers, type: :request config.include Requests::FeatureHelpers, type: :feature - config.include Snapshot config.before(:suite) do - #set_up_snapshot + end config.before(:all) do @@ -140,7 +139,6 @@ Spork.prefork do end config.after(:suite) do - #tear_down_snapshot wipe_s3_test_bucket end end diff --git a/web/spec/support/utilities.rb b/web/spec/support/utilities.rb index 4074074a7..064b57ebd 100644 --- a/web/spec/support/utilities.rb +++ b/web/spec/support/utilities.rb @@ -37,7 +37,9 @@ def wipe_s3_test_bucket :secret_access_key => Rails.application.config.aws_secret_access_key) test_bucket = s3.buckets[JAMKAZAM_TESTING_BUCKET] if test_bucket.name == JAMKAZAM_TESTING_BUCKET - #test_bucket.clear! + test_bucket.objects.each do |obj| + obj.delete + end end end