Merge branch 'master' into yet-more-creds

Signed-off-by: Noah Kantrowitz <noah@coderanger.net>

2 files changed, 40 insertions, 40 deletions

diff --git a/chef-config/spec/spec_helper.rb b/chef-config/spec/spec_helper.rb
index 107becb9eb..6a324474e1 100644
--- a/chef-config/spec/spec_helper.rb
+++ b/chef-config/spec/spec_helper.rb
@@ -32,8 +32,8 @@ RSpec.configure do |config|
   config.filter_run :focus
   config.run_all_when_everything_filtered = true
 
-  config.filter_run_excluding :windows_only => true unless ChefConfig.windows?
-  config.filter_run_excluding :unix_only => true if ChefConfig.windows?
+  config.filter_run_excluding windows_only: true unless ChefConfig.windows?
+  config.filter_run_excluding unix_only: true if ChefConfig.windows?
 
   # Limits the available syntax to the non-monkey patched syntax that is
   # recommended. For more details, see:
diff --git a/chef-config/spec/unit/workstation_config_loader_spec.rb b/chef-config/spec/unit/workstation_config_loader_spec.rb
index 024cb3e928..28fbdf63dd 100644
--- a/chef-config/spec/unit/workstation_config_loader_spec.rb
+++ b/chef-config/spec/unit/workstation_config_loader_spec.rb
@@ -453,12 +453,12 @@ RSpec.describe ChefConfig::WorkstationConfigLoader do
 
       context "and has a default profile" do
         let(:content) do
-          content = <<EOH
-[default]
-node_name = 'barney'
-client_key = "barney_rubble.pem"
-chef_server_url = "https://api.chef.io/organizations/bedrock"
-invalid_config_option1234 = "foobar"
+          content = <<~EOH
+            [default]
+            node_name = 'barney'
+            client_key = "barney_rubble.pem"
+            chef_server_url = "https://api.chef.io/organizations/bedrock"
+            invalid_config_option1234 = "foobar"
 EOH
           content
         end
@@ -474,16 +474,16 @@ EOH
 
       context "and has a default profile with knife settings" do
         let(:content) do
-          content = <<EOH
-[default]
-node_name = 'barney'
-client_key = "barney_rubble.pem"
-chef_server_url = "https://api.chef.io/organizations/bedrock"
-knife = {
-  secret_file = "/home/barney/.chef/encrypted_data_bag_secret.pem"
-}
-[default.knife]
-ssh_user = "knife_ssh_user"
+          content = <<~EOH
+            [default]
+            node_name = 'barney'
+            client_key = "barney_rubble.pem"
+            chef_server_url = "https://api.chef.io/organizations/bedrock"
+            knife = {
+              secret_file = "/home/barney/.chef/encrypted_data_bag_secret.pem"
+            }
+            [default.knife]
+            ssh_user = "knife_ssh_user"
 EOH
           content
         end
@@ -500,21 +500,21 @@ EOH
 
       context "and has a profile containing a full key" do
         let(:content) do
-          content = <<EOH
-[default]
-client_key = """
------BEGIN RSA PRIVATE KEY-----
-foo
-"""
+          content = <<~EOH
+            [default]
+            client_key = """
+            -----BEGIN RSA PRIVATE KEY-----
+            foo
+            """
 EOH
           content
         end
 
         it "applies the expected config" do
           expect { config_loader.load_credentials }.not_to raise_error
-          expect(ChefConfig::Config.client_key_contents).to eq(<<EOH
------BEGIN RSA PRIVATE KEY-----
-foo
+          expect(ChefConfig::Config.client_key_contents).to eq(<<~EOH
+            -----BEGIN RSA PRIVATE KEY-----
+            foo
 EOH
 )
         end
@@ -522,15 +522,15 @@ EOH
 
       context "and has several profiles" do
         let(:content) do
-          content = <<EOH
-[default]
-client_name = "default"
-[environment]
-client_name = "environment"
-[explicit]
-client_name = "explicit"
-[context]
-client_name = "context"
+          content = <<~EOH
+            [default]
+            client_name = "default"
+            [environment]
+            client_name = "environment"
+            [explicit]
+            client_name = "explicit"
+            [context]
+            client_name = "context"
 EOH
           content
         end
@@ -569,10 +569,10 @@ EOH
 
       context "and contains both node_name and client_name" do
         let(:content) do
-          content = <<EOH
-[default]
-node_name = 'barney'
-client_name = 'barney'
+          content = <<~EOH
+            [default]
+            node_name = 'barney'
+            client_name = 'barney'
 EOH
           content
         end