mirror of
https://github.com/discourse/discourse.git
synced 2024-11-24 02:20:41 +08:00
3f908c047d
When a theme setting of type `upload` has a default upload, it should return the URL of the specified default upload until a custom upload is used for the setting. However, currently this isn't the case and we get null instead of the default upload URL.
The reason for this is because the `super` method of `#value` already returns the default upload URL (if there's one), so we can't pass that to `cdn_url` which expects an upload ID:
c961dcc757/lib/theme_settings_manager.rb (L212)
This commit fixes the bug by skipping the call to `cdn_url` when we fallback to the default upload for the setting value.
191 lines
5.6 KiB
Ruby
191 lines
5.6 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require "theme_settings_manager"
|
|
|
|
RSpec.describe ThemeSettingsManager do
|
|
let!(:theme) { Fabricate(:theme) }
|
|
let(:theme_settings) do
|
|
yaml = File.read("#{Rails.root}/spec/fixtures/theme_settings/valid_settings.yaml")
|
|
theme.set_field(target: :settings, name: "yaml", value: yaml)
|
|
theme.save!
|
|
theme.settings
|
|
end
|
|
|
|
def find_by_name(name)
|
|
theme_settings.find { |setting| setting.name == name }
|
|
end
|
|
|
|
describe "Enum" do
|
|
it "only accepts values from its choices" do
|
|
enum_setting = find_by_name(:enum_setting)
|
|
expect { enum_setting.value = "trust level 2" }.to raise_error(Discourse::InvalidParameters)
|
|
expect { enum_setting.value = "trust level 0" }.not_to raise_error
|
|
|
|
enum_setting = find_by_name(:enum_setting_02)
|
|
expect { enum_setting.value = "10" }.not_to raise_error
|
|
|
|
enum_setting = find_by_name(:enum_setting_03)
|
|
expect { enum_setting.value = "10" }.not_to raise_error
|
|
expect { enum_setting.value = 1 }.not_to raise_error
|
|
expect { enum_setting.value = 15 }.to raise_error(Discourse::InvalidParameters)
|
|
end
|
|
end
|
|
|
|
describe "Bool" do
|
|
it "is either true or false" do
|
|
bool_setting = find_by_name(:boolean_setting)
|
|
expect(bool_setting.value).to eq(true) # default
|
|
|
|
bool_setting.value = "true"
|
|
theme.reload
|
|
expect(bool_setting.value).to eq(true)
|
|
|
|
bool_setting.value = "falsse" # intentionally misspelled
|
|
theme.reload
|
|
expect(bool_setting.value).to eq(false)
|
|
|
|
bool_setting.value = true
|
|
theme.reload
|
|
expect(bool_setting.value).to eq(true)
|
|
end
|
|
end
|
|
|
|
describe "Integer" do
|
|
it "is always an integer" do
|
|
int_setting = find_by_name(:integer_setting)
|
|
int_setting.value = 1.6
|
|
theme.reload
|
|
expect(int_setting.value).to eq(1)
|
|
|
|
int_setting.value = "4.3"
|
|
theme.reload
|
|
expect(int_setting.value).to eq(4)
|
|
|
|
int_setting.value = "10"
|
|
theme.reload
|
|
expect(int_setting.value).to eq(10)
|
|
|
|
int_setting.value = "text"
|
|
theme.reload
|
|
expect(int_setting.value).to eq(0)
|
|
end
|
|
|
|
it "can have min or max value" do
|
|
int_setting = find_by_name(:integer_setting_02)
|
|
expect { int_setting.value = 0 }.to raise_error(Discourse::InvalidParameters)
|
|
expect { int_setting.value = 61 }.to raise_error(Discourse::InvalidParameters)
|
|
|
|
int_setting.value = 60
|
|
theme.reload
|
|
expect(int_setting.value).to eq(60)
|
|
|
|
int_setting.value = 1
|
|
theme.reload
|
|
expect(int_setting.value).to eq(1)
|
|
end
|
|
end
|
|
|
|
describe "Float" do
|
|
it "is always a float" do
|
|
float_setting = find_by_name(:float_setting)
|
|
float_setting.value = 1.615
|
|
theme.reload
|
|
expect(float_setting.value).to eq(1.615)
|
|
|
|
float_setting.value = "3.1415"
|
|
theme.reload
|
|
expect(float_setting.value).to eq(3.1415)
|
|
|
|
float_setting.value = 10
|
|
theme.reload
|
|
expect(float_setting.value).to eq(10)
|
|
end
|
|
|
|
it "can have min or max value" do
|
|
float_setting = find_by_name(:float_setting)
|
|
expect { float_setting.value = 1.4 }.to raise_error(Discourse::InvalidParameters)
|
|
expect { float_setting.value = 10.01 }.to raise_error(Discourse::InvalidParameters)
|
|
expect { float_setting.value = "text" }.to raise_error(Discourse::InvalidParameters)
|
|
|
|
float_setting.value = 9.521
|
|
theme.reload
|
|
expect(float_setting.value).to eq(9.521)
|
|
end
|
|
end
|
|
|
|
describe "String" do
|
|
it "can have min or max length" do
|
|
string_setting = find_by_name(:string_setting_02)
|
|
expect { string_setting.value = "a" }.to raise_error(Discourse::InvalidParameters)
|
|
|
|
string_setting.value = "ab"
|
|
theme.reload
|
|
expect(string_setting.value).to eq("ab")
|
|
|
|
string_setting.value = "ab" * 10
|
|
theme.reload
|
|
expect(string_setting.value).to eq("ab" * 10)
|
|
|
|
expect { string_setting.value = ("a" * 21) }.to raise_error(Discourse::InvalidParameters)
|
|
end
|
|
|
|
it "can be a textarea" do
|
|
expect(find_by_name(:string_setting_02).textarea).to eq(false)
|
|
expect(find_by_name(:string_setting_03).textarea).to eq(true)
|
|
end
|
|
|
|
it "supports json schema" do
|
|
expect(find_by_name(:string_setting_03).json_schema).to eq(false)
|
|
expect(find_by_name(:invalid_json_schema_setting).json_schema).to eq(false)
|
|
expect(find_by_name(:valid_json_schema_setting).json_schema).to be_truthy
|
|
end
|
|
end
|
|
|
|
describe "List" do
|
|
it "can have a list type" do
|
|
list_setting = find_by_name(:compact_list_setting)
|
|
expect(list_setting.list_type).to eq("compact")
|
|
end
|
|
end
|
|
|
|
describe "Upload" do
|
|
let!(:upload) { Fabricate(:upload) }
|
|
|
|
it "saves the upload id" do
|
|
upload_setting = find_by_name(:upload_setting)
|
|
upload_setting.value = upload.url
|
|
theme.reload
|
|
|
|
expect(
|
|
ThemeSetting.exists?(theme_id: theme.id, name: "upload_setting", value: upload.id.to_s),
|
|
).to be_truthy
|
|
end
|
|
|
|
describe "#value" do
|
|
context "when it's changed to a custom upload" do
|
|
it "returns CDN URL" do
|
|
upload_setting = find_by_name(:upload_setting)
|
|
upload_setting.value = upload.url
|
|
theme.reload
|
|
|
|
expect(upload_setting.value).to eq(Discourse.store.cdn_url(upload.url))
|
|
end
|
|
end
|
|
|
|
context "when there's a default upload" do
|
|
it "returns CDN URL" do
|
|
theme.set_field(
|
|
target: :common,
|
|
name: "default-upload",
|
|
type: :theme_upload_var,
|
|
upload_id: upload.id,
|
|
)
|
|
theme.save!
|
|
upload_setting = find_by_name(:upload_setting)
|
|
expect(upload_setting.value).to eq(Discourse.store.cdn_url(upload.url))
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|