Skip to content

Commit f777af5

Browse files
sethboylessethboyles
committed
more keyword argument fixes
1 parent 4fe4190 commit f777af5

23 files changed

+301
-34
lines changed

‎spec/request/apps_spec.rb‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1980,7 +1980,11 @@
19801980
end
19811981

19821982
let(:expected_codes_and_responses) do
1983+
<<<<<<< HEAD
19831984
h = Hash.new({ code: 200 }.freeze)
1985+
=======
1986+
h = Hash.new({code: 200})
1987+
>>>>>>> 2f67f926f (more keyword argument fixes)
19841988
h['org_auditor'] = { code: 404 }
19851989
h['org_billing_manager'] = { code: 404 }
19861990
h['no_role'] = { code: 404 }
@@ -2033,7 +2037,11 @@
20332037
context 'permissions for deleting an app' do
20342038
let(:api_call) { ->(user_headers) { delete "/v3/apps/#{app_model.guid}", nil, user_headers } }
20352039
let(:expected_codes_and_responses) do
2040+
<<<<<<< HEAD
20362041
h = Hash.new({ code: 202 }.freeze)
2042+
=======
2043+
h = Hash.new({code: 202})
2044+
>>>>>>> 2f67f926f (more keyword argument fixes)
20372045
%w[admin_read_only global_auditor org_manager space_auditor space_manager space_supporter].each do |r|
20382046
h[r] = { code: 403, errors: CF_NOT_AUTHORIZED }
20392047
end
@@ -2257,7 +2265,11 @@
22572265
context 'permissions for updating an app' do
22582266
let(:api_call) { ->(user_headers) { patch "/v3/apps/#{app_model.guid}", update_request.to_json, user_headers } }
22592267
let(:expected_codes_and_responses) do
2268+
<<<<<<< HEAD
22602269
h = Hash.new({ code: 200, response_object: expected_response_object }.freeze)
2270+
=======
2271+
h = Hash.new({code: 200, response_object: expected_response_object})
2272+
>>>>>>> 2f67f926f (more keyword argument fixes)
22612273
%w[admin_read_only global_auditor org_manager space_auditor space_manager space_supporter].each do |r|
22622274
h[r] = { code: 403, errors: CF_NOT_AUTHORIZED }
22632275
end
@@ -2387,7 +2399,11 @@
23872399
end
23882400

23892401
let(:expected_codes_and_responses) do
2402+
<<<<<<< HEAD
23902403
h = Hash.new({ code: 403, errors: CF_NOT_AUTHORIZED }.freeze)
2404+
=======
2405+
h = Hash.new({code: 403, errors: CF_NOT_AUTHORIZED})
2406+
>>>>>>> 2f67f926f (more keyword argument fixes)
23912407
h['no_role'] = { code: 404 }
23922408
h['org_auditor'] = { code: 404 }
23932409
h['org_billing_manager'] = { code: 404 }
@@ -2727,7 +2743,11 @@
27272743
end
27282744

27292745
let(:expected_codes_and_responses) do
2746+
<<<<<<< HEAD
27302747
h = Hash.new({ code: 403, errors: CF_NOT_AUTHORIZED }.freeze)
2748+
=======
2749+
h = Hash.new({code: 403, errors: CF_NOT_AUTHORIZED})
2750+
>>>>>>> 2f67f926f (more keyword argument fixes)
27312751
h['no_role'] = { code: 404 }
27322752
h['org_auditor'] = { code: 404 }
27332753
h['org_billing_manager'] = { code: 404 }
@@ -2896,7 +2916,11 @@
28962916
end
28972917

28982918
let(:expected_codes_and_responses) do
2919+
<<<<<<< HEAD
28992920
h = Hash.new({ code: 403, errors: CF_NOT_AUTHORIZED }.freeze)
2921+
=======
2922+
h = Hash.new({code: 403, errors: CF_NOT_AUTHORIZED})
2923+
>>>>>>> 2f67f926f (more keyword argument fixes)
29002924
h['no_role'] = { code: 404 }
29012925
h['org_auditor'] = { code: 404 }
29022926
h['org_billing_manager'] = { code: 404 }
@@ -2981,7 +3005,11 @@
29813005
end
29823006

29833007
let(:expected_codes_and_responses) do
3008+
<<<<<<< HEAD
29843009
h = Hash.new({ code: 200, response_object: expected_response }.freeze)
3010+
=======
3011+
h = Hash.new({code: 200, response_object: expected_response})
3012+
>>>>>>> 2f67f926f (more keyword argument fixes)
29853013
h['no_role'] = { code: 404 }
29863014
h['org_billing_manager'] = { code: 404 }
29873015
h['org_auditor'] = { code: 404 }
@@ -3044,7 +3072,11 @@
30443072
}
30453073
end
30463074
let(:expected_codes_and_responses) do
3075+
<<<<<<< HEAD
30473076
h = Hash.new({ code: 200, response_object: expected_response }.freeze)
3077+
=======
3078+
h = Hash.new({code: 200, response_object: expected_response})
3079+
>>>>>>> 2f67f926f (more keyword argument fixes)
30483080
h['no_role'] = { code: 404 }
30493081
h['org_billing_manager'] = { code: 404 }
30503082
h['org_auditor'] = { code: 404 }
@@ -3102,7 +3134,11 @@
31023134
end
31033135

31043136
let(:expected_codes_and_responses) do
3137+
<<<<<<< HEAD
31053138
h = Hash.new({ code: 403, errors: CF_NOT_AUTHORIZED }.freeze)
3139+
=======
3140+
h = Hash.new({code: 403, errors: CF_NOT_AUTHORIZED})
3141+
>>>>>>> 2f67f926f (more keyword argument fixes)
31063142
h['no_role'] = { code: 404 }
31073143
h['org_auditor'] = { code: 404 }
31083144
h['org_billing_manager'] = { code: 404 }
@@ -3322,7 +3358,11 @@
33223358
}
33233359
end
33243360
let(:expected_codes_and_responses) do
3361+
<<<<<<< HEAD
33253362
h = Hash.new({ code: 404 }.freeze)
3363+
=======
3364+
h = Hash.new({code: 404})
3365+
>>>>>>> 2f67f926f (more keyword argument fixes)
33263366
%w[global_auditor admin_read_only org_manager space_auditor space_manager].each do |r|
33273367
h[r] = { code: 403, errors: CF_NOT_AUTHORIZED }
33283368
end
@@ -3371,7 +3411,11 @@
33713411

33723412
it_behaves_like 'permissions for single object endpoint', ALL_PERMISSIONS do
33733413
let(:expected_codes_and_responses) do
3414+
<<<<<<< HEAD
33743415
h = Hash.new({ code: 404 }.freeze)
3416+
=======
3417+
h = Hash.new({code: 404})
3418+
>>>>>>> 2f67f926f (more keyword argument fixes)
33753419
h['global_auditor'] = h['org_manager'] = h['space_auditor'] = h['space_manager'] = { code: 403 }
33763420
h['admin'] = h['admin_read_only'] = h['space_developer'] = h['space_supporter'] = {
33773421
code: 200,
@@ -3388,7 +3432,11 @@
33883432

33893433
it_behaves_like 'permissions for single object endpoint', ALL_PERMISSIONS do
33903434
let(:expected_codes_and_responses) do
3435+
<<<<<<< HEAD
33913436
h = Hash.new({ code: 404 }.freeze)
3437+
=======
3438+
h = Hash.new({code: 404})
3439+
>>>>>>> 2f67f926f (more keyword argument fixes)
33923440
h['global_auditor'] = h['org_manager'] = h['space_auditor'] = h['space_manager'] = h['space_developer'] = h['space_supporter'] = { code: 403 }
33933441
h['admin'] = h['admin_read_only'] = {
33943442
code: 200,
@@ -3421,7 +3469,11 @@
34213469
end
34223470

34233471
let(:expected_codes_and_responses) do
3472+
<<<<<<< HEAD
34243473
h = Hash.new({ code: 404 }.freeze)
3474+
=======
3475+
h = Hash.new({code: 404})
3476+
>>>>>>> 2f67f926f (more keyword argument fixes)
34253477
h['admin'] = { code: 200, response_object: read_all_response }
34263478
h['admin_read_only'] = { code: 200, response_object: read_all_response }
34273479
h['global_auditor'] = { code: 200, response_object: read_basic_response }

‎spec/request/environment_variable_groups_spec.rb‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,11 @@
7777
let(:org) { VCAP::CloudController::Organization.make }
7878
let(:space) { VCAP::CloudController::Space.make(organization: org) }
7979
let(:api_call) { ->(user_headers) { get '/v3/environment_variable_groups/running', nil, user_headers } }
80+
<<<<<<< HEAD
8081
let(:expected_codes_and_responses) { Hash.new({ code: 200 }.freeze) }
82+
=======
83+
let(:expected_codes_and_responses) { Hash.new({code: 200}) }
84+
>>>>>>> 2f67f926f (more keyword argument fixes)
8185

8286
before do
8387
space.organization.add_user(user)
@@ -193,7 +197,11 @@
193197
end
194198

195199
let(:expected_codes_and_responses) do
200+
<<<<<<< HEAD
196201
h = Hash.new({ code: 403 }.freeze)
202+
=======
203+
h = Hash.new({code: 403})
204+
>>>>>>> 2f67f926f (more keyword argument fixes)
197205
h['admin'] = { code: 200, response_object: env_group_json }
198206
h
199207
end

‎spec/request/isolation_segments_spec.rb‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,11 @@
8888
let(:user) { VCAP::CloudController::User.make }
8989

9090
let(:expected_codes_and_responses) do
91+
<<<<<<< HEAD
9192
h = Hash.new({ code: 200, response_guids: [org1.guid, org2.guid, space.organization.guid] }.freeze)
93+
=======
94+
h = Hash.new({code: 200, response_guids: [org1.guid, org2.guid, space.organization.guid]})
95+
>>>>>>> 2f67f926f (more keyword argument fixes)
9296
h['org_auditor'] = { code: 200, response_guids: [space.organization.guid] }
9397
h['org_billing_manager'] = { code: 200, response_guids: [space.organization.guid] }
9498
h['org_manager'] = { code: 200, response_guids: [space.organization.guid] }
@@ -136,7 +140,11 @@
136140
let(:user) { VCAP::CloudController::User.make }
137141

138142
let(:expected_codes_and_responses) do
143+
<<<<<<< HEAD
139144
h = Hash.new({ code: 200, response_guids: [space1.guid, space2.guid] }.freeze)
145+
=======
146+
h = Hash.new({code: 200, response_guids: [space1.guid, space2.guid]})
147+
>>>>>>> 2f67f926f (more keyword argument fixes)
140148
h['org_auditor'] = { code: 200, response_guids: [] }
141149
h['org_billing_manager'] = { code: 200, response_guids: [] }
142150
h['org_manager'] = { code: 200, response_guids: [space1.guid] }
@@ -230,7 +238,11 @@
230238
let(:org) { space.organization }
231239
let(:user) { VCAP::CloudController::User.make }
232240
let(:expected_codes_and_responses) do
241+
<<<<<<< HEAD
233242
h = Hash.new({ code: 200, response_object: expected_response_object }.freeze)
243+
=======
244+
h = Hash.new({code: 200, response_object: expected_response_object})
245+
>>>>>>> 2f67f926f (more keyword argument fixes)
234246
h['no_role'] = { code: 404 }
235247
h
236248
end
@@ -243,7 +255,11 @@
243255
let(:org) { space.organization }
244256
let(:user) { VCAP::CloudController::User.make }
245257
let(:expected_codes_and_responses) do
258+
<<<<<<< HEAD
246259
h = Hash.new({ code: 404 }.freeze)
260+
=======
261+
h = Hash.new({code: 404})
262+
>>>>>>> 2f67f926f (more keyword argument fixes)
247263
h['admin'] = { code: 200, response_object: expected_response_object }
248264
h['admin_read_only'] = { code: 200, response_object: expected_response_object }
249265
h['global_auditor'] = { code: 200, response_object: expected_response_object }
@@ -485,7 +501,11 @@
485501
let(:org) { space.organization }
486502
let(:user) { VCAP::CloudController::User.make }
487503
let(:expected_codes_and_responses) do
504+
<<<<<<< HEAD
488505
h = Hash.new({ code: 200, response_guids: [iso_seg1.guid] }.freeze)
506+
=======
507+
h = Hash.new({code: 200, response_guids: [iso_seg1.guid]})
508+
>>>>>>> 2f67f926f (more keyword argument fixes)
489509
h['admin'] = { code: 200, response_guids: [iso_seg1.guid, VCAP::CloudController::IsolationSegmentModel::SHARED_ISOLATION_SEGMENT_GUID] }
490510
h['admin_read_only'] = { code: 200, response_guids: [iso_seg1.guid, VCAP::CloudController::IsolationSegmentModel::SHARED_ISOLATION_SEGMENT_GUID] }
491511
h['global_auditor'] = { code: 200, response_guids: [iso_seg1.guid, VCAP::CloudController::IsolationSegmentModel::SHARED_ISOLATION_SEGMENT_GUID] }

‎spec/request/jobs_spec.rb‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,11 @@ def display_name
167167

168168
context 'when the user has a global scope or a local role' do
169169
let(:api_call) { ->(user_headers) { get "/v3/jobs/#{job.guid}", nil, user_headers } }
170+
<<<<<<< HEAD
170171
let(:expected_codes_and_responses) { Hash.new({ code: 200 }.freeze) }
172+
=======
173+
let(:expected_codes_and_responses) { Hash.new({code: 200}) }
174+
>>>>>>> 2f67f926f (more keyword argument fixes)
171175

172176
before do
173177
space.organization.add_user(user)

‎spec/request/route_destinations_spec.rb‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,17 @@
157157

158158
context 'when the user is a member in the routes org' do
159159
let(:expected_codes_and_responses) do
160+
<<<<<<< HEAD
160161
h = Hash.new(
161162
{ code: 200,
162163
response_object: response_json }.freeze
163164
)
165+
=======
166+
h = Hash.new({
167+
code: 200,
168+
response_object: response_json
169+
})
170+
>>>>>>> 2f67f926f (more keyword argument fixes)
164171

165172
h['org_billing_manager'] = { code: 404 }
166173
h['no_role'] = { code: 404 }
@@ -291,7 +298,11 @@
291298
end
292299

293300
let(:expected_codes_and_responses) do
301+
<<<<<<< HEAD
294302
h = Hash.new({ code: 403, errors: CF_NOT_AUTHORIZED }.freeze)
303+
=======
304+
h = Hash.new({code: 403, errors: CF_NOT_AUTHORIZED})
305+
>>>>>>> 2f67f926f (more keyword argument fixes)
295306
h['admin'] = { code: 200, response_object: response_json }
296307
h['space_developer'] = { code: 200, response_object: response_json }
297308
h['space_supporter'] = { code: 200, response_object: response_json }
@@ -801,7 +812,11 @@
801812
}
802813
end
803814
let(:expected_codes_and_responses) do
815+
<<<<<<< HEAD
804816
h = Hash.new({ code: 403, errors: CF_NOT_AUTHORIZED }.freeze)
817+
=======
818+
h = Hash.new({code: 403, errors: CF_NOT_AUTHORIZED})
819+
>>>>>>> 2f67f926f (more keyword argument fixes)
805820
h['admin'] = { code: 200, response_object: response_json }
806821
h['space_developer'] = { code: 200, response_object: response_json }
807822
h['space_supporter'] = { code: 200, response_object: response_json }
@@ -1244,7 +1259,11 @@
12441259
end
12451260

12461261
let(:expected_codes_and_responses) do
1262+
<<<<<<< HEAD
12471263
h = Hash.new({ code: 403, errors: CF_NOT_AUTHORIZED }.freeze)
1264+
=======
1265+
h = Hash.new({code: 403, errors: CF_NOT_AUTHORIZED})
1266+
>>>>>>> 2f67f926f (more keyword argument fixes)
12481267
h['admin'] = { code: 200 }
12491268
h['space_developer'] = { code: 200 }
12501269
h['space_supporter'] = { code: 200 }
@@ -1367,7 +1386,11 @@
13671386
end
13681387

13691388
let(:expected_codes_and_responses) do
1389+
<<<<<<< HEAD
13701390
h = Hash.new({ code: 403, errors: CF_NOT_AUTHORIZED }.freeze)
1391+
=======
1392+
h = Hash.new({code: 403, errors: CF_NOT_AUTHORIZED})
1393+
>>>>>>> 2f67f926f (more keyword argument fixes)
13711394
h['admin'] = { code: 204 }
13721395
h['space_developer'] = { code: 204 }
13731396
h['space_supporter'] = { code: 204 }

‎spec/request/routes_spec.rb‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2695,6 +2695,7 @@
26952695
describe 'permissions' do
26962696
it_behaves_like 'permissions for single object endpoint', ALL_PERMISSIONS do
26972697
let(:expected_codes_and_responses) do
2698+
<<<<<<< HEAD
26982699
h = Hash.new({ code: 200, response_object: {
26992700
data: [
27002701
{
@@ -2705,6 +2706,18 @@
27052706
self: { href: %r{#{Regexp.escape(link_prefix)}/v3/routes/#{route.guid}/relationships/shared_spaces} }
27062707
}
27072708
} }.freeze)
2709+
=======
2710+
h = Hash.new({code: 200, response_object: {
2711+
data: [
2712+
{
2713+
guid: target_space_1.guid
2714+
}
2715+
],
2716+
links: {
2717+
self: { href: %r{#{Regexp.escape(link_prefix)}/v3/routes/#{route.guid}/relationships/shared_spaces} }
2718+
}
2719+
}})
2720+
>>>>>>> 2f67f926f (more keyword argument fixes)
27082721

27092722
h['org_billing_manager'] = { code: 404 }
27102723
h['no_role'] = { code: 404 }

‎spec/request/service_credential_bindings_spec.rb‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,17 @@
114114
end
115115

116116
let(:expected_codes_and_responses) do
117+
<<<<<<< HEAD
117118
Hash.new(
118119
{ code: 200,
119120
response_objects: [] }.freeze
120121
).tap do |h|
122+
=======
123+
Hash.new({
124+
code: 200,
125+
response_objects: []
126+
}).tap do |h|
127+
>>>>>>> 2f67f926f (more keyword argument fixes)
121128
h['admin'] = all_bindings
122129
h['admin_read_only'] = all_bindings
123130
h['global_auditor'] = all_bindings
@@ -506,7 +513,11 @@ def check_filtered_bindings(*bindings)
506513
let(:api_call) { ->(user_headers) { get '/v3/service_credential_bindings/no-binding', nil, user_headers } }
507514

508515
let(:expected_codes_and_responses) do
516+
<<<<<<< HEAD
509517
Hash.new({ code: 404 }.freeze)
518+
=======
519+
Hash.new({code: 404})
520+
>>>>>>> 2f67f926f (more keyword argument fixes)
510521
end
511522

512523
it_behaves_like 'permissions for single object endpoint', ALL_PERMISSIONS
@@ -721,7 +732,11 @@ def check_filtered_bindings(*bindings)
721732
context 'permissions' do
722733
it_behaves_like 'permissions for single object endpoint', ALL_PERMISSIONS do
723734
let(:expected_codes_and_responses) do
735+
<<<<<<< HEAD
724736
h = Hash.new({ code: 404, response_object: binding_credentials }.freeze)
737+
=======
738+
h = Hash.new({code: 404, response_object: binding_credentials})
739+
>>>>>>> 2f67f926f (more keyword argument fixes)
725740
h['admin'] = h['admin_read_only'] = h['space_developer'] = { code: 200 }
726741
h
727742
end
@@ -2428,7 +2443,11 @@ def check_filtered_bindings(*bindings)
24282443
end
24292444

24302445
let(:expected_codes_and_responses) do
2446+
<<<<<<< HEAD
24312447
h = Hash.new({ code: 404 }.freeze)
2448+
=======
2449+
h = Hash.new({code: 404})
2450+
>>>>>>> 2f67f926f (more keyword argument fixes)
24322451
h['admin'] = { code: 202 }
24332452
h['admin_read_only'] = h['global_auditor'] = { code: 403 }
24342453
h

0 commit comments

Comments
 (0)