mirror of
https://github.com/discourse/discourse.git
synced 2024-11-26 19:33:39 +08:00
0e303c7f5d
This change automatically resizes icons for various purposes. Admins can now upload `logo` and `logo_small`, and everything else will be auto-generated. Specific icons can still be uploaded separately if required. ## Core - Adds an SiteIconManager module which manages automatic resizing and fallback - Icons are looked up in the OptimizedImage table at runtime, and then cached in Redis. If the resized version is missing for some reason, then most icons will fall back to the original files. Some icons (e.g. PWA Manifest) will return `nil` (because an incorrectly sized icon is worse than a missing icon). - `SiteSetting.site_large_icon_url` will return the optimized version, including any fallback. `SiteSetting.large_icon` continues to return the upload object. This means that (almost) no changes are required in core/plugins to support this new system. - Icons are resized whenever a relevant site setting is changed, and during post-deploy migrations ## Wizard - Allows `requiresRefresh` wizard steps to reload data via AJAX instead of a full page reload - Add placeholders to the **icons** step of the wizard, which automatically update from the "Square Logo" - Various copy updates to support the changes - Remove the "upload-time" resizing for `large_icon`. This is no longer required. ## Site Settings UX - Move logo/icon settings under a new "Branding" tab - Various copy changes to support the changes - Adds placeholder support to the `image-uploader` component - Automatically reloads site settings after saving. This allows setting placeholders to change based on changes to other settings - Upload site settings will be assigned a placeholder if SiteIconManager `responds_to?` an icon of the same name ## Dashboard Warnings - Remove PWA icon and PWA title warnings. Both are now handled automatically. ## Bonus - Updated the sketch logos to use @awesomerobot's new high-res designs
138 lines
4.2 KiB
Ruby
138 lines
4.2 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require 'rails_helper'
|
|
|
|
describe UserNotificationsHelper do
|
|
describe '#email_excerpt' do
|
|
let(:paragraphs) { [
|
|
"<p>This is the first paragraph, but you should read more.</p>",
|
|
"<p>And here is its friend, the second paragraph.</p>"
|
|
] }
|
|
|
|
let(:cooked) do
|
|
paragraphs.join("\n")
|
|
end
|
|
|
|
it "can return the first paragraph" do
|
|
SiteSetting.digest_min_excerpt_length = 50
|
|
expect(helper.email_excerpt(cooked)).to eq(paragraphs[0])
|
|
end
|
|
|
|
it "can return another paragraph to satisfy digest_min_excerpt_length" do
|
|
SiteSetting.digest_min_excerpt_length = 100
|
|
expect(helper.email_excerpt(cooked)).to eq(paragraphs.join)
|
|
end
|
|
|
|
it "doesn't count emoji images" do
|
|
with_emoji = "<p>Hi <img src=\"/images/emoji/twitter/smile.png?v=#{Emoji::EMOJI_VERSION}\" title=\":smile:\" class=\"emoji\" alt=\":smile:\"></p>"
|
|
arg = ([with_emoji] + paragraphs).join("\n")
|
|
SiteSetting.digest_min_excerpt_length = 50
|
|
expect(helper.email_excerpt(arg)).to eq([with_emoji, paragraphs[0]].join)
|
|
end
|
|
|
|
it "only counts link text" do
|
|
with_link = "<p>Hi <a href=\"https://really-long.essays.com/essay/number/9000/this-one-is-about-friends-and-got-a-C-minus-in-grade-9\">friends</a>!</p>"
|
|
arg = ([with_link] + paragraphs).join("\n")
|
|
SiteSetting.digest_min_excerpt_length = 50
|
|
expect(helper.email_excerpt(arg)).to eq([with_link, paragraphs[0]].join)
|
|
end
|
|
|
|
it "uses user quotes but not post quotes" do
|
|
cooked = <<~HTML
|
|
<p>BEFORE</p>
|
|
<blockquote>
|
|
<p>This is a user quote</p>
|
|
</blockquote>
|
|
<aside class="quote" data-post="3" data-topic="87369">
|
|
<div class="title">A Title</div>
|
|
<blockquote>
|
|
<p>This is a post quote</p>
|
|
</blockquote>
|
|
</aside>
|
|
<p>AFTER</p>
|
|
HTML
|
|
|
|
expect(helper.email_excerpt(cooked)).to eq "<p>BEFORE</p><blockquote>\n <p>This is a user quote</p>\n</blockquote><p>AFTER</p>"
|
|
end
|
|
end
|
|
|
|
describe '#logo_url' do
|
|
describe 'local store' do
|
|
let(:upload) { Fabricate(:upload, sha1: "somesha1") }
|
|
|
|
before do
|
|
SiteSetting.logo = upload
|
|
end
|
|
|
|
it 'should return the right URL' do
|
|
expect(helper.logo_url).to eq(
|
|
"http://test.localhost/uploads/default/original/1X/somesha1.png"
|
|
)
|
|
end
|
|
|
|
describe 'when cdn path is configured' do
|
|
before do
|
|
GlobalSetting.expects(:cdn_url)
|
|
.returns('https://some.localcdn.com')
|
|
.at_least_once
|
|
end
|
|
|
|
it 'should return the right URL' do
|
|
expect(helper.logo_url).to eq(
|
|
"https://some.localcdn.com/uploads/default/original/1X/somesha1.png"
|
|
)
|
|
end
|
|
end
|
|
|
|
describe 'when logo is an SVG' do
|
|
let(:upload) { Fabricate(:upload, extension: "svg") }
|
|
|
|
it 'should return nil' do
|
|
expect(helper.logo_url).to eq(nil)
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 's3 store' do
|
|
let(:upload) { Fabricate(:upload_s3, sha1: "somesha1") }
|
|
|
|
before do
|
|
SiteSetting.enable_s3_uploads = true
|
|
SiteSetting.s3_upload_bucket = "s3-upload-bucket"
|
|
SiteSetting.s3_access_key_id = "some key"
|
|
SiteSetting.s3_secret_access_key = "some secret key"
|
|
SiteSetting.logo = upload
|
|
end
|
|
|
|
it 'should return the right URL' do
|
|
expect(helper.logo_url).to eq(
|
|
"http://s3-upload-bucket.s3.dualstack.us-east-1.amazonaws.com/original/1X/somesha1.png"
|
|
)
|
|
end
|
|
|
|
describe 'when global cdn path is configured' do
|
|
it 'should return the right url' do
|
|
GlobalSetting.stubs(:cdn_url).returns('https://some.cdn.com/cluster')
|
|
|
|
expect(helper.logo_url).to eq(
|
|
"http://s3-upload-bucket.s3.dualstack.us-east-1.amazonaws.com/original/1X/somesha1.png"
|
|
)
|
|
end
|
|
end
|
|
|
|
describe 'when cdn path is configured' do
|
|
before do
|
|
SiteSetting.s3_cdn_url = 'https://some.cdn.com'
|
|
|
|
end
|
|
|
|
it 'should return the right url' do
|
|
expect(helper.logo_url).to eq(
|
|
"https://some.cdn.com/original/1X/somesha1.png"
|
|
)
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|