mirror of https://github.com/tootsuite/mastodon
parent
988b0493fe
commit
e223fd8c61
|
@ -200,12 +200,8 @@ class Status < ApplicationRecord
|
||||||
def title
|
def title
|
||||||
if destroyed?
|
if destroyed?
|
||||||
"#{account.acct} deleted status"
|
"#{account.acct} deleted status"
|
||||||
elsif reblog?
|
|
||||||
preview = sensitive ? '<sensitive>' : text.slice(0, 10).split("\n")[0]
|
|
||||||
"#{account.acct} shared #{reblog.account.acct}'s: #{preview}"
|
|
||||||
else
|
else
|
||||||
preview = sensitive ? '<sensitive>' : text.slice(0, 20).split("\n")[0]
|
reblog? ? "#{account.acct} shared a status by #{reblog.account.acct}" : "New status by #{account.acct}"
|
||||||
"#{account.acct}: #{preview}"
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -96,20 +96,16 @@ RSpec.describe Status, type: :model do
|
||||||
|
|
||||||
context 'unless destroyed?' do
|
context 'unless destroyed?' do
|
||||||
context 'if reblog?' do
|
context 'if reblog?' do
|
||||||
it 'returns "#{account.acct} shared #{reblog.account.acct}\'s: #{preview}"' do
|
it 'returns "#{account.acct} shared a status by #{reblog.account.acct}"' do
|
||||||
reblog = subject.reblog = other
|
reblog = subject.reblog = other
|
||||||
preview = subject.text.slice(0, 10).split("\n")[0]
|
expect(subject.title).to eq "#{account.acct} shared a status by #{reblog.account.acct}"
|
||||||
expect(subject.title).to(
|
|
||||||
eq "#{account.acct} shared #{reblog.account.acct}'s: #{preview}"
|
|
||||||
)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'unless reblog?' do
|
context 'unless reblog?' do
|
||||||
it 'returns "#{account.acct}: #{preview}"' do
|
it 'returns "New status by #{account.acct}"' do
|
||||||
subject.reblog = nil
|
subject.reblog = nil
|
||||||
preview = subject.text.slice(0, 20).split("\n")[0]
|
expect(subject.title).to eq "New status by #{account.acct}"
|
||||||
expect(subject.title).to eq "#{account.acct}: #{preview}"
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue