From d8c05328de1fc94bca35d40db96961f3033a8e94 Mon Sep 17 00:00:00 2001
From: Paul Bob <paul.ionut.bob@gmail.com>
Date: Fri, 24 Nov 2023 14:07:35 +0200
Subject: [PATCH 1/3] chore: enable tests workflow

---
 .github/workflows/test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cefb567623..55204f917b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,10 +5,12 @@ on:
     branches:
       - main
       - 1.x
+      - 2.x
   push:
     branches:
       - main
       - 1.x
+      - 2.x
 
 env:
   RAILS_ENV: test

From 00c0539b4167cabb1b4743e1fdfaa8fa52427391 Mon Sep 17 00:00:00 2001
From: Paul Bob <paul.ionut.bob@gmail.com>
Date: Fri, 24 Nov 2023 14:40:07 +0200
Subject: [PATCH 2/3] chore: fix actions test

---
 spec/system/avo/actions_spec.rb | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/spec/system/avo/actions_spec.rb b/spec/system/avo/actions_spec.rb
index 36a97a250e..e9203fe621 100644
--- a/spec/system/avo/actions_spec.rb
+++ b/spec/system/avo/actions_spec.rb
@@ -133,7 +133,7 @@
 
   describe "redirects when no confirmation" do
     it "redirects to hey page" do
-      no_confirmation = Sub::DummyAction.no_confirmation
+      original_dummy_action = Sub::DummyAction.dup
 
       Sub::DummyAction.class_eval do
         self.no_confirmation = true
@@ -152,12 +152,8 @@
 
       expect(page).to have_text "hey en"
 
-
-      Sub::DummyAction.class_eval do
-        undef_method :redirect_handle
-      end
-
-      Sub::DummyAction.no_confirmation = no_confirmation
+      Sub.send(:remove_const, "DummyAction")
+      Sub.const_set("DummyAction", original_dummy_action)
     end
   end
   #   let!(:roles) { { admin: false, manager: false, writer: false } }

From 5dcb79572a95be727bbf22736cd79e60401d817a Mon Sep 17 00:00:00 2001
From: Paul Bob <paul.ionut.bob@gmail.com>
Date: Fri, 24 Nov 2023 14:49:53 +0200
Subject: [PATCH 3/3] chore: ar locale fix inconsistent interpolation

---
 lib/generators/avo/templates/locales/avo.ar.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/generators/avo/templates/locales/avo.ar.yml b/lib/generators/avo/templates/locales/avo.ar.yml
index 1c29908ca0..017c8043df 100644
--- a/lib/generators/avo/templates/locales/avo.ar.yml
+++ b/lib/generators/avo/templates/locales/avo.ar.yml
@@ -5,7 +5,7 @@ ar:
     actions: أوامر
     and_x_other_resources: و %{count} موارد أخرى
     are_you_sure: هل أنت متأكد؟
-    are_you_sure_detach_item: هل أنت متأكد أنك تريد فصل هذا الـ٪{item}؟
+    are_you_sure_detach_item: هل أنت متأكد أنك تريد فصل هذا الـ%{item}؟
     are_you_sure_you_want_to_run_this_option: هل أنت متأكد أنك تريد تشغيل هذا الخيار؟
     attach: ربط
     attach_and_attach_another: ربط وربط آخر