From 1133dcd2bd4d3ad7f7ec3111b8018f137f70964b Mon Sep 17 00:00:00 2001
From: Earlopain <14981592+Earlopain@users.noreply.github.com>
Date: Thu, 22 Aug 2024 15:19:49 +0200
Subject: [PATCH] Fix Rails 7.2/8.0 enum deprecations

> DEPRECATION WARNING: Defining enums with keyword arguments is deprecated and will be removed
in Rails 8.0. Positional arguments should be used instead:
>
> enum :status, {:queued=>0, :started=>1, :finished=>2}

The modern syntax was already introduced in 7.0
---
 spec/acceptance/enum_traits_spec.rb | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/spec/acceptance/enum_traits_spec.rb b/spec/acceptance/enum_traits_spec.rb
index 3f347251e..5c6a20ecf 100644
--- a/spec/acceptance/enum_traits_spec.rb
+++ b/spec/acceptance/enum_traits_spec.rb
@@ -1,9 +1,17 @@
 describe "enum traits" do
+  def define_model_with_enum(class_name, field, values)
+    define_model(class_name, status: :integer) do
+      if ActiveRecord::VERSION::STRING >= "7.0"
+        enum field, values
+      else
+        enum field => values
+      end
+    end
+  end
+
   context "when automatically_define_enum_traits is true" do
     it "builds traits automatically for model enum field" do
-      define_model("Task", status: :integer) do
-        enum status: {queued: 0, started: 1, finished: 2}
-      end
+      define_model_with_enum("Task", :status, {queued: 0, started: 1, finished: 2})
 
       FactoryBot.define do
         factory :task
@@ -19,9 +27,7 @@
     end
 
     it "prefers user defined traits over automatically built traits" do
-      define_model("Task", status: :integer) do
-        enum status: {queued: 0, started: 1, finished: 2}
-      end
+      define_model_with_enum("Task", :status, {queued: 0, started: 1, finished: 2})
 
       FactoryBot.define do
         factory :task do
@@ -118,9 +124,7 @@ def each(&block)
   context "when automatically_define_enum_traits is false" do
     it "raises an error for undefined traits" do
       with_temporary_assignment(FactoryBot, :automatically_define_enum_traits, false) do
-        define_model("Task", status: :integer) do
-          enum status: {queued: 0, started: 1, finished: 2}
-        end
+        define_model_with_enum("Task", :status, {queued: 0, started: 1, finished: 2})
 
         FactoryBot.define do
           factory :task
@@ -138,9 +142,7 @@ def each(&block)
 
     it "builds traits for each enumerated value when traits_for_enum are specified" do
       with_temporary_assignment(FactoryBot, :automatically_define_enum_traits, false) do
-        define_model("Task", status: :integer) do
-          enum status: {queued: 0, started: 1, finished: 2}
-        end
+        define_model_with_enum("Task", :status, {queued: 0, started: 1, finished: 2})
 
         FactoryBot.define do
           factory :task do