Fix subscriptions:clear task, refactor feeds, refactor streamable activites
and atom feed generation to some extent, as well as the way mentions are stored
This commit is contained in:
parent
9594f0e858
commit
a08e724476
24 changed files with 219 additions and 234 deletions
|
@ -30,6 +30,29 @@ RSpec.describe ApplicationHelper, type: :helper do
|
|||
end
|
||||
|
||||
describe '#linkify' do
|
||||
pending
|
||||
let(:alice) { Fabricate(:account, username: 'alice') }
|
||||
let(:bob) { Fabricate(:account, username: 'bob', domain: 'example.com', url: 'http://example.com/bob') }
|
||||
|
||||
it 'turns mention of remote user into link' do
|
||||
status = Fabricate(:status, text: 'Hello @bob@example.com', account: bob)
|
||||
status.mentions.create(account: bob)
|
||||
expect(helper.linkify(status)).to match('<a href="http://example.com/bob" class="mention">@<span>bob@example.com</span></a>')
|
||||
end
|
||||
|
||||
it 'turns mention of local user into link' do
|
||||
status = Fabricate(:status, text: 'Hello @alice', account: bob)
|
||||
status.mentions.create(account: alice)
|
||||
expect(helper.linkify(status)).to match('<a href="http://test.host/users/alice" class="mention">@<span>alice</span></a>')
|
||||
end
|
||||
end
|
||||
|
||||
describe '#account_from_mentions' do
|
||||
let(:bob) { Fabricate(:account, username: 'bob', domain: 'example.com') }
|
||||
let(:status) { Fabricate(:status, text: 'Hello @bob@example.com', account: bob) }
|
||||
let(:mentions) { [Mention.create(status: status, account: bob)] }
|
||||
|
||||
it 'returns account' do
|
||||
expect(helper.account_from_mentions('bob@example.com', mentions)).to eq bob
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -96,18 +96,6 @@ RSpec.describe Account, type: :model do
|
|||
end
|
||||
end
|
||||
|
||||
describe '#title' do
|
||||
it 'is the same as the username' do
|
||||
expect(subject.title).to eql subject.username
|
||||
end
|
||||
end
|
||||
|
||||
describe '#content' do
|
||||
it 'is the same as the note' do
|
||||
expect(subject.content).to eql subject.note
|
||||
end
|
||||
end
|
||||
|
||||
describe '#ping!' do
|
||||
pending
|
||||
end
|
||||
|
|
|
@ -42,12 +42,6 @@ RSpec.describe Favourite, type: :model do
|
|||
end
|
||||
end
|
||||
|
||||
describe '#mentions' do
|
||||
it 'is always empty' do
|
||||
expect(subject.mentions).to be_empty
|
||||
end
|
||||
end
|
||||
|
||||
describe '#thread' do
|
||||
it 'equals the target' do
|
||||
expect(subject.thread).to eq subject.target
|
||||
|
|
|
@ -35,10 +35,4 @@ RSpec.describe Follow, type: :model do
|
|||
expect(subject.target).to eq bob
|
||||
end
|
||||
end
|
||||
|
||||
describe '#mentions' do
|
||||
it 'is empty' do
|
||||
expect(subject.mentions).to be_empty
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -40,31 +40,6 @@ RSpec.describe Status, type: :model do
|
|||
end
|
||||
end
|
||||
|
||||
describe '#mentions' do
|
||||
before do
|
||||
bob # make sure the account exists
|
||||
end
|
||||
|
||||
it 'is empty if the status is self-contained and does not mention anyone' do
|
||||
expect(subject.mentions).to be_empty
|
||||
end
|
||||
|
||||
it 'returns mentioned accounts' do
|
||||
subject.mentioned_accounts.create!(account: bob)
|
||||
expect(subject.mentions).to include bob
|
||||
end
|
||||
|
||||
it 'returns account of the replied-to status' do
|
||||
subject.thread = other
|
||||
expect(subject.mentions).to include bob
|
||||
end
|
||||
|
||||
it 'returns the account of the shared status' do
|
||||
subject.reblog = other
|
||||
expect(subject.mentions).to include bob
|
||||
end
|
||||
end
|
||||
|
||||
describe '#verb' do
|
||||
it 'is always post' do
|
||||
expect(subject.verb).to be :post
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue