summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance Albertson <lance@osuosl.org>2021-04-07 15:09:19 -0700
committerLance Albertson <lance@osuosl.org>2021-04-09 16:12:35 -0700
commitbb776e0ea82618c7c9038518ef9649c8d216b70d (patch)
tree0eab7118aac44567b71eaec10a29a3565fac2627
parent7a9a11dad7c0468e42ab4675be4002445ee6984e (diff)
downloadchef-bb776e0ea82618c7c9038518ef9649c8d216b70d.tar.gz
Update to use chef-workstation instead of chefdk
Signed-off-by: Lance Albertson <lance@osuosl.org>
-rw-r--r--lib/chef/provider/package/rubygems.rb2
-rw-r--r--spec/unit/provider/package/rubygems_spec.rb6
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/chef/provider/package/rubygems.rb b/lib/chef/provider/package/rubygems.rb
index 54d43e2772..db3696dbd8 100644
--- a/lib/chef/provider/package/rubygems.rb
+++ b/lib/chef/provider/package/rubygems.rb
@@ -423,7 +423,7 @@ class Chef
end
def is_omnibus?
- if %r{/(#{ChefUtils::Dist::Org::LEGACY_CONF_DIR}|#{ChefUtils::Dist::Infra::SHORT}|chefdk)/embedded/bin}.match?(RbConfig::CONFIG["bindir"])
+ if %r{/(#{ChefUtils::Dist::Org::LEGACY_CONF_DIR}|#{ChefUtils::Dist::Infra::SHORT}|chef-workstation)/embedded/bin}.match?(RbConfig::CONFIG["bindir"])
logger.trace("#{new_resource} detected omnibus installation in #{RbConfig::CONFIG["bindir"]}")
# Omnibus installs to a static path because of linking on unix, find it.
true
diff --git a/spec/unit/provider/package/rubygems_spec.rb b/spec/unit/provider/package/rubygems_spec.rb
index 5c947cf275..4529926246 100644
--- a/spec/unit/provider/package/rubygems_spec.rb
+++ b/spec/unit/provider/package/rubygems_spec.rb
@@ -482,10 +482,10 @@ describe Chef::Provider::Package::Rubygems do
end
end
- context "when in omnibus chefdk" do
- let(:bindir) { "/opt/chefdk/embedded/bin" }
+ context "when in omnibus chef-workstation" do
+ let(:bindir) { "/opt/chef-workstation/embedded/bin" }
- it "recognizes chefdk as omnibus" do
+ it "recognizes chef-workstation as omnibus" do
expect(provider.is_omnibus?).to be true
end
end