From 9b9dbf7a1cfeff9b7e95f649eb41ffcedc6c5822 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <matt@jankowski.online>
Date: Thu, 26 Dec 2024 15:11:02 -0500
Subject: [PATCH] Temporary branch for flatware

---
 Gemfile      |  2 +-
 Gemfile.lock | 20 +++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index 47b0152ed1..eb130ecf2d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -122,7 +122,7 @@ end
 
 group :test do
   # Enable usage of all available CPUs/cores during spec runs
-  gem 'flatware-rspec'
+  gem 'flatware-rspec', github: 'mjankowski/flatware', branch: 'ruby-3-4-allow' # TODO, remove on flatware release
 
   # Adds RSpec Error/Warning annotations to GitHub PRs on the Files tab
   gem 'rspec-github', '~> 2.4', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 68e9b1dd91..5dcdbd0be0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,6 +7,18 @@ GIT
       hkdf (~> 0.2)
       jwt (~> 2.0)
 
+GIT
+  remote: https://github.com/mjankowski/flatware.git
+  revision: 7f0367157c378999a043330024a56653c6502b31
+  branch: ruby-3-4-allow
+  specs:
+    flatware (2.3.3)
+      drb
+      thor (< 2.0)
+    flatware-rspec (2.3.3)
+      flatware (= 2.3.3)
+      rspec (>= 3.6)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -238,12 +250,6 @@ GEM
     ffi-compiler (1.3.2)
       ffi (>= 1.15.5)
       rake
-    flatware (2.3.3)
-      drb
-      thor (< 2.0)
-    flatware-rspec (2.3.3)
-      flatware (= 2.3.3)
-      rspec (>= 3.6)
     fog-core (2.5.0)
       builder
       excon (~> 0.71)
@@ -916,7 +922,7 @@ DEPENDENCIES
   faraday-httpclient
   fast_blank (~> 1.0)
   fastimage
-  flatware-rspec
+  flatware-rspec!
   fog-core (<= 2.6.0)
   fog-openstack (~> 1.0)
   haml-rails (~> 2.0)