chefstyle fixes

Signed-off-by: nikhil2611 <[email protected]>
chef · Dec 13, 2023 · a99b7bb · a99b7bb
1 parent dace5d0
commit a99b7bb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
@@ -37,10 +37,10 @@ steps:
       docker:
         image: ruby:3.1
 
-- label: chefstyle-tests-ruby-2.7
+- label: chefstyle-tests-ruby-3.1
   command:
     - .expeditor/run_linux_tests.sh "rake style:chefstyle"
   expeditor:
     executor:
       docker:
-        image: ruby:2.7
+        image: ruby:3.1
diff --git a/chef-cli.gemspec b/chef-cli.gemspec
@@ -43,7 +43,11 @@ Gem::Specification.new do |gem|
   gem.add_dependency "mixlib-shellout", ">= 2.0", "< 4.0"
   gem.add_dependency "ffi-yajl", ">= 1.0", "< 3.0"
   gem.add_dependency "minitar", "~> 0.6"
-  gem.add_dependency "chef", ">= 16.0"
+  if RUBY_VERSION.match?(/3.1/)
+    gem.add_dependency "chef", "~> 18.0"
+  else
+    gem.add_dependency "chef", ">= 16.0"
+  end
   gem.add_dependency "solve", "< 5.0", "> 2.0"
   gem.add_dependency "addressable", ">= 2.3.5", "< 2.9"
   gem.add_dependency "cookbook-omnifetch", "~> 0.5"

diff --git a/spec/unit/policyfile_services/clean_policies_spec.rb b/spec/unit/policyfile_services/clean_policies_spec.rb
@@ -215,7 +215,7 @@
             # this will continue to print that out until they remove HTTPServerException
             expected_message = <<~ERROR
               Failed to delete some policy revisions:
-              - appserver (4444444444444444444444444444444444444444444444444444444444444444): Net::HTTPClientException 403 \"Unauthorized\"
+              - appserver (4444444444444444444444444444444444444444444444444444444444444444): Net::HTTPServerException 403 \"Unauthorized\"
             ERROR
 
             expect { clean_policies_service.run }.to raise_error do |error|