mirror of
https://gh.wpcy.net/https://github.com/discourse/discourse.git
synced 2026-05-01 05:39:09 +08:00
7a9cf9356e
- Add dark_color_scheme_id to Theme model - Update theme editor interface to allow selecting both light and dark schemes - Update color scheme selector to support setting default light/dark schemes - Fix user preferences to use theme's dark scheme instead of site setting <img width="1095" height="823" alt="Screenshot 2025-07-30 at 3 48 57 pm" src="https://github.com/user-attachments/assets/cdc32e9e-b2ac-41fc-b533-047bbd09406a" /> <img width="1020" height="736" alt="Screenshot 2025-07-30 at 3 49 08 pm" src="https://github.com/user-attachments/assets/63e8473f-d2a7-4fc5-81b7-4dad0d0fcace" />
110 lines
3.7 KiB
Ruby
110 lines
3.7 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
RSpec.describe ThemeSerializer do
|
|
describe ".settings" do
|
|
fab!(:theme)
|
|
|
|
it "should add error message when settings format is invalid" do
|
|
Theme
|
|
.any_instance
|
|
.stubs(:settings)
|
|
.raises(ThemeSettingsParser::InvalidYaml, I18n.t("themes.settings_errors.invalid_yaml"))
|
|
serialized = ThemeSerializer.new(theme).as_json[:theme]
|
|
expect(serialized[:settings]).to be_nil
|
|
expect(serialized[:errors].count).to eq(1)
|
|
expect(serialized[:errors][0]).to eq(I18n.t("themes.settings_errors.invalid_yaml"))
|
|
end
|
|
|
|
it "should add errors messages from theme fields" do
|
|
error = "error when compiling theme field"
|
|
theme_field = Fabricate(:theme_field, error: error, theme: theme)
|
|
serialized = ThemeSerializer.new(theme.reload).as_json[:theme]
|
|
expect(serialized[:errors].count).to eq(1)
|
|
expect(serialized[:errors][0]).to eq(error)
|
|
end
|
|
end
|
|
|
|
describe "color schemes" do
|
|
fab!(:theme) { Fabricate(:theme, color_scheme_id: 1, dark_color_scheme_id: 2) }
|
|
let(:serialized) { ThemeSerializer.new(theme.reload).as_json[:theme] }
|
|
|
|
it "should include color scheme id" do
|
|
expect(serialized[:color_scheme_id]).to eq(1)
|
|
end
|
|
|
|
it "should include dark color scheme id" do
|
|
expect(serialized[:dark_color_scheme_id]).to eq(2)
|
|
end
|
|
end
|
|
|
|
describe "screenshot_url" do
|
|
fab!(:theme)
|
|
let(:serialized) { ThemeSerializer.new(theme.reload).as_json[:theme] }
|
|
|
|
it "should include screenshot_url when there is a theme field with screenshot upload type" do
|
|
Fabricate(
|
|
:theme_field,
|
|
theme: theme,
|
|
type_id: ThemeField.types[:theme_screenshot_upload_var],
|
|
name: "theme_screenshot_1",
|
|
upload: Fabricate(:upload),
|
|
)
|
|
expect(serialized[:screenshot_url]).to be_present
|
|
end
|
|
|
|
it "should not include screenshot_url when there is no theme field with screenshot upload type" do
|
|
expect(serialized[:screenshot_url]).to be_nil
|
|
end
|
|
|
|
it "should handle multiple screenshot fields and use the first one" do
|
|
first_upload = Fabricate(:upload)
|
|
second_upload = Fabricate(:upload)
|
|
Fabricate(
|
|
:theme_field,
|
|
theme: theme,
|
|
type_id: ThemeField.types[:theme_screenshot_upload_var],
|
|
name: "theme_screenshot_1",
|
|
upload: first_upload,
|
|
)
|
|
Fabricate(
|
|
:theme_field,
|
|
theme: theme,
|
|
type_id: ThemeField.types[:theme_screenshot_upload_var],
|
|
name: "theme_screenshot_2",
|
|
upload: second_upload,
|
|
)
|
|
|
|
expect(serialized[:screenshot_url]).to eq(first_upload.url)
|
|
end
|
|
end
|
|
|
|
describe ".themeable_site_settings" do
|
|
fab!(:theme)
|
|
|
|
it "returns the themeable_site_settings with defaults and values converted to string" do
|
|
serialized = ThemeSerializer.new(theme).as_json[:theme]
|
|
|
|
SiteSetting.themeable_site_settings.each do |setting|
|
|
found_tss = serialized[:themeable_site_settings].find { |tss| tss[:setting] == setting }
|
|
expect(found_tss[:value]).to eq(SiteSetting.defaults[setting.name].to_s)
|
|
expect(found_tss[:default]).to eq(SiteSetting.defaults[setting.name].to_s)
|
|
end
|
|
end
|
|
|
|
it "returns the correct value for overridden theme site settings" do
|
|
Fabricate(
|
|
:theme_site_setting_with_service,
|
|
name: "enable_welcome_banner",
|
|
value: false,
|
|
theme: theme,
|
|
)
|
|
|
|
serialized = ThemeSerializer.new(theme).as_json[:theme]
|
|
|
|
found_tss =
|
|
serialized[:themeable_site_settings].find { |tss| tss[:setting] == :enable_welcome_banner }
|
|
expect(found_tss[:value]).to eq("false")
|
|
expect(found_tss[:default]).to eq(SiteSetting.defaults[:enable_welcome_banner].to_s)
|
|
end
|
|
end
|
|
end
|
