fix specs

OsamaSayegh · OsamaSayegh · commit 768923f92649 · 2025-05-19T12:29:24.000+03:00
diff --git a/app/controllers/admin/themes_controller.rb b/app/controllers/admin/themes_controller.rb
@@ -172,7 +172,12 @@ def index
     @themes = Theme.strict_loading.include_relations.order(:name)
 
     @color_schemes =
-      ColorScheme.strict_loading.all.without_theme_owned_palettes.includes(:theme, color_scheme_colors: :color_scheme).to_a
+      ColorScheme
+        .strict_loading
+        .all
+        .without_theme_owned_palettes
+        .includes(:theme, color_scheme_colors: :color_scheme)
+        .to_a
 
     payload = {
       themes: serialize_data(@themes, ThemeSerializer),
@@ -377,7 +382,7 @@ def change_colors
 
     colors = params.permit(colors: %i[name hex dark_hex])
 
-    ColorSchemeRevisor.revise(palette, colors, update_existing_colors_only: true)
+    ColorSchemeRevisor.revise_existing_colors_only(palette, colors)
 
     render_serialized(palette, ColorSchemeSerializer, root: false)
   end
diff --git a/app/models/theme.rb b/app/models/theme.rb
@@ -90,8 +90,6 @@ def self.cache
           include_basic_relations.includes(
             :theme_settings,
             :settings_field,
-            color_scheme: %i[color_scheme_colors],
-            owned_color_scheme: %i[color_scheme_colors],
             theme_fields: %i[upload theme_settings_migration],
             child_themes: %i[color_scheme locale_fields theme_translation_overrides],
           )
@@ -104,7 +102,8 @@ def self.cache
             :user,
             :locale_fields,
             :theme_translation_overrides,
-            color_scheme: %i[theme],
+            color_scheme: %i[theme color_scheme_colors],
+            owned_color_scheme: %i[theme color_scheme_colors],
             parent_themes: %i[color_scheme locale_fields theme_translation_overrides],
           )
         end
diff --git a/app/services/color_scheme_revisor.rb b/app/services/color_scheme_revisor.rb
@@ -6,8 +6,12 @@ def initialize(color_scheme, params = {})
     @params = params
   end
 
-  def self.revise(color_scheme, params, update_existing_colors_only: false)
-    self.new(color_scheme, params).revise(update_existing_colors_only:)
+  def self.revise(color_scheme, params)
+    self.new(color_scheme, params).revise
+  end
+
+  def self.revise_existing_colors_only(color_scheme, params)
+    self.new(color_scheme, params).revise(update_existing_colors_only: true)
   end
 
   def revise(update_existing_colors_only: false)
diff --git a/spec/models/theme_spec.rb b/spec/models/theme_spec.rb
@@ -1724,7 +1724,7 @@ def included_settings(id)
       palette = theme.find_or_create_owned_color_palette
 
       expect(palette.owning_theme).to eq(theme)
-      expect(theme.owned_color_palette).to eq(palette)
+      expect(theme.reload.owned_color_palette).to eq(palette)
     end
 
     it "ensures owned color palette is not user selectable" do
