From 7b320fc03b22d76332c3ec3239761b9b70bc9310 Mon Sep 17 00:00:00 2001
From: Claudia <claui@users.noreply.github.com>
Date: Tue, 6 Nov 2018 07:09:44 +0100
Subject: [PATCH] Move shared Cask examples closer to its clients

In Cask specs, we have recently introduced a couple of specialized
`shared_examples` directories. Those new directories are organized
below their respective packages (for instance,
`cask/artifact/shared_examples` and `cask/cmd/shared_examples`).

This commit moves the rest of the shared examples accordingly.

See also:
https://github.com/Homebrew/brew/pull/5247
---
 Library/Homebrew/test/cask/dsl/caveats_spec.rb                | 2 +-
 Library/Homebrew/test/cask/dsl/postflight_spec.rb             | 4 ++--
 Library/Homebrew/test/cask/dsl/preflight_spec.rb              | 4 ++--
 .../cask_dsl_base.rb => cask/dsl/shared_examples/base.rb}     | 0
 .../cask_staged.rb => cask/dsl/shared_examples/staged.rb}     | 0
 Library/Homebrew/test/cask/dsl/uninstall_postflight_spec.rb   | 2 +-
 Library/Homebrew/test/cask/dsl/uninstall_preflight_spec.rb    | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)
 rename Library/Homebrew/test/{support/helper/spec/shared_examples/cask_dsl_base.rb => cask/dsl/shared_examples/base.rb} (100%)
 rename Library/Homebrew/test/{support/helper/spec/shared_examples/cask_staged.rb => cask/dsl/shared_examples/staged.rb} (100%)

diff --git a/Library/Homebrew/test/cask/dsl/caveats_spec.rb b/Library/Homebrew/test/cask/dsl/caveats_spec.rb
index e040e7fe92..f44e6ab7cc 100644
--- a/Library/Homebrew/test/cask/dsl/caveats_spec.rb
+++ b/Library/Homebrew/test/cask/dsl/caveats_spec.rb
@@ -1,4 +1,4 @@
-require "test/support/helper/spec/shared_examples/cask_dsl_base"
+require "test/cask/dsl/shared_examples/base"
 
 describe Cask::DSL::Caveats, :cask do
   let(:cask) { Cask::CaskLoader.load(cask_path("basic-cask")) }
diff --git a/Library/Homebrew/test/cask/dsl/postflight_spec.rb b/Library/Homebrew/test/cask/dsl/postflight_spec.rb
index 75dbc5885b..46479b55b6 100644
--- a/Library/Homebrew/test/cask/dsl/postflight_spec.rb
+++ b/Library/Homebrew/test/cask/dsl/postflight_spec.rb
@@ -1,5 +1,5 @@
-require "test/support/helper/spec/shared_examples/cask_dsl_base"
-require "test/support/helper/spec/shared_examples/cask_staged"
+require "test/cask/dsl/shared_examples/base"
+require "test/cask/dsl/shared_examples/staged"
 
 describe Cask::DSL::Postflight, :cask do
   let(:cask) { Cask::CaskLoader.load(cask_path("basic-cask")) }
diff --git a/Library/Homebrew/test/cask/dsl/preflight_spec.rb b/Library/Homebrew/test/cask/dsl/preflight_spec.rb
index 8d68342a5b..2bcf1f6654 100644
--- a/Library/Homebrew/test/cask/dsl/preflight_spec.rb
+++ b/Library/Homebrew/test/cask/dsl/preflight_spec.rb
@@ -1,5 +1,5 @@
-require "test/support/helper/spec/shared_examples/cask_dsl_base"
-require "test/support/helper/spec/shared_examples/cask_staged"
+require "test/cask/dsl/shared_examples/base"
+require "test/cask/dsl/shared_examples/staged"
 
 describe Cask::DSL::Preflight, :cask do
   let(:cask) { Cask::CaskLoader.load(cask_path("basic-cask")) }
diff --git a/Library/Homebrew/test/support/helper/spec/shared_examples/cask_dsl_base.rb b/Library/Homebrew/test/cask/dsl/shared_examples/base.rb
similarity index 100%
rename from Library/Homebrew/test/support/helper/spec/shared_examples/cask_dsl_base.rb
rename to Library/Homebrew/test/cask/dsl/shared_examples/base.rb
diff --git a/Library/Homebrew/test/support/helper/spec/shared_examples/cask_staged.rb b/Library/Homebrew/test/cask/dsl/shared_examples/staged.rb
similarity index 100%
rename from Library/Homebrew/test/support/helper/spec/shared_examples/cask_staged.rb
rename to Library/Homebrew/test/cask/dsl/shared_examples/staged.rb
diff --git a/Library/Homebrew/test/cask/dsl/uninstall_postflight_spec.rb b/Library/Homebrew/test/cask/dsl/uninstall_postflight_spec.rb
index 71b258bd7b..14f02d4eb7 100644
--- a/Library/Homebrew/test/cask/dsl/uninstall_postflight_spec.rb
+++ b/Library/Homebrew/test/cask/dsl/uninstall_postflight_spec.rb
@@ -1,4 +1,4 @@
-require "test/support/helper/spec/shared_examples/cask_dsl_base"
+require "test/cask/dsl/shared_examples/base"
 
 describe Cask::DSL::UninstallPostflight, :cask do
   let(:cask) { Cask::CaskLoader.load(cask_path("basic-cask")) }
diff --git a/Library/Homebrew/test/cask/dsl/uninstall_preflight_spec.rb b/Library/Homebrew/test/cask/dsl/uninstall_preflight_spec.rb
index 28fe96dfc7..9e8db707af 100644
--- a/Library/Homebrew/test/cask/dsl/uninstall_preflight_spec.rb
+++ b/Library/Homebrew/test/cask/dsl/uninstall_preflight_spec.rb
@@ -1,5 +1,5 @@
-require "test/support/helper/spec/shared_examples/cask_dsl_base"
-require "test/support/helper/spec/shared_examples/cask_staged"
+require "test/cask/dsl/shared_examples/base"
+require "test/cask/dsl/shared_examples/staged"
 
 describe Cask::DSL::UninstallPreflight, :cask do
   let(:cask) { Cask::CaskLoader.load(cask_path("basic-cask")) }