FIX: specs

lis2 · lis2 · commit 7460da4a68d5 · 2025-08-06T12:13:52.000+08:00
diff --git a/app/assets/javascripts/discourse/app/controllers/preferences/interface.js b/app/assets/javascripts/discourse/app/controllers/preferences/interface.js
@@ -245,12 +245,12 @@ export default class InterfaceController extends Controller {
 
   @discourseComputed("userSelectableColorSchemes")
   showColorSchemeSelector(lightSchemes) {
-    return lightSchemes && lightSchemes.length > 1;
+    return lightSchemes && lightSchemes.length > 2;
   }
 
   @discourseComputed("userSelectableDarkColorSchemes")
   showDarkColorSchemeSelector(darkSchemes) {
-    return darkSchemes && darkSchemes.length > 1;
+    return darkSchemes && darkSchemes.length > 2;
   }
 
   get interfaceColorModes() {
diff --git a/app/assets/javascripts/discourse/app/lib/color-scheme-picker.js b/app/assets/javascripts/discourse/app/lib/color-scheme-picker.js
@@ -35,8 +35,8 @@ export function listColorSchemes(site, options = {}) {
     id: -1,
     name: `${i18n("user.color_schemes.default_description")}`,
     colors: options.darkOnly
-      ? defaultDarkColorScheme?.colors
-      : defaultLightColorScheme?.colors,
+      ? defaultDarkColorScheme?.colors || []
+      : defaultLightColorScheme?.colors || [],
   });
 
   return results.length === 0 ? null : results;
diff --git a/spec/system/interface_color_selector_spec.rb b/spec/system/interface_color_selector_spec.rb
@@ -62,7 +62,7 @@
   end
 
   it "is not available if the user uses the same scheme for dark mode as the light mode" do
-    user.user_option.update!(color_scheme_id: light_scheme.id, dark_scheme_id: -1)
+    user.user_option.update!(color_scheme_id: light_scheme.id, dark_scheme_id: light_scheme.id)
     sign_in(user)
 
     visit("/")
diff --git a/themes/horizon/spec/system/user_color_palette_selector_spec.rb b/themes/horizon/spec/system/user_color_palette_selector_spec.rb
@@ -7,6 +7,7 @@
   let!(:theme) do
     horizon_theme = upload_theme(set_theme_as_default: set_theme_as_default)
     horizon_theme.color_schemes.update_all(user_selectable: true)
+    horizon_theme.update!(dark_color_scheme_id: marigold_palette_dark.id)
     horizon_theme
   end
   fab!(:current_user, :user)

Original file line number	Diff line number	Diff line change
`@@ -245,12 +245,12 @@ export default class InterfaceController extends Controller {`
`245`	`245`
`246`	`246`	`@discourseComputed("userSelectableColorSchemes")`
`247`	`247`	`showColorSchemeSelector(lightSchemes) {`
`248`		`- return lightSchemes && lightSchemes.length > 1;`
	`248`	`+ return lightSchemes && lightSchemes.length > 2;`
`249`	`249`	`}`
`250`	`250`
`251`	`251`	`@discourseComputed("userSelectableDarkColorSchemes")`
`252`	`252`	`showDarkColorSchemeSelector(darkSchemes) {`
`253`		`- return darkSchemes && darkSchemes.length > 1;`
	`253`	`+ return darkSchemes && darkSchemes.length > 2;`
`254`	`254`	`}`
`255`	`255`
`256`	`256`	`get interfaceColorModes() {`