Merge branch 'main' into enhancement/improve-message-when-missing-resource-for-array-fields

Author: Paul-Bob

Gemfile.lock

@@ -452,7 +452,7 @@ GEM
     puma (6.6.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.1.11)
+    rack (3.1.12)
     rack-session (2.1.0)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)

gemfiles/rails_7.1_ruby_3.1.4.gemfile.lock

@@ -450,7 +450,7 @@ GEM
     puma (6.6.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.1.11)
+    rack (3.1.12)
     rack-session (2.1.0)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)

gemfiles/rails_7.1_ruby_3.3.0.gemfile.lock

@@ -422,7 +422,7 @@ GEM
     puma (6.6.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.1.11)
+    rack (3.1.12)
     rack-session (2.1.0)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)

gemfiles/rails_8.0_ruby_3.3.0.gemfile.lock

@@ -422,7 +422,7 @@ GEM
     puma (6.6.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.1.11)
+    rack (3.1.12)
     rack-session (2.1.0)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)

lib/avo/base_action.rb

@@ -4,7 +4,9 @@ class BaseAction
     include Avo::Concerns::HasActionStimulusControllers
     include Avo::Concerns::Hydration
 
-    DATA_ATTRIBUTES = {turbo_frame: Avo::MODAL_FRAME_ID}
+    unless defined?(DATA_ATTRIBUTES)
+      DATA_ATTRIBUTES = {turbo_frame: Avo::MODAL_FRAME_ID}
+    end
 
     class_attribute :name, default: nil
     class_attribute :message

spec/components/avo/cover_photo_component_spec.rb

@@ -1,64 +1,64 @@
 require "rails_helper"
 
 RSpec.describe Avo::CoverPhotoComponent, type: :component do
-  let(:cover_photo) { double("cover_photo") }
-  let(:resource) { double("resource", cover_photo: cover_photo) }
+  # let(:cover_photo) { double("cover_photo") }
+  # let(:resource) { double("resource", cover_photo: cover_photo) }
 
-  describe "rendering" do
-    context "when cover photo is present and visible in the current view" do
-      before do
-        allow(cover_photo).to receive(:present?).and_return(true)
-        allow(cover_photo).to receive(:visible_in_current_view?).and_return(true)
-        allow(cover_photo).to receive(:value).and_return("cover_photo_value")
-        allow(cover_photo).to receive(:size).and_return(:md)
-      end
+  # describe "rendering" do
+  #   context "when cover photo is present and visible in the current view" do
+  #     before do
+  #       allow(cover_photo).to receive(:present?).and_return(true)
+  #       allow(cover_photo).to receive(:visible_in_current_view?).and_return(true)
+  #       allow(cover_photo).to receive(:value).and_return("cover_photo_value")
+  #       allow(cover_photo).to receive(:size).and_return(:md)
+  #     end
 
-      it "renders the component with the correct size and visibility settings" do
-        render_inline(described_class.new(cover_photo: cover_photo))
+  #     it "renders the component with the correct size and visibility settings" do
+  #       render_inline(described_class.new(cover_photo: cover_photo))
 
-        expect(rendered_component).to have_css(".aspect-cover-md")
-        expect(rendered_component).to have_selector("img[src='cover_photo_value']")
-      end
-    end
+  #       expect(rendered_component).to have_css(".aspect-cover-md")
+  #       expect(rendered_component).to have_selector("img[src='cover_photo_value']")
+  #     end
+  #   end
 
-    context "when cover photo is not present" do
-      before do
-        allow(cover_photo).to receive(:present?).and_return(false)
-      end
+  #   context "when cover photo is not present" do
+  #     before do
+  #       allow(cover_photo).to receive(:present?).and_return(false)
+  #     end
 
-      it "does not render the component" do
-        render_inline(described_class.new(cover_photo: cover_photo))
+  #     it "does not render the component" do
+  #       render_inline(described_class.new(cover_photo: cover_photo))
 
-        expect(rendered_component).to be_blank
-      end
-    end
+  #       expect(rendered_component).to be_blank
+  #     end
+  #   end
 
-    context "when cover photo is not visible in the current view" do
-      before do
-        allow(cover_photo).to receive(:visible_in_current_view?).and_return(false)
-      end
+  #   context "when cover photo is not visible in the current view" do
+  #     before do
+  #       allow(cover_photo).to receive(:visible_in_current_view?).and_return(false)
+  #     end
 
-      it "does not render the component" do
-        render_inline(described_class.new(cover_photo: cover_photo))
+  #     it "does not render the component" do
+  #       render_inline(described_class.new(cover_photo: cover_photo))
 
-        expect(rendered_component).to be_blank
-      end
-    end
+  #       expect(rendered_component).to be_blank
+  #     end
+  #   end
 
-    context "when cover photo source is a lambda" do
-      let(:lambda_source) { -> { "dynamic_source_value" } }
+  #   context "when cover photo source is a lambda" do
+  #     let(:lambda_source) { -> { "dynamic_source_value" } }
 
-      before do
-        allow(cover_photo).to receive(:present?).and_return(true)
-        allow(cover_photo).to receive(:visible_in_current_view?).and_return(true)
-        allow(cover_photo).to receive(:value).and_return(lambda_source.call)
-      end
+  #     before do
+  #       allow(cover_photo).to receive(:present?).and_return(true)
+  #       allow(cover_photo).to receive(:visible_in_current_view?).and_return(true)
+  #       allow(cover_photo).to receive(:value).and_return(lambda_source.call)
+  #     end
 
-      it "correctly handles dynamic sources" do
-        render_inline(described_class.new(cover_photo: cover_photo))
+  #     it "correctly handles dynamic sources" do
+  #       render_inline(described_class.new(cover_photo: cover_photo))
 
-        expect(rendered_component).to have_selector("img[src='dynamic_source_value']")
-      end
-    end
-  end
+  #       expect(rendered_component).to have_selector("img[src='dynamic_source_value']")
+  #     end
+  #   end
+  # end
 end

spec/features/action_icon_and_divider_spec.rb renamed to spec/features/avo/action_icon_and_divider_spec.rb

@@ -2,8 +2,6 @@
 
 RSpec.describe "action icon and divider", type: :feature do
   describe "icon and divider" do
-    let(:user) { create(:user) }
-
     it "Viewing actions with icon and divider" do
       visit "admin/resources/users"
 

spec/features/avo/generators/locales_generator_spec.rb

@@ -25,7 +25,7 @@
       files << Rails.root.join("config", "locales", "pagy", "#{locale}.yml").to_s
     end
 
-    Rails::Generators.invoke("avo:locales", ["-q"], {destination_root: Rails.root})
+    Rails::Generators.invoke("avo:locales", ["-q", "--skip"], {destination_root: Rails.root})
 
     check_files_and_clean_up files
 

spec/features/query_scope_spec.rb renamed to spec/features/avo/query_scope_spec.rb

@@ -112,6 +112,9 @@ def headless_download_setup(driver)
   config.use_transactional_fixtures = true
   config.filter_run focus: true
   config.run_all_when_everything_filtered = true
+  config.before(:each) do
+    Rails.application.try(:reload_routes_unless_loaded)
+  end
 
   config.before(:each, type: :system) {
     browser_options = {