Merge branch 'master' into audit_line_rubocop_part_4_rebase_attempt_1

3 files changed, 6 insertions, 6 deletions

diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/with-caveats.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/with-caveats.rb
index d5d90114a..5624f486e 100644
--- a/Library/Homebrew/test/support/fixtures/cask/Casks/with-caveats.rb
+++ b/Library/Homebrew/test/support/fixtures/cask/Casks/with-caveats.rb
@@ -8,7 +8,7 @@ cask 'with-caveats' do
   app 'Caffeine.app'
 
   # simple string is evaluated at compile-time
-  caveats <<-EOS.undent
+  caveats <<~EOS
     Here are some things you might want to know.
   EOS
   # do block is evaluated at install-time
diff --git a/Library/Homebrew/test/support/fixtures/cask/Casks/with-uninstall-script-app.rb b/Library/Homebrew/test/support/fixtures/cask/Casks/with-uninstall-script-app.rb
index f5f3ae5dd..885f3b157 100644
--- a/Library/Homebrew/test/support/fixtures/cask/Casks/with-uninstall-script-app.rb
+++ b/Library/Homebrew/test/support/fixtures/cask/Casks/with-uninstall-script-app.rb
@@ -8,7 +8,7 @@ cask 'with-uninstall-script-app' do
   app 'MyFancyApp/MyFancyApp.app'
 
   postflight do
-    IO.write "#{appdir}/MyFancyApp.app/uninstall.sh", <<-EOS.undent
+    IO.write "#{appdir}/MyFancyApp.app/uninstall.sh", <<~EOS
       #!/bin/sh
       /bin/rm -r "#{appdir}/MyFancyApp.app"
     EOS
diff --git a/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb b/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb
index 7bf2ce96a..da01580c2 100644
--- a/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb
+++ b/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb
@@ -123,7 +123,7 @@ RSpec.shared_context "integration test" do
   def setup_test_formula(name, content = nil)
     case name
     when /^testball/
-      content = <<-EOS.undent
+      content = <<~EOS
         desc "Some test"
         homepage "https://example.com/#{name}"
         url "file://#{TEST_FIXTURE_DIR}/tarballs/testball-0.1.tbz"
@@ -145,18 +145,18 @@ RSpec.shared_context "integration test" do
         # something here
       EOS
     when "foo"
-      content = <<-EOS.undent
+      content = <<~EOS
         url "https://example.com/#{name}-1.0"
       EOS
     when "bar"
-      content = <<-EOS.undent
+      content = <<~EOS
         url "https://example.com/#{name}-1.0"
         depends_on "foo"
       EOS
     end
 
     Formulary.core_path(name).tap do |formula_path|
-      formula_path.write <<-EOS.undent
+      formula_path.write <<~EOS
         class #{Formulary.class_s(name)} < Formula
           #{content}
         end