Skip to content

Commit fbf160f

Browse files
committed
fix tests
1 parent ff084f7 commit fbf160f

2 files changed

Lines changed: 12 additions & 8 deletions

File tree

‎spec/request/packages_spec.rb‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,7 +1017,6 @@
10171017
create(:app_model, guid: 'woof-guid', space: space, name: 'meow')
10181018
end
10191019
let(:space) { create(:space) }
1020-
let(:bits_download_url) { CloudController::DependencyLocator.instance.blobstore_url_generator.package_download_url(package_model) }
10211020
let(:guid) { package_model.guid }
10221021
let(:temp_file) do
10231022
file = File.join(Dir.mktmpdir, 'application.zip')
@@ -1043,8 +1042,7 @@
10431042
Timecop.freeze do
10441043
get "/v3/packages/#{guid}/download", {}, user_header
10451044

1046-
expect(last_response.status).to eq(302)
1047-
expect(last_response.headers['Location']).to eq(bits_download_url)
1045+
expect(last_response.status).to eq(200)
10481046

10491047
expected_metadata = { package_guid: package_model.guid }.to_json
10501048

@@ -1076,7 +1074,7 @@
10761074
let(:org) { space.organization }
10771075
let(:user) { create(:user) }
10781076
let(:expected_codes_and_responses) do
1079-
h = Hash.new({ code: 302 }.freeze)
1077+
h = Hash.new({ code: 200 }.freeze)
10801078
h['global_auditor'] = { code: 403 }
10811079
h['org_auditor'] = { code: 404 }
10821080
h['org_billing_manager'] = { code: 404 }

‎spec/support/bootstrap/test_config.rb‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
require 'cloud_controller/dependency_locator'
55

66
module TestConfig
7+
BLOBSTORE_PATH = Dir.mktmpdir('cc-test-blobstore')
8+
79
class << self
810
def context
911
@context || :api
@@ -45,20 +47,24 @@ def defaults
4547
nginx: { use_nginx: true },
4648
resource_pool: {
4749
resource_directory_key: 'spec-cc-resources',
48-
blobstore_type: 'local-temp-storage'
50+
blobstore_type: 'local',
51+
local_blobstore_path: BLOBSTORE_PATH
4952
},
5053
packages: {
5154
app_package_directory_key: 'cc-packages',
52-
blobstore_type: 'local-temp-storage',
55+
blobstore_type: 'local',
56+
local_blobstore_path: BLOBSTORE_PATH,
5357
max_valid_packages_stored: 42
5458
},
5559
buildpacks: {
5660
buildpack_directory_key: 'cc-buildpacks',
57-
blobstore_type: 'local-temp-storage'
61+
blobstore_type: 'local',
62+
local_blobstore_path: BLOBSTORE_PATH
5863
},
5964
droplets: {
6065
droplet_directory_key: 'cc-droplets',
61-
blobstore_type: 'local-temp-storage',
66+
blobstore_type: 'local',
67+
local_blobstore_path: BLOBSTORE_PATH,
6268
max_staged_droplets_stored: 42
6369
},
6470
db: DbConfig.new.config

0 commit comments

Comments
 (0)