From 24cafd73a2b644025e9aeaadf4fed46dd3ecea4d Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sat, 18 Nov 2017 00:16:48 +0100 Subject: Lists (#5703) * Add structure for lists * Add list timeline streaming API * Add list APIs, bind list-account relation to follow relation * Add API for adding/removing accounts from lists * Add pagination to lists API * Add pagination to list accounts API * Adjust scopes for new APIs - Creating and modifying lists merely requires "write" scope - Fetching information about lists merely requires "read" scope * Add test for wrong user context on list timeline * Clean up tests --- spec/models/account_moderation_note_spec.rb | 2 +- spec/models/feed_spec.rb | 45 ----------------------------- spec/models/home_feed_spec.rb | 45 +++++++++++++++++++++++++++++ spec/models/list_account_spec.rb | 5 ++++ spec/models/list_spec.rb | 5 ++++ 5 files changed, 56 insertions(+), 46 deletions(-) delete mode 100644 spec/models/feed_spec.rb create mode 100644 spec/models/home_feed_spec.rb create mode 100644 spec/models/list_account_spec.rb create mode 100644 spec/models/list_spec.rb (limited to 'spec/models') diff --git a/spec/models/account_moderation_note_spec.rb b/spec/models/account_moderation_note_spec.rb index c4be8c4af..16983b2e3 100644 --- a/spec/models/account_moderation_note_spec.rb +++ b/spec/models/account_moderation_note_spec.rb @@ -1,5 +1,5 @@ require 'rails_helper' RSpec.describe AccountModerationNote, type: :model do - pending "add some examples to (or delete) #{__FILE__}" + end diff --git a/spec/models/feed_spec.rb b/spec/models/feed_spec.rb deleted file mode 100644 index 8719369db..000000000 --- a/spec/models/feed_spec.rb +++ /dev/null @@ -1,45 +0,0 @@ -require 'rails_helper' - -RSpec.describe Feed, type: :model do - let(:account) { Fabricate(:account) } - - subject { described_class.new(:home, account) } - - describe '#get' do - before do - Fabricate(:status, account: account, id: 1) - Fabricate(:status, account: account, id: 2) - Fabricate(:status, account: account, id: 3) - Fabricate(:status, account: account, id: 10) - end - - context 'when feed is generated' do - before do - Redis.current.zadd( - FeedManager.instance.key(:home, account.id), - [[4, 4], [3, 3], [2, 2], [1, 1]] - ) - end - - it 'gets statuses with ids in the range from redis' do - results = subject.get(3) - - expect(results.map(&:id)).to eq [3, 2] - expect(results.first.attributes.keys).to eq %w(id updated_at) - end - end - - context 'when feed is being generated' do - before do - Redis.current.set("account:#{account.id}:regeneration", true) - end - - it 'gets statuses with ids in the range from database' do - results = subject.get(3) - - expect(results.map(&:id)).to eq [10, 3, 2] - expect(results.first.attributes.keys).to include('id', 'updated_at') - end - end - end -end diff --git a/spec/models/home_feed_spec.rb b/spec/models/home_feed_spec.rb new file mode 100644 index 000000000..3acb997f1 --- /dev/null +++ b/spec/models/home_feed_spec.rb @@ -0,0 +1,45 @@ +require 'rails_helper' + +RSpec.describe HomeFeed, type: :model do + let(:account) { Fabricate(:account) } + + subject { described_class.new(account) } + + describe '#get' do + before do + Fabricate(:status, account: account, id: 1) + Fabricate(:status, account: account, id: 2) + Fabricate(:status, account: account, id: 3) + Fabricate(:status, account: account, id: 10) + end + + context 'when feed is generated' do + before do + Redis.current.zadd( + FeedManager.instance.key(:home, account.id), + [[4, 4], [3, 3], [2, 2], [1, 1]] + ) + end + + it 'gets statuses with ids in the range from redis' do + results = subject.get(3) + + expect(results.map(&:id)).to eq [3, 2] + expect(results.first.attributes.keys).to eq %w(id updated_at) + end + end + + context 'when feed is being generated' do + before do + Redis.current.set("account:#{account.id}:regeneration", true) + end + + it 'gets statuses with ids in the range from database' do + results = subject.get(3) + + expect(results.map(&:id)).to eq [10, 3, 2] + expect(results.first.attributes.keys).to include('id', 'updated_at') + end + end + end +end diff --git a/spec/models/list_account_spec.rb b/spec/models/list_account_spec.rb new file mode 100644 index 000000000..a132e09b0 --- /dev/null +++ b/spec/models/list_account_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe ListAccount, type: :model do + +end diff --git a/spec/models/list_spec.rb b/spec/models/list_spec.rb new file mode 100644 index 000000000..c302482b4 --- /dev/null +++ b/spec/models/list_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe List, type: :model do + +end -- cgit