Merge branch '2.x' into 2.x_fix/create_new_record_from_belongs_to_ass…

…ociations
avo-hq · Nov 28, 2023 · 7cdfe2e · 7cdfe2e
2 parents d476212 + 5dcb795
commit 7cdfe2e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git 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

diff --git 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: ربط وربط آخر

diff --git 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 } }