From 2b8dc58b7ff7fb708687c08a75c99b3fb30efc49 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 9 May 2022 07:43:08 +0200
Subject: Change RSS feeds (#18356)
* Change RSS feeds
- Use date and time for titles instead of ellipsized text
- Use full content in body, even when there is a content warning
- Use media extensions
* Change feed icons and add width and height attributes to custom emojis
* Fix custom emoji animate on hover breaking
* Fix tests
---
spec/lib/emoji_formatter_spec.rb | 6 ++---
spec/lib/rss/serializer_spec.rb | 56 ----------------------------------------
2 files changed, 3 insertions(+), 59 deletions(-)
delete mode 100644 spec/lib/rss/serializer_spec.rb
(limited to 'spec')
diff --git a/spec/lib/emoji_formatter_spec.rb b/spec/lib/emoji_formatter_spec.rb
index 129445aa5..e1747bdd9 100644
--- a/spec/lib/emoji_formatter_spec.rb
+++ b/spec/lib/emoji_formatter_spec.rb
@@ -24,7 +24,7 @@ RSpec.describe EmojiFormatter do
let(:text) { preformat_text(':coolcat: Beep boop') }
it 'converts the shortcode to an image tag' do
- is_expected.to match(/<img draggable="false" class="emojione custom-emoji" alt=":coolcat:"/)
+ is_expected.to match(/<img rel="emoji" draggable="false" width="16" height="16" class="emojione custom-emoji" alt=":coolcat:"/)
end
end
@@ -32,7 +32,7 @@ RSpec.describe EmojiFormatter do
let(:text) { preformat_text('Beep :coolcat: boop') }
it 'converts the shortcode to an image tag' do
- is_expected.to match(/Beep <img draggable="false" class="emojione custom-emoji" alt=":coolcat:"/)
+ is_expected.to match(/Beep <img rel="emoji" draggable="false" width="16" height="16" class="emojione custom-emoji" alt=":coolcat:"/)
end
end
@@ -48,7 +48,7 @@ RSpec.describe EmojiFormatter do
let(:text) { preformat_text('Beep boop :coolcat:') }
it 'converts the shortcode to an image tag' do
- is_expected.to match(/boop <img draggable="false" class="emojione custom-emoji" alt=":coolcat:"/)
+ is_expected.to match(/boop <img rel="emoji" draggable="false" width="16" height="16" class="emojione custom-emoji" alt=":coolcat:"/)
end
end
end
diff --git a/spec/lib/rss/serializer_spec.rb b/spec/lib/rss/serializer_spec.rb
deleted file mode 100644
index 1da45d302..000000000
--- a/spec/lib/rss/serializer_spec.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe RSS::Serializer do
- describe '#status_title' do
- let(:text) { 'This is a toot' }
- let(:spoiler) { '' }
- let(:sensitive) { false }
- let(:reblog) { nil }
- let(:account) { Fabricate(:account) }
- let(:status) { Fabricate(:status, account: account, text: text, spoiler_text: spoiler, sensitive: sensitive, reblog: reblog) }
-
- subject { RSS::Serializer.new.send(:status_title, status) }
-
- context 'on a toot with long text' do
- let(:text) { "This toot's text is longer than the allowed number of characters" }
-
- it 'truncates toot text appropriately' do
- expect(subject).to eq "#{account.acct}: “This toot's text is longer tha…”"
- end
- end
-
- context 'on a toot with long text with a newline' do
- let(:text) { "This toot's text is longer\nthan the allowed number of characters" }
-
- it 'truncates toot text appropriately' do
- expect(subject).to eq "#{account.acct}: “This toot's text is longer…”"
- end
- end
-
- context 'on a toot with a content warning' do
- let(:spoiler) { 'long toot' }
-
- it 'displays spoiler text instead of toot content' do
- expect(subject).to eq "#{account.acct}: CW “long toot”"
- end
- end
-
- context 'on a toot with sensitive media' do
- let(:sensitive) { true }
-
- it 'displays that the media is sensitive' do
- expect(subject).to eq "#{account.acct}: “This is a toot” (sensitive)"
- end
- end
-
- context 'on a reblog' do
- let(:reblog) { Fabricate(:status, text: 'This is a toot') }
-
- it 'display that the toot is a reblog' do
- expect(subject).to eq "#{account.acct} boosted #{reblog.account.acct}: “This is a toot”"
- end
- end
- end
-end
--
cgit
From 898fe2fa8e886d62de2bd9b15eb758054216d33d Mon Sep 17 00:00:00 2001
From: luzpaz <luzpaz@users.noreply.github.com>
Date: Mon, 9 May 2022 22:58:04 -0400
Subject: Fix typo in source `setted`->`set` (#18385)
Found via `codespell -q 3 -S ./CHANGELOG.md,./AUTHORS.md,./config/locales,./app/javascript/mastodon/locales -L ba,keypair,medias,ro`
---
.../two_factor_authentication/confirmations_controller_spec.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'spec')
diff --git a/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb b/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb
index 7b86513be..569c8322b 100644
--- a/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb
+++ b/spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb
@@ -22,7 +22,7 @@ describe Settings::TwoFactorAuthentication::ConfirmationsController do
let(:user) { Fabricate(:user, email: 'local-part@domain', otp_secret: with_otp_secret ? 'oldotpsecret' : nil) }
describe 'GET #new' do
- context 'when signed in and a new otp secret has been setted in the session' do
+ context 'when signed in and a new otp secret has been set in the session' do
subject do
sign_in user, scope: :user
get :new, session: { challenge_passed_at: Time.now.utc, new_otp_secret: 'thisisasecretforthespecofnewview' }
@@ -36,7 +36,7 @@ describe Settings::TwoFactorAuthentication::ConfirmationsController do
expect(response).to redirect_to('/auth/sign_in')
end
- it 'redirects if a new otp_secret has not been setted in the session' do
+ it 'redirects if a new otp_secret has not been set in the session' do
sign_in user, scope: :user
get :new, session: { challenge_passed_at: Time.now.utc }
expect(response).to redirect_to('/settings/otp_authentication')
--
cgit