From db75cc72b7a259259f5fcc77829ee908297c71a5 Mon Sep 17 00:00:00 2001 From: "M. Oleske" Date: Fri, 27 May 2022 12:22:44 -0700 Subject: [PATCH] Revert "Revert "Merge pull request #2703 from cloudfoundry/bump-ruby"" This reverts commit 4971a57734a8c8457e4926e489eb4a75bf6fe566. --- .ruby-version | 2 +- Gemfile.lock | 2 +- spec/unit/models/runtime/stack_spec.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ruby-version b/.ruby-version index a603bb50a29..75a22a26ac4 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.5 +3.0.3 diff --git a/Gemfile.lock b/Gemfile.lock index 0cc17de58c6..ec650f49545 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -640,4 +640,4 @@ DEPENDENCIES yajl-ruby BUNDLED WITH - 2.1.4 + 2.2.32 diff --git a/spec/unit/models/runtime/stack_spec.rb b/spec/unit/models/runtime/stack_spec.rb index 0e6c6517884..d19050335e0 100644 --- a/spec/unit/models/runtime/stack_spec.rb +++ b/spec/unit/models/runtime/stack_spec.rb @@ -102,7 +102,7 @@ module VCAP::CloudController mock_logger = double allow(Steno).to receive(:logger).and_return(mock_logger) - expect(mock_logger).to receive(:warn).with('stack.populate.collision', 'name' => 'cider', 'description' => 'cider-description') + expect(mock_logger).to receive(:warn).with('stack.populate.collision', { 'name' => 'cider', 'description' => 'cider-description' }) Stack.populate end