chef-dk 3.3.23 → 3.4.38

data/spec/unit/policyfile/git_lock_fetcher_spec.rb

@@ -29,41 +29,41 @@ describe ChefDK::Policyfile::GitLockFetcher do
   let(:repo) { "https://github.com/monkeynews/bananas" }
 
   let(:minimal_lockfile_json) do
-    <<-E
-{
-  "revision_id": "#{revision_id}",
-  "name": "install-example",
-  "run_list": [
-    "recipe[#{cookbook_name}::default]"
-  ],
-  "cookbook_locks": {
-    "#{cookbook_name}": {
-      "version": "2.3.4",
-      "identifier": "#{identifier}",
-      "dotted_decimal_identifier": "70567763561641081.489844270461035.258281553147148",
-      "cache_key": "#{cookbook_name}-#{git_revision}",
-      "source_options": {
-        "git": "#{repo}",
-        "revision": "#{git_revision}"
+    <<~E
+      {
+        "revision_id": "#{revision_id}",
+        "name": "install-example",
+        "run_list": [
+          "recipe[#{cookbook_name}::default]"
+        ],
+        "cookbook_locks": {
+          "#{cookbook_name}": {
+            "version": "2.3.4",
+            "identifier": "#{identifier}",
+            "dotted_decimal_identifier": "70567763561641081.489844270461035.258281553147148",
+            "cache_key": "#{cookbook_name}-#{git_revision}",
+            "source_options": {
+              "git": "#{repo}",
+              "revision": "#{git_revision}"
+            }
+          }
+        },
+        "default_attributes": {},
+        "override_attributes": {},
+        "solution_dependencies": {
+          "Policyfile": [
+            [
+              "#{cookbook_name}",
+              ">= 0.0.0"
+            ]
+          ],
+          "dependencies": {
+            "#{cookbook_name} (2.3.4)": [
+
+            ]
+          }
+        }
       }
-    }
-  },
-  "default_attributes": {},
-  "override_attributes": {},
-  "solution_dependencies": {
-    "Policyfile": [
-      [
-        "#{cookbook_name}",
-        ">= 0.0.0"
-      ]
-    ],
-    "dependencies": {
-      "#{cookbook_name} (2.3.4)": [
-
-      ]
-    }
-  }
-}
     E
   end
 

data/spec/unit/policyfile/included_policies_cookbook_source_spec.rb

@@ -124,14 +124,14 @@ describe ChefDK::Policyfile::IncludedPoliciesCookbookSource do
   end
 
   let(:policy1_location_spec) do
-    ChefDK::Policyfile::PolicyfileLocationSpecification.new("policy1", { :path => "somelocation" }, nil).tap do |spec|
+    ChefDK::Policyfile::PolicyfileLocationSpecification.new("policy1", { path: "somelocation" }, nil).tap do |spec|
       allow(spec).to receive(:valid?).and_return(true)
       allow(spec).to receive(:fetcher).and_return(policy1_fetcher)
     end
   end
 
   let(:policy2_location_spec) do
-    ChefDK::Policyfile::PolicyfileLocationSpecification.new("policy2", { :path => "somelocation" }, nil).tap do |spec|
+    ChefDK::Policyfile::PolicyfileLocationSpecification.new("policy2", { path: "somelocation" }, nil).tap do |spec|
       allow(spec).to receive(:valid?).and_return(true)
       allow(spec).to receive(:fetcher).and_return(policy2_fetcher)
     end
@@ -168,8 +168,8 @@ describe ChefDK::Policyfile::IncludedPoliciesCookbookSource do
     end
 
     it "returns the correct source options when the cookbook is included" do
-      expect(cookbook_source.source_options_for("cookbookA", "2.0.0")).to eq({ :version => "2.0.0" })
-      expect(cookbook_source.source_options_for("cookbookB", "1.0.0")).to eq({ :version => "1.0.0" })
+      expect(cookbook_source.source_options_for("cookbookA", "2.0.0")).to eq({ version: "2.0.0" })
+      expect(cookbook_source.source_options_for("cookbookB", "1.0.0")).to eq({ version: "1.0.0" })
     end
 
     it "has a universe with the used cookbooks" do
@@ -197,8 +197,8 @@ describe ChefDK::Policyfile::IncludedPoliciesCookbookSource do
       end
 
       it "returns the correct source options when the cookbook is included" do
-        expect(cookbook_source.source_options_for("cookbookA", "2.0.0")).to eq({ :version => "2.0.0" })
-        expect(cookbook_source.source_options_for("cookbookB", "1.0.0")).to eq({ :version => "1.0.0" })
+        expect(cookbook_source.source_options_for("cookbookA", "2.0.0")).to eq({ version: "2.0.0" })
+        expect(cookbook_source.source_options_for("cookbookB", "1.0.0")).to eq({ version: "1.0.0" })
       end
 
       it "has a universe with the used cookbooks" do

data/spec/unit/policyfile/local_lock_fetcher_spec.rb

@@ -21,42 +21,42 @@ require "chef-dk/policyfile/local_lock_fetcher"
 describe ChefDK::Policyfile::LocalLockFetcher do
 
   let(:minimal_lockfile_json) do
-    <<-E
-{
-  "revision_id": "6fe753184c8946052d3231bb4212116df28d89a3a5f7ae52832ad408419dd5eb",
-  "name": "install-example",
-  "run_list": [
-    "recipe[local-cookbook::default]"
-  ],
-  "cookbook_locks": {
-    "local-cookbook": {
-      "version": "2.3.4",
-      "identifier": "fab501cfaf747901bd82c1bc706beae7dc3a350c",
-      "dotted_decimal_identifier": "70567763561641081.489844270461035.258281553147148",
-      "source": "cookbooks/local-cookbook",
-      "cache_key": null,
-      "scm_info": null,
-      "source_options": {
-        "path": "../cookbooks/local-cookbook"
+    <<~E
+      {
+        "revision_id": "6fe753184c8946052d3231bb4212116df28d89a3a5f7ae52832ad408419dd5eb",
+        "name": "install-example",
+        "run_list": [
+          "recipe[local-cookbook::default]"
+        ],
+        "cookbook_locks": {
+          "local-cookbook": {
+            "version": "2.3.4",
+            "identifier": "fab501cfaf747901bd82c1bc706beae7dc3a350c",
+            "dotted_decimal_identifier": "70567763561641081.489844270461035.258281553147148",
+            "source": "cookbooks/local-cookbook",
+            "cache_key": null,
+            "scm_info": null,
+            "source_options": {
+              "path": "../cookbooks/local-cookbook"
+            }
+          }
+        },
+        "default_attributes": {},
+        "override_attributes": {},
+        "solution_dependencies": {
+          "Policyfile": [
+            [
+              "local-cookbook",
+              ">= 0.0.0"
+            ]
+          ],
+          "dependencies": {
+            "local-cookbook (2.3.4)": [
+
+            ]
+          }
+        }
       }
-    }
-  },
-  "default_attributes": {},
-  "override_attributes": {},
-  "solution_dependencies": {
-    "Policyfile": [
-      [
-        "local-cookbook",
-        ">= 0.0.0"
-      ]
-    ],
-    "dependencies": {
-      "local-cookbook (2.3.4)": [
-
-      ]
-    }
-  }
-}
 E
   end
 

data/spec/unit/policyfile/lock_applier_spec.rb

@@ -79,9 +79,9 @@ describe ChefDK::Policyfile::LockApplier do
     it "does not provide the locked source options for that policy" do
       expect(included_policy_1).not_to receive(:apply_locked_source_options)
       expect(included_policy_2).to receive(:apply_locked_source_options).with(included_policy_lock_2["source_options"])
-      lock_applier.
-        with_unlocked_policies(["policy1"]).
-        apply!
+      lock_applier
+        .with_unlocked_policies(["policy1"])
+        .apply!
     end
   end
 
@@ -92,9 +92,9 @@ describe ChefDK::Policyfile::LockApplier do
     it "does not provide locked source options for any policies" do
       expect(included_policy_1).not_to receive(:apply_locked_source_options)
       expect(included_policy_2).not_to receive(:apply_locked_source_options).with(included_policy_lock_2["source_options"])
-      lock_applier.
-        with_unlocked_policies(:all).
-        apply!
+      lock_applier
+        .with_unlocked_policies(:all)
+        .apply!
     end
   end
 end

data/spec/unit/policyfile/reports/upload_spec.rb

@@ -80,11 +80,11 @@ describe ChefDK::Policyfile::Reports::Upload do
     it "prints a table showing the re-used and uploaded cookbooks" do
       upload_report.show
 
-      expected_output = <<-E
-Using    short-name              10.11.12   (49582c3d)
-Using    a-longer-named-cookbook 1.0.0      (e4ac353b)
-Uploaded foo                     1.2.42     (cb61daeb)
-Uploaded barbazqux               12.34.5678 (1241ea6f)
+      expected_output = <<~E
+        Using    short-name              10.11.12   (49582c3d)
+        Using    a-longer-named-cookbook 1.0.0      (e4ac353b)
+        Uploaded foo                     1.2.42     (cb61daeb)
+        Uploaded barbazqux               12.34.5678 (1241ea6f)
 E
       expect(ui.output).to eq(expected_output)
     end

data/spec/unit/policyfile/uploader_spec.rb

@@ -114,15 +114,15 @@ describe ChefDK::Policyfile::Uploader do
 
       allow(cookbook_version).to receive(:identifier=).with(lock.identifier)
 
-      allow(ChefDK::Policyfile::ReadCookbookForCompatModeUpload).
-        to receive(:load).
-        with(name, dotted_decimal_id, cache_path).
-        and_return(cookbook_version)
+      allow(ChefDK::Policyfile::ReadCookbookForCompatModeUpload)
+        .to receive(:load)
+        .with(name, dotted_decimal_id, cache_path)
+        .and_return(cookbook_version)
 
-      allow(ChefDK::Policyfile::CookbookLoaderWithChefignore).
-        to receive(:load).
-        with(name, cache_path).
-        and_return(cookbook_version)
+      allow(ChefDK::Policyfile::CookbookLoaderWithChefignore)
+        .to receive(:load)
+        .with(name, cache_path)
+        .and_return(cookbook_version)
 
       cookbook_versions[name] = cookbook_version
       cookbook_locks[name] = lock
@@ -186,9 +186,9 @@ describe ChefDK::Policyfile::Uploader do
             expect(http_client).to receive(:get).with(list_cookbooks_url).and_return(existing_cookbook_on_remote)
 
             cookbook_uploader = instance_double("Chef::CookbookUploader")
-            expect(Chef::CookbookUploader).to receive(:new).
-              with(cookbook_versions.values, rest: http_client, policy_mode: policy_document_native_api).
-              and_return(cookbook_uploader)
+            expect(Chef::CookbookUploader).to receive(:new)
+              .with(cookbook_versions.values, rest: http_client, policy_mode: policy_document_native_api)
+              .and_return(cookbook_uploader)
             expect(cookbook_uploader).to receive(:upload_cookbooks)
 
             expect_policyfile_upload
@@ -228,9 +228,9 @@ describe ChefDK::Policyfile::Uploader do
             expect(http_client).to receive(:get).with(list_cookbooks_url).and_return(existing_cookbook_on_remote)
 
             cookbook_uploader = instance_double("Chef::CookbookUploader")
-            expect(Chef::CookbookUploader).to receive(:new).
-              with(expected_cookbooks_for_upload, rest: http_client, policy_mode: policy_document_native_api).
-              and_return(cookbook_uploader)
+            expect(Chef::CookbookUploader).to receive(:new)
+              .with(expected_cookbooks_for_upload, rest: http_client, policy_mode: policy_document_native_api)
+              .and_return(cookbook_uploader)
             expect(cookbook_uploader).to receive(:upload_cookbooks)
 
             expect_policyfile_upload
@@ -326,25 +326,25 @@ describe ChefDK::Policyfile::Uploader do
       it "uploads the policyfile as a data bag item" do
         response = double("Net::HTTP response", code: "404")
         error = Net::HTTPServerException.new("Not Found", response)
-        expect(http_client).to receive(:put).
-          with("data/policyfiles/example-unit-test", policyfile_as_data_bag_item).
-          and_raise(error)
-        expect(http_client).to receive(:post).
-          with("data/policyfiles", policyfile_as_data_bag_item)
+        expect(http_client).to receive(:put)
+          .with("data/policyfiles/example-unit-test", policyfile_as_data_bag_item)
+          .and_raise(error)
+        expect(http_client).to receive(:post)
+          .with("data/policyfiles", policyfile_as_data_bag_item)
 
         uploader.data_bag_item_create
       end
 
       it "replaces an existing policyfile on the server if it exists" do
-        expect(http_client).to receive(:put).
-          with("data/policyfiles/example-unit-test", policyfile_as_data_bag_item)
+        expect(http_client).to receive(:put)
+          .with("data/policyfiles/example-unit-test", policyfile_as_data_bag_item)
         uploader.data_bag_item_create
       end
 
       it "creates the data bag and item to upload the policy" do
         expect(http_client).to receive(:post).with("data", policyfiles_data_bag)
-        expect(http_client).to receive(:put).
-          with("data/policyfiles/example-unit-test", policyfile_as_data_bag_item)
+        expect(http_client).to receive(:put)
+          .with("data/policyfiles/example-unit-test", policyfile_as_data_bag_item)
         uploader.upload_policy
       end
 
@@ -386,8 +386,8 @@ describe ChefDK::Policyfile::Uploader do
         }
       end
       def expect_policyfile_upload
-        expect(http_client).to receive(:put).
-          with("/policy_groups/unit-test/policies/example", policyfile_lock_data)
+        expect(http_client).to receive(:put)
+          .with("/policy_groups/unit-test/policies/example", policyfile_lock_data)
       end
 
       it "enables native document mode for policyfiles" do
@@ -395,8 +395,8 @@ describe ChefDK::Policyfile::Uploader do
       end
 
       it "uploads the policyfile to the native API" do
-        expect(http_client).to receive(:put).
-          with("/policy_groups/unit-test/policies/example", policyfile_lock_data)
+        expect(http_client).to receive(:put)
+          .with("/policy_groups/unit-test/policies/example", policyfile_lock_data)
 
         uploader.upload_policy
       end

data/spec/unit/policyfile_demands_spec.rb

@@ -217,20 +217,20 @@ describe ChefDK::PolicyfileCompiler, "when expressing the Policyfile graph deman
     before do
       allow(policyfile).to receive(:default_source).and_return([default_source_obj])
 
-      allow(default_source_obj).to receive(:universe_graph).
-        and_return(trimmed_cookbook_universe)
+      allow(default_source_obj).to receive(:universe_graph)
+        .and_return(trimmed_cookbook_universe)
 
-      allow(default_source_obj).to receive(:preferred_source_for?).
-        with("remote-cb").
-        and_return(true)
+      allow(default_source_obj).to receive(:preferred_source_for?)
+        .with("remote-cb")
+        .and_return(true)
 
-      allow(default_source_obj).to receive(:source_options_for).
-        with("remote-cb", "1.1.1").
-        and_return(remote_cb_source_opts)
+      allow(default_source_obj).to receive(:source_options_for)
+        .with("remote-cb", "1.1.1")
+        .and_return(remote_cb_source_opts)
 
-      allow(ChefDK::Policyfile::CookbookLocationSpecification).to receive(:new).
-        with("remote-cb", "= 1.1.1", remote_cb_source_opts, policyfile.storage_config).
-        and_return(cb_location_spec)
+      allow(ChefDK::Policyfile::CookbookLocationSpecification).to receive(:new)
+        .with("remote-cb", "= 1.1.1", remote_cb_source_opts, policyfile.storage_config)
+        .and_return(cb_location_spec)
 
       allow(cb_location_spec).to receive(:installed?).and_return(true)
     end
@@ -240,9 +240,9 @@ describe ChefDK::PolicyfileCompiler, "when expressing the Policyfile graph deman
       context "with an implied default recipe" do
 
         before do
-          expect(cb_location_spec).to receive(:cookbook_has_recipe?).
-            with("default").
-            and_return(true)
+          expect(cb_location_spec).to receive(:cookbook_has_recipe?)
+            .with("default")
+            .and_return(true)
         end
 
         let(:run_list) { ["remote-cb"] }
@@ -256,9 +256,9 @@ describe ChefDK::PolicyfileCompiler, "when expressing the Policyfile graph deman
       context "with an explicit recipe name" do
 
         before do
-          expect(cb_location_spec).to receive(:cookbook_has_recipe?).
-            with("this_exists").
-            and_return(true)
+          expect(cb_location_spec).to receive(:cookbook_has_recipe?)
+            .with("this_exists")
+            .and_return(true)
         end
 
         let(:run_list) { ["remote-cb::this_exists"] }
@@ -272,9 +272,9 @@ describe ChefDK::PolicyfileCompiler, "when expressing the Policyfile graph deman
       context "with a fully qualified recipe name" do
 
         before do
-          expect(cb_location_spec).to receive(:cookbook_has_recipe?).
-            with("this_exists").
-            and_return(true)
+          expect(cb_location_spec).to receive(:cookbook_has_recipe?)
+            .with("this_exists")
+            .and_return(true)
         end
 
         let(:run_list) { ["recipe[remote-cb::this_exists]"] }
@@ -291,22 +291,22 @@ describe ChefDK::PolicyfileCompiler, "when expressing the Policyfile graph deman
 
       context "when the cookbook with a missing recipe appears once in the run list" do
         before do
-          expect(cb_location_spec).to receive(:cookbook_has_recipe?).
-            with("this_recipe_doesnt_exist").
-            and_return(false)
+          expect(cb_location_spec).to receive(:cookbook_has_recipe?)
+            .with("this_recipe_doesnt_exist")
+            .and_return(false)
         end
 
         let(:run_list) { ["remote-cb::this_recipe_doesnt_exist"] }
 
         it "emits an error" do
-          message = <<-MESSAGE
-The installed cookbooks do not contain all the recipes required by your run list(s):
-Cookbook 'remote-cb' = 1.1.1 {:artifactserver=>"https://supermarket.example/c/remote-cb/1.1.1/download", :version=>"1.1.1"}
-is missing the following required recipes:
-* this_recipe_doesnt_exist
-
-You may have specified an incorrect recipe in your run list,
-or this recipe may not be available in that version of the cookbook
+          message = <<~MESSAGE
+            The installed cookbooks do not contain all the recipes required by your run list(s):
+            Cookbook 'remote-cb' = 1.1.1 {:artifactserver=>"https://supermarket.example/c/remote-cb/1.1.1/download", :version=>"1.1.1"}
+            is missing the following required recipes:
+            * this_recipe_doesnt_exist
+
+            You may have specified an incorrect recipe in your run list,
+            or this recipe may not be available in that version of the cookbook
 MESSAGE
 
           expect { policyfile.install }.to raise_error do |e|
@@ -319,25 +319,25 @@ MESSAGE
       context "when there is one valid item and one invalid item in the run list" do
 
         before do
-          expect(cb_location_spec).to receive(:cookbook_has_recipe?).
-            with("default").
-            and_return(true)
-          expect(cb_location_spec).to receive(:cookbook_has_recipe?).
-            with("this_recipe_doesnt_exist").
-            and_return(false)
+          expect(cb_location_spec).to receive(:cookbook_has_recipe?)
+            .with("default")
+            .and_return(true)
+          expect(cb_location_spec).to receive(:cookbook_has_recipe?)
+            .with("this_recipe_doesnt_exist")
+            .and_return(false)
         end
 
         let(:run_list) { ["remote-cb::default", "remote-cb::this_recipe_doesnt_exist"] }
 
         it "emits an error" do
-          message = <<-MESSAGE
-The installed cookbooks do not contain all the recipes required by your run list(s):
-Cookbook 'remote-cb' = 1.1.1 {:artifactserver=>"https://supermarket.example/c/remote-cb/1.1.1/download", :version=>"1.1.1"}
-is missing the following required recipes:
-* this_recipe_doesnt_exist
-
-You may have specified an incorrect recipe in your run list,
-or this recipe may not be available in that version of the cookbook
+          message = <<~MESSAGE
+            The installed cookbooks do not contain all the recipes required by your run list(s):
+            Cookbook 'remote-cb' = 1.1.1 {:artifactserver=>"https://supermarket.example/c/remote-cb/1.1.1/download", :version=>"1.1.1"}
+            is missing the following required recipes:
+            * this_recipe_doesnt_exist
+
+            You may have specified an incorrect recipe in your run list,
+            or this recipe may not be available in that version of the cookbook
 MESSAGE
 
           expect { policyfile.install }.to raise_error do |e|
@@ -351,26 +351,26 @@ MESSAGE
       context "when there are multiple invalid items in the run list" do
 
         before do
-          expect(cb_location_spec).to receive(:cookbook_has_recipe?).
-            with("this_recipe_doesnt_exist").
-            and_return(false)
-          expect(cb_location_spec).to receive(:cookbook_has_recipe?).
-            with("this_also_doesnt_exist").
-            and_return(false)
+          expect(cb_location_spec).to receive(:cookbook_has_recipe?)
+            .with("this_recipe_doesnt_exist")
+            .and_return(false)
+          expect(cb_location_spec).to receive(:cookbook_has_recipe?)
+            .with("this_also_doesnt_exist")
+            .and_return(false)
         end
 
         let(:run_list) { ["remote-cb::this_recipe_doesnt_exist", "remote-cb::this_also_doesnt_exist"] }
 
         it "emits an error" do
-          message = <<-MESSAGE
-The installed cookbooks do not contain all the recipes required by your run list(s):
-Cookbook 'remote-cb' = 1.1.1 {:artifactserver=>"https://supermarket.example/c/remote-cb/1.1.1/download", :version=>"1.1.1"}
-is missing the following required recipes:
-* this_recipe_doesnt_exist
-* this_also_doesnt_exist
-
-You may have specified an incorrect recipe in your run list,
-or this recipe may not be available in that version of the cookbook
+          message = <<~MESSAGE
+            The installed cookbooks do not contain all the recipes required by your run list(s):
+            Cookbook 'remote-cb' = 1.1.1 {:artifactserver=>"https://supermarket.example/c/remote-cb/1.1.1/download", :version=>"1.1.1"}
+            is missing the following required recipes:
+            * this_recipe_doesnt_exist
+            * this_also_doesnt_exist
+
+            You may have specified an incorrect recipe in your run list,
+            or this recipe may not be available in that version of the cookbook
 MESSAGE
 
           expect { policyfile.install }.to raise_error do |e|
@@ -948,9 +948,9 @@ MESSAGE
         expected_source_options = { artifactserver: "https://chef.example/url", version: "1.1.1" }
 
         expect(community_source).to be_a(ChefDK::Policyfile::CommunityCookbookSource)
-        expect(community_source).to receive(:source_options_for).
-          with("remote-cb", "1.1.1").
-          and_return(expected_source_options)
+        expect(community_source).to receive(:source_options_for)
+          .with("remote-cb", "1.1.1")
+          .and_return(expected_source_options)
 
         location_spec = policyfile.create_spec_for_cookbook("remote-cb", "1.1.1")
         expect(location_spec.source_options).to eq(expected_source_options)
@@ -968,9 +968,9 @@ MESSAGE
         expected_repo_options = { path: "path/to/cookbook", version: "1.0.0" }
         repo_source = policyfile.default_source.last
         expect(repo_source).to be_a(ChefDK::Policyfile::ChefRepoCookbookSource)
-        expect(repo_source).to receive(:source_options_for).
-          with("repo-cookbook-one", "1.0.0").
-          and_return(expected_repo_options)
+        expect(repo_source).to receive(:source_options_for)
+          .with("repo-cookbook-one", "1.0.0")
+          .and_return(expected_repo_options)
 
         repo_cb_location = policyfile.create_spec_for_cookbook("repo-cookbook-one", "1.0.0")
         expect(repo_cb_location.source_options).to eq(expected_repo_options)
@@ -978,9 +978,9 @@ MESSAGE
         expected_server_options = { artifactserver: "https://chef.example/url", version: "1.1.1" }
         community_source = policyfile.default_source.first
         expect(community_source).to be_a(ChefDK::Policyfile::CommunityCookbookSource)
-        expect(community_source).to receive(:source_options_for).
-          with("remote-cb-two", "1.1.1").
-          and_return(expected_server_options)
+        expect(community_source).to receive(:source_options_for)
+          .with("remote-cb-two", "1.1.1")
+          .and_return(expected_server_options)
 
         remote_cb_location = policyfile.create_spec_for_cookbook("remote-cb-two", "1.1.1")
         expect(remote_cb_location.source_options).to eq(expected_server_options)
@@ -1053,16 +1053,16 @@ MESSAGE
           it "raises an error describing the conflict" do
             repo_path = File.expand_path("path/to/repo")
 
-            expected_err = <<-ERROR
-Source supermarket(https://supermarket.chef.io) and chef_repo(#{repo_path}) contain conflicting cookbooks:
-- remote-cb
-- remote-cb-two
+            expected_err = <<~ERROR
+              Source supermarket(https://supermarket.chef.io) and chef_repo(#{repo_path}) contain conflicting cookbooks:
+              - remote-cb
+              - remote-cb-two
 
-You can set a preferred source to resolve this issue with code like:
+              You can set a preferred source to resolve this issue with code like:
 
-default_source :supermarket, "https://supermarket.chef.io" do |s|
-  s.preferred_for "remote-cb", "remote-cb-two"
-end
+              default_source :supermarket, "https://supermarket.chef.io" do |s|
+                s.preferred_for "remote-cb", "remote-cb-two"
+              end
 ERROR
 
             expect { policyfile.remote_artifacts_graph }.to raise_error do |error|
@@ -1156,15 +1156,15 @@ ERROR
         it "raises an error describing the conflict" do
           repo_path = File.expand_path("path/to/repo")
 
-          expected_err = <<-ERROR
-Source supermarket(https://supermarket.chef.io) and chef_repo(#{repo_path}) contain conflicting cookbooks:
-- remote-cb-two
+          expected_err = <<~ERROR
+            Source supermarket(https://supermarket.chef.io) and chef_repo(#{repo_path}) contain conflicting cookbooks:
+            - remote-cb-two
 
-You can set a preferred source to resolve this issue with code like:
+            You can set a preferred source to resolve this issue with code like:
 
-default_source :supermarket, "https://supermarket.chef.io" do |s|
-  s.preferred_for "remote-cb-two"
-end
+            default_source :supermarket, "https://supermarket.chef.io" do |s|
+              s.preferred_for "remote-cb-two"
+            end
 ERROR
 
           expect { policyfile.remote_artifacts_graph }.to raise_error do |error|