Skip to content

Commit daf0d9d

Browse files
committed
Revert "Optimize spec_helper: skip Fog reset for most tests"
This reverts commit 9bc28c1.
1 parent 9bc28c1 commit daf0d9d

1 file changed

Lines changed: 8 additions & 19 deletions

File tree

spec/spec_helper.rb

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -159,14 +159,6 @@
159159
# calling this more than once will load tasks again and 'invoke' or 'execute' calls
160160
# will call rake tasks multiple times
161161
Application.load_tasks
162-
163-
# Set up Fog mock buckets once at suite start instead of every test
164-
if Fog.mock?
165-
CloudController::DependencyLocator.instance.droplet_blobstore.ensure_bucket_exists
166-
CloudController::DependencyLocator.instance.package_blobstore.ensure_bucket_exists
167-
CloudController::DependencyLocator.instance.global_app_bits_cache.ensure_bucket_exists
168-
CloudController::DependencyLocator.instance.buildpack_blobstore.ensure_bucket_exists
169-
end
170162
end
171163

172164
rspec_config.before do
@@ -177,24 +169,21 @@
177169
TestConfig.context = example.metadata[:job_context] || :api
178170
TestConfig.reset
179171

180-
VCAP::CloudController::SecurityContext.clear
181-
VCAP::Request.current_id = nil
182-
allow_any_instance_of(VCAP::CloudController::UaaTokenDecoder).to receive(:uaa_issuer).and_return(UAAIssuer::ISSUER)
183-
184-
mock_redis = MockRedis.new
185-
allow(Redis).to receive(:new).and_return(mock_redis)
186-
end
187-
188-
# Only reset Fog mocks for tests that use blobstores (tagged with :fog_reset)
189-
# This avoids the overhead of clearing and recreating buckets for every test
190-
rspec_config.before(:each, :fog_reset) do
191172
Fog::Mock.reset
173+
192174
if Fog.mock?
193175
CloudController::DependencyLocator.instance.droplet_blobstore.ensure_bucket_exists
194176
CloudController::DependencyLocator.instance.package_blobstore.ensure_bucket_exists
195177
CloudController::DependencyLocator.instance.global_app_bits_cache.ensure_bucket_exists
196178
CloudController::DependencyLocator.instance.buildpack_blobstore.ensure_bucket_exists
197179
end
180+
181+
VCAP::CloudController::SecurityContext.clear
182+
VCAP::Request.current_id = nil
183+
allow_any_instance_of(VCAP::CloudController::UaaTokenDecoder).to receive(:uaa_issuer).and_return(UAAIssuer::ISSUER)
184+
185+
mock_redis = MockRedis.new
186+
allow(Redis).to receive(:new).and_return(mock_redis)
198187
end
199188

200189
rspec_config.around do |example|

0 commit comments

Comments
 (0)