|
|
@ -297,7 +297,7 @@ RSpec.describe FeedManager do
|
|
|
|
status = Fabricate(:status, reblog: reblog)
|
|
|
|
status = Fabricate(:status, reblog: reblog)
|
|
|
|
FeedManager.instance.push_to_home(account, status)
|
|
|
|
FeedManager.instance.push_to_home(account, status)
|
|
|
|
|
|
|
|
|
|
|
|
expect(FeedManager.instance.push_to_home(account, reblog)).to eq false
|
|
|
|
expect(FeedManager.instance.push_to_home(account, reblog)).to be false
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
@ -322,7 +322,7 @@ RSpec.describe FeedManager do
|
|
|
|
status = Fabricate(:status, reblog: reblog)
|
|
|
|
status = Fabricate(:status, reblog: reblog)
|
|
|
|
FeedManager.instance.push_to_list(list, status)
|
|
|
|
FeedManager.instance.push_to_list(list, status)
|
|
|
|
|
|
|
|
|
|
|
|
expect(FeedManager.instance.push_to_list(list, reblog)).to eq false
|
|
|
|
expect(FeedManager.instance.push_to_list(list, reblog)).to be false
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
context 'when replies policy is set to no replies' do
|
|
|
|
context 'when replies policy is set to no replies' do
|
|
|
@ -332,19 +332,19 @@ RSpec.describe FeedManager do
|
|
|
|
|
|
|
|
|
|
|
|
it 'pushes statuses that are not replies' do
|
|
|
|
it 'pushes statuses that are not replies' do
|
|
|
|
status = Fabricate(:status, text: 'Hello world', account: bob)
|
|
|
|
status = Fabricate(:status, text: 'Hello world', account: bob)
|
|
|
|
expect(FeedManager.instance.push_to_list(list, status)).to eq true
|
|
|
|
expect(FeedManager.instance.push_to_list(list, status)).to be true
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
it 'pushes statuses that are replies to list owner' do
|
|
|
|
it 'pushes statuses that are replies to list owner' do
|
|
|
|
status = Fabricate(:status, text: 'Hello world', account: owner)
|
|
|
|
status = Fabricate(:status, text: 'Hello world', account: owner)
|
|
|
|
reply = Fabricate(:status, text: 'Nay', thread: status, account: bob)
|
|
|
|
reply = Fabricate(:status, text: 'Nay', thread: status, account: bob)
|
|
|
|
expect(FeedManager.instance.push_to_list(list, reply)).to eq true
|
|
|
|
expect(FeedManager.instance.push_to_list(list, reply)).to be true
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
it 'does not push replies to another member of the list' do
|
|
|
|
it 'does not push replies to another member of the list' do
|
|
|
|
status = Fabricate(:status, text: 'Hello world', account: alice)
|
|
|
|
status = Fabricate(:status, text: 'Hello world', account: alice)
|
|
|
|
reply = Fabricate(:status, text: 'Nay', thread: status, account: bob)
|
|
|
|
reply = Fabricate(:status, text: 'Nay', thread: status, account: bob)
|
|
|
|
expect(FeedManager.instance.push_to_list(list, reply)).to eq false
|
|
|
|
expect(FeedManager.instance.push_to_list(list, reply)).to be false
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
@ -355,25 +355,25 @@ RSpec.describe FeedManager do
|
|
|
|
|
|
|
|
|
|
|
|
it 'pushes statuses that are not replies' do
|
|
|
|
it 'pushes statuses that are not replies' do
|
|
|
|
status = Fabricate(:status, text: 'Hello world', account: bob)
|
|
|
|
status = Fabricate(:status, text: 'Hello world', account: bob)
|
|
|
|
expect(FeedManager.instance.push_to_list(list, status)).to eq true
|
|
|
|
expect(FeedManager.instance.push_to_list(list, status)).to be true
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
it 'pushes statuses that are replies to list owner' do
|
|
|
|
it 'pushes statuses that are replies to list owner' do
|
|
|
|
status = Fabricate(:status, text: 'Hello world', account: owner)
|
|
|
|
status = Fabricate(:status, text: 'Hello world', account: owner)
|
|
|
|
reply = Fabricate(:status, text: 'Nay', thread: status, account: bob)
|
|
|
|
reply = Fabricate(:status, text: 'Nay', thread: status, account: bob)
|
|
|
|
expect(FeedManager.instance.push_to_list(list, reply)).to eq true
|
|
|
|
expect(FeedManager.instance.push_to_list(list, reply)).to be true
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
it 'pushes replies to another member of the list' do
|
|
|
|
it 'pushes replies to another member of the list' do
|
|
|
|
status = Fabricate(:status, text: 'Hello world', account: alice)
|
|
|
|
status = Fabricate(:status, text: 'Hello world', account: alice)
|
|
|
|
reply = Fabricate(:status, text: 'Nay', thread: status, account: bob)
|
|
|
|
reply = Fabricate(:status, text: 'Nay', thread: status, account: bob)
|
|
|
|
expect(FeedManager.instance.push_to_list(list, reply)).to eq true
|
|
|
|
expect(FeedManager.instance.push_to_list(list, reply)).to be true
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
it 'does not push replies to someone not a member of the list' do
|
|
|
|
it 'does not push replies to someone not a member of the list' do
|
|
|
|
status = Fabricate(:status, text: 'Hello world', account: eve)
|
|
|
|
status = Fabricate(:status, text: 'Hello world', account: eve)
|
|
|
|
reply = Fabricate(:status, text: 'Nay', thread: status, account: bob)
|
|
|
|
reply = Fabricate(:status, text: 'Nay', thread: status, account: bob)
|
|
|
|
expect(FeedManager.instance.push_to_list(list, reply)).to eq false
|
|
|
|
expect(FeedManager.instance.push_to_list(list, reply)).to be false
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
@ -384,25 +384,25 @@ RSpec.describe FeedManager do
|
|
|
|
|
|
|
|
|
|
|
|
it 'pushes statuses that are not replies' do
|
|
|
|
it 'pushes statuses that are not replies' do
|
|
|
|
status = Fabricate(:status, text: 'Hello world', account: bob)
|
|
|
|
status = Fabricate(:status, text: 'Hello world', account: bob)
|
|
|
|
expect(FeedManager.instance.push_to_list(list, status)).to eq true
|
|
|
|
expect(FeedManager.instance.push_to_list(list, status)).to be true
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
it 'pushes statuses that are replies to list owner' do
|
|
|
|
it 'pushes statuses that are replies to list owner' do
|
|
|
|
status = Fabricate(:status, text: 'Hello world', account: owner)
|
|
|
|
status = Fabricate(:status, text: 'Hello world', account: owner)
|
|
|
|
reply = Fabricate(:status, text: 'Nay', thread: status, account: bob)
|
|
|
|
reply = Fabricate(:status, text: 'Nay', thread: status, account: bob)
|
|
|
|
expect(FeedManager.instance.push_to_list(list, reply)).to eq true
|
|
|
|
expect(FeedManager.instance.push_to_list(list, reply)).to be true
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
it 'pushes replies to another member of the list' do
|
|
|
|
it 'pushes replies to another member of the list' do
|
|
|
|
status = Fabricate(:status, text: 'Hello world', account: alice)
|
|
|
|
status = Fabricate(:status, text: 'Hello world', account: alice)
|
|
|
|
reply = Fabricate(:status, text: 'Nay', thread: status, account: bob)
|
|
|
|
reply = Fabricate(:status, text: 'Nay', thread: status, account: bob)
|
|
|
|
expect(FeedManager.instance.push_to_list(list, reply)).to eq true
|
|
|
|
expect(FeedManager.instance.push_to_list(list, reply)).to be true
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
it 'pushes replies to someone not a member of the list' do
|
|
|
|
it 'pushes replies to someone not a member of the list' do
|
|
|
|
status = Fabricate(:status, text: 'Hello world', account: eve)
|
|
|
|
status = Fabricate(:status, text: 'Hello world', account: eve)
|
|
|
|
reply = Fabricate(:status, text: 'Nay', thread: status, account: bob)
|
|
|
|
reply = Fabricate(:status, text: 'Nay', thread: status, account: bob)
|
|
|
|
expect(FeedManager.instance.push_to_list(list, reply)).to eq true
|
|
|
|
expect(FeedManager.instance.push_to_list(list, reply)).to be true
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
@ -416,7 +416,7 @@ RSpec.describe FeedManager do
|
|
|
|
|
|
|
|
|
|
|
|
FeedManager.instance.merge_into_home(account, reblog.account)
|
|
|
|
FeedManager.instance.merge_into_home(account, reblog.account)
|
|
|
|
|
|
|
|
|
|
|
|
expect(redis.zscore('feed:home:0', reblog.id)).to eq nil
|
|
|
|
expect(redis.zscore('feed:home:0', reblog.id)).to be_nil
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|