Skip to content

Commit 31f8f15

Browse files
committed
Replace ensure_2xx and api_url let blocks in make_cookbook/upload_cookbook/delete_cookbook for before/after(:all) hook compatibility
Signed-off-by: John McCrae <[email protected]>
1 parent 976cda0 commit 31f8f15

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

oc-chef-pedant/lib/pedant/rspec/cookbook_util.rb

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -349,17 +349,24 @@ def cookbook_version_url(cookbook_name, cookbook_version)
349349
end
350350

351351
def delete_cookbook(requestor, name, version)
352-
delete(api_url.call("/#{cookbook_url_base}/#{name}/#{version}"),
352+
# Use direct platform.api_url for after(:all) compatibility
353+
delete(Pedant::Config.pedant_platform.api_url("/#{cookbook_url_base}/#{name}/#{version}"),
353354
requestor)
354355
end
355356

356357
def make_cookbook(requestor, name, version, opts = {})
357358
payload = new_cookbook(name, version, opts)
358-
ensure_2xx.call(upload_cookbook(requestor, name, version, payload))
359+
response = upload_cookbook(requestor, name, version, payload)
360+
# Inline ensure_2xx logic for before(:all) compatibility
361+
if response.code > 299
362+
raise "bad response code #{response.code} in response: #{response}"
363+
end
364+
response
359365
end
360366

361367
def upload_cookbook(requestor, name, version, payload)
362-
put(api_url.call("/#{cookbook_url_base}/#{name}/#{version}"),
368+
# Use direct platform.api_url for before(:all) compatibility
369+
put(Pedant::Config.pedant_platform.api_url("/#{cookbook_url_base}/#{name}/#{version}"),
363370
requestor, payload: payload)
364371
end
365372

0 commit comments

Comments
 (0)