Merge pull request #8174 from chef/bump_rubygems

Update Rubygems to 3.0.2

3 files changed, 6 insertions, 1 deletions

diff --git a/.travis.yml b/.travis.yml
index 70e02c3613..9f944415fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -376,6 +376,10 @@ matrix:
       env:
        - RSPEC_OPENSUSELEAP=42
        - KITCHEN_YAML=kitchen.travis.yml
+    - env:
+        TEST_GEM: poise/halite
+      script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake spec
+      rvm: 2.5.3
 
 notifications:
   on_change: true
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index c5775d5264..92aba60f2a 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -4,7 +4,7 @@
 #
 # NOTE: You MUST update omnibus-software when adding new versions of
 # software here: bundle exec rake dependencies:update_omnibus_gemfile_lock
-override :rubygems, version: "2.7.7"
+override :rubygems, version: "3.0.2"
 override :bundler, version: "1.17.3"
 override "nokogiri", version: "1.10.1"
 override "libffi", version: "3.2.1"
diff --git a/spec/unit/knife/bootstrap_spec.rb b/spec/unit/knife/bootstrap_spec.rb
index 624261fb8b..258d193cf1 100644
--- a/spec/unit/knife/bootstrap_spec.rb
+++ b/spec/unit/knife/bootstrap_spec.rb
@@ -442,6 +442,7 @@ describe Chef::Knife::Bootstrap do
     end
 
     it "doesn't create /etc/chef/trusted_certs if :trusted_certs_dir is empty" do
+      allow(Dir).to receive(:glob).and_call_original
       expect(Dir).to receive(:glob).with(File.join(trusted_certs_dir, "*.{crt,pem}")).and_return([])
       expect(rendered_template).not_to match(%r{mkdir -p /etc/chef/trusted_certs})
     end