From 018c9e9e16b6cc7cc7e7509b2b6aafed8b6c44c8 Mon Sep 17 00:00:00 2001 From: Pete Higgins Date: Tue, 28 Jul 2020 20:49:48 -0700 Subject: Inline a shared context and remove it and DSL method. Signed-off-by: Pete Higgins --- spec/integration/knife/diff_spec.rb | 4 +++- spec/integration/knife/download_spec.rb | 4 +++- spec/integration/knife/upload_spec.rb | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) (limited to 'spec/integration') diff --git a/spec/integration/knife/diff_spec.rb b/spec/integration/knife/diff_spec.rb index c56389727d..41ae5ea519 100644 --- a/spec/integration/knife/diff_spec.rb +++ b/spec/integration/knife/diff_spec.rb @@ -318,7 +318,9 @@ describe "knife diff", :workstation do end end # without versioned cookbooks - with_versioned_cookbooks do + context "with versioned cookbooks" do + before { Chef::Config[:versioned_cookbooks] = true } + when_the_chef_server "has one of each thing" do before do client "x", "{}" diff --git a/spec/integration/knife/download_spec.rb b/spec/integration/knife/download_spec.rb index ed63b6896a..7bdec7b356 100644 --- a/spec/integration/knife/download_spec.rb +++ b/spec/integration/knife/download_spec.rb @@ -594,7 +594,9 @@ describe "knife download", :workstation do end end # without versioned cookbooks - with_versioned_cookbooks do + context "with versioned cookbooks" do + before { Chef::Config[:versioned_cookbooks] = true } + when_the_chef_server "has one of each thing" do before do client "x", {} diff --git a/spec/integration/knife/upload_spec.rb b/spec/integration/knife/upload_spec.rb index dd539db507..37cfcefa32 100644 --- a/spec/integration/knife/upload_spec.rb +++ b/spec/integration/knife/upload_spec.rb @@ -800,7 +800,9 @@ describe "knife upload", :workstation do end end # without versioned cookbooks - with_versioned_cookbooks do + context "with versioned cookbooks" do + before { Chef::Config[:versioned_cookbooks] = true } + when_the_chef_server "has one of each thing" do before do -- cgit v1.2.1