gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'parent/main' into upstream-20240716

Browse source
This commit is contained in:
KMY 2024-07-16 09:01:12 +09:00
commit adee1645a3
203 changed files with 1707 additions and 1067 deletions
Download patch file Download diff file Expand all files Collapse all files

82
spec/services/delivery_antenna_service_spec.rb
View file

@ -88,11 +88,11 @@ RSpec.describe DeliveryAntennaService, type: :service do
let!(:antenna) { antenna_with_account(bob, alice) }
let!(:empty_antenna) { antenna_with_account(tom, bob) }
it 'detecting antenna', :sidekiq_inline do
it 'detecting antenna', :inline_jobs do
expect(antenna_feed_of(antenna)).to include status.id
end
it 'not detecting antenna', :sidekiq_inline do
it 'not detecting antenna', :inline_jobs do
expect(antenna_feed_of(empty_antenna)).to_not include status.id
end
end
@ -100,7 +100,7 @@ RSpec.describe DeliveryAntennaService, type: :service do
context 'when blocked' do
let!(:empty_antenna) { antenna_with_account(ohagi, alice) }
it 'not detecting antenna', :sidekiq_inline do
it 'not detecting antenna', :inline_jobs do
expect(antenna_feed_of(empty_antenna)).to_not include status.id
end
end
@ -109,7 +109,7 @@ RSpec.describe DeliveryAntennaService, type: :service do
let(:last_active_at_tom) { Time.now.utc.ago(1.year) }
let!(:empty_antenna) { antenna_with_account(tom, alice) }
it 'not detecting antenna', :sidekiq_inline do
it 'not detecting antenna', :inline_jobs do
expect(antenna_feed_of(empty_antenna)).to_not include status.id
end
end
@ -119,11 +119,11 @@ RSpec.describe DeliveryAntennaService, type: :service do
let!(:antenna) { antenna_with_domain(bob, 'fast.example.com') }
let!(:empty_antenna) { antenna_with_domain(tom, 'ohagi.example.com') }
it 'detecting antenna', :sidekiq_inline do
it 'detecting antenna', :inline_jobs do
expect(antenna_feed_of(antenna)).to include status.id
end
it 'not detecting antenna', :sidekiq_inline do
it 'not detecting antenna', :inline_jobs do
expect(antenna_feed_of(empty_antenna)).to_not include status.id
end
end
@ -133,18 +133,18 @@ RSpec.describe DeliveryAntennaService, type: :service do
let!(:antenna) { antenna_with_domain(bob, 'cb6e6126.ngrok.io') }
let!(:empty_antenna) { antenna_with_domain(tom, 'ohagi.example.com') }
it 'detecting antenna', :sidekiq_inline do
it 'detecting antenna', :inline_jobs do
expect(antenna_feed_of(antenna)).to include status.id
end
it 'not detecting antenna', :sidekiq_inline do
it 'not detecting antenna', :inline_jobs do
expect(antenna_feed_of(empty_antenna)).to_not include status.id
end
context 'when local timeline is disabled' do
let(:ltl_enabled) { false }
it 'not detecting antenna', :sidekiq_inline do
it 'not detecting antenna', :inline_jobs do
expect(antenna_feed_of(antenna)).to_not include status.id
expect(antenna_feed_of(empty_antenna)).to_not include status.id
end
@ -155,11 +155,11 @@ RSpec.describe DeliveryAntennaService, type: :service do
let!(:antenna) { antenna_with_tag(bob, 'hoge') }
let!(:empty_antenna) { antenna_with_tag(tom, 'hog') }
it 'detecting antenna', :sidekiq_inline do
it 'detecting antenna', :inline_jobs do
expect(antenna_feed_of(antenna)).to include status.id
end
it 'not detecting antenna', :sidekiq_inline do
it 'not detecting antenna', :inline_jobs do
expect(antenna_feed_of(empty_antenna)).to_not include status.id
end
end
@ -168,11 +168,11 @@ RSpec.describe DeliveryAntennaService, type: :service do
let!(:antenna) { antenna_with_keyword(bob, 'body') }
let!(:empty_antenna) { antenna_with_keyword(tom, 'anime') }
it 'detecting antenna', :sidekiq_inline do
it 'detecting antenna', :inline_jobs do
expect(antenna_feed_of(antenna)).to include status.id
end
it 'not detecting antenna', :sidekiq_inline do
it 'not detecting antenna', :inline_jobs do
expect(antenna_feed_of(empty_antenna)).to_not include status.id
end
end
@ -182,11 +182,11 @@ RSpec.describe DeliveryAntennaService, type: :service do
let!(:antenna) { antenna_with_keyword(bob, 'some') }
let!(:empty_antenna) { antenna_with_keyword(tom, 'anime') }
it 'detecting antenna', :sidekiq_inline do
it 'detecting antenna', :inline_jobs do
expect(antenna_feed_of(antenna)).to include status.id
end
it 'not detecting antenna', :sidekiq_inline do
it 'not detecting antenna', :inline_jobs do
expect(antenna_feed_of(empty_antenna)).to_not include status.id
end
end
@ -196,11 +196,11 @@ RSpec.describe DeliveryAntennaService, type: :service do
let!(:antenna) { antenna_with_keyword(bob, 'body') }
let!(:empty_antenna) { antenna_with_keyword(tom, 'anime') }
it 'detecting antenna', :sidekiq_inline do
it 'detecting antenna', :inline_jobs do
expect(antenna_feed_of(antenna)).to include status.id
end
it 'not detecting antenna', :sidekiq_inline do
it 'not detecting antenna', :inline_jobs do
expect(antenna_feed_of(empty_antenna)).to_not include status.id
end
end
@ -210,11 +210,11 @@ RSpec.describe DeliveryAntennaService, type: :service do
let!(:antenna) { antenna_with_domain(bob, 'fast.example.com', exclude_accounts: [tom.id]) }
let!(:empty_antenna) { antenna_with_domain(tom, 'fast.example.com', exclude_accounts: [alice.id]) }
it 'detecting antenna', :sidekiq_inline do
it 'detecting antenna', :inline_jobs do
expect(antenna_feed_of(antenna)).to include status.id
end
it 'not detecting antenna', :sidekiq_inline do
it 'not detecting antenna', :inline_jobs do
expect(antenna_feed_of(empty_antenna)).to_not include status.id
end
end
@ -224,11 +224,11 @@ RSpec.describe DeliveryAntennaService, type: :service do
let!(:antenna) { antenna_with_domain(bob, 'fast.example.com', exclude_keywords: ['aaa']) }
let!(:empty_antenna) { antenna_with_domain(tom, 'fast.example.com', exclude_keywords: ['body']) }
it 'detecting antenna', :sidekiq_inline do
it 'detecting antenna', :inline_jobs do
expect(antenna_feed_of(antenna)).to include status.id
end
it 'not detecting antenna', :sidekiq_inline do
it 'not detecting antenna', :inline_jobs do
expect(antenna_feed_of(empty_antenna)).to_not include status.id
end
end
@ -238,11 +238,11 @@ RSpec.describe DeliveryAntennaService, type: :service do
let!(:antenna) { antenna_with_domain(bob, 'fast.example.com') }
let!(:empty_antenna) { antenna_with_domain(tom, 'fast.example.com', exclude_tags: [Tag.find_or_create_by_names(['hoge']).first.id]) }
it 'detecting antenna', :sidekiq_inline do
it 'detecting antenna', :inline_jobs do
expect(antenna_feed_of(antenna)).to include status.id
end
it 'not detecting antenna', :sidekiq_inline do
it 'not detecting antenna', :inline_jobs do
expect(antenna_feed_of(empty_antenna)).to_not include status.id
end
end
@ -252,11 +252,11 @@ RSpec.describe DeliveryAntennaService, type: :service do
let!(:antenna) { antenna_with_keyword(bob, 'body', exclude_domains: ['ohagi.example.com']) }
let!(:empty_antenna) { antenna_with_keyword(tom, 'body', exclude_domains: ['fast.example.com']) }
it 'detecting antenna', :sidekiq_inline do
it 'detecting antenna', :inline_jobs do
expect(antenna_feed_of(antenna)).to include status.id
end
it 'not detecting antenna', :sidekiq_inline do
it 'not detecting antenna', :inline_jobs do
expect(antenna_feed_of(empty_antenna)).to_not include status.id
end
end
@ -265,7 +265,7 @@ RSpec.describe DeliveryAntennaService, type: :service do
let!(:antenna) { antenna_with_keyword(bob, 'body') }
let!(:empty_antenna) { antenna_with_keyword(tom, 'body') }
it 'detecting antenna', :sidekiq_inline do
it 'detecting antenna', :inline_jobs do
expect(antenna_feed_of(antenna)).to include status.id
expect(antenna_feed_of(empty_antenna)).to include status.id
end
@ -276,7 +276,7 @@ RSpec.describe DeliveryAntennaService, type: :service do
let!(:empty_antenna) { antenna_with_keyword(tom, 'body') }
[1, 2, 3, 4, 5].each do |_|
it 'detecting antenna', :sidekiq_inline do
it 'detecting antenna', :inline_jobs do
expect(antenna_feed_of(antenna)).to include status.id
expect(antenna_feed_of(empty_antenna)).to include status.id
end
@ -287,7 +287,7 @@ RSpec.describe DeliveryAntennaService, type: :service do
let!(:antenna) { antenna_with_keyword(bob, 'body', insert_feeds: true) }
let!(:empty_antenna) { antenna_with_keyword(tom, 'body', insert_feeds: true) }
it 'detecting antenna', :sidekiq_inline do
it 'detecting antenna', :inline_jobs do
expect(antenna_feed_of(antenna)).to include status.id
expect(home_feed_of(bob)).to include status.id
expect(antenna_feed_of(empty_antenna)).to include status.id
@ -299,7 +299,7 @@ RSpec.describe DeliveryAntennaService, type: :service do
let!(:antenna) { antenna_with_keyword(bob, 'body', insert_feeds: true, list: list(bob)) }
let!(:empty_antenna) { antenna_with_keyword(tom, 'body', insert_feeds: true, list: list(tom)) }
it 'detecting antenna', :sidekiq_inline do
it 'detecting antenna', :inline_jobs do
expect(antenna_feed_of(antenna)).to include status.id
expect(list_feed_of(antenna.list)).to include status.id
expect(antenna_feed_of(empty_antenna)).to include status.id
@ -313,11 +313,11 @@ RSpec.describe DeliveryAntennaService, type: :service do
let(:visibility) { :unlisted }
context 'when public searchability' do
it 'detecting antenna', :sidekiq_inline do
it 'detecting antenna', :inline_jobs do
expect(antenna_feed_of(antenna)).to include status.id
end
it 'not detecting antenna', :sidekiq_inline do
it 'not detecting antenna', :inline_jobs do
expect(antenna_feed_of(empty_antenna)).to_not include status.id
end
end
@ -325,11 +325,11 @@ RSpec.describe DeliveryAntennaService, type: :service do
context 'when public_unlisted searchability' do
let(:searchability) { :public_unlisted }
it 'detecting antenna', :sidekiq_inline do
it 'detecting antenna', :inline_jobs do
expect(antenna_feed_of(antenna)).to include status.id
end
it 'not detecting antenna', :sidekiq_inline do
it 'not detecting antenna', :inline_jobs do
expect(antenna_feed_of(empty_antenna)).to_not include status.id
end
end
@ -337,7 +337,7 @@ RSpec.describe DeliveryAntennaService, type: :service do
context 'when private searchability' do
let(:searchability) { :private }
it 'not detecting antenna', :sidekiq_inline do
it 'not detecting antenna', :inline_jobs do
expect(antenna_feed_of(antenna)).to_not include status.id
expect(antenna_feed_of(empty_antenna)).to_not include status.id
end
@ -350,7 +350,7 @@ RSpec.describe DeliveryAntennaService, type: :service do
let(:visibility) { :unlisted }
context 'when public searchability' do
it 'detecting antenna', :sidekiq_inline do
it 'detecting antenna', :inline_jobs do
expect(antenna_feed_of(antenna)).to include status.id
expect(antenna_feed_of(empty_antenna)).to include status.id
end
@ -359,7 +359,7 @@ RSpec.describe DeliveryAntennaService, type: :service do
context 'when public_unlisted searchability' do
let(:searchability) { :public_unlisted }
it 'detecting antenna', :sidekiq_inline do
it 'detecting antenna', :inline_jobs do
expect(antenna_feed_of(antenna)).to include status.id
expect(antenna_feed_of(empty_antenna)).to include status.id
end
@ -368,7 +368,7 @@ RSpec.describe DeliveryAntennaService, type: :service do
context 'when private searchability' do
let(:searchability) { :private }
it 'detecting antenna', :sidekiq_inline do
it 'detecting antenna', :inline_jobs do
expect(antenna_feed_of(antenna)).to include status.id
expect(antenna_feed_of(empty_antenna)).to include status.id
end
@ -379,7 +379,7 @@ RSpec.describe DeliveryAntennaService, type: :service do
let(:mode) { :stl }
let!(:antenna) { antenna_with_keyword(bob, 'anime', stl: true) }
it 'detecting antenna', :sidekiq_inline do
it 'detecting antenna', :inline_jobs do
expect(antenna_feed_of(antenna)).to include status.id
end
end
@ -388,7 +388,7 @@ RSpec.describe DeliveryAntennaService, type: :service do
let(:mode) { :ltl }
let!(:antenna) { antenna_with_keyword(bob, 'anime', ltl: true) }
it 'detecting antenna', :sidekiq_inline do
it 'detecting antenna', :inline_jobs do
expect(antenna_feed_of(antenna)).to include status.id
end
end
@ -397,7 +397,7 @@ RSpec.describe DeliveryAntennaService, type: :service do
let(:mode) { :stl }
let!(:antenna) { antenna_with_keyword(bob, 'anime', exclude_keywords: ['body'], stl: true) }
it 'detecting antenna', :sidekiq_inline do
it 'detecting antenna', :inline_jobs do
expect(antenna_feed_of(antenna)).to include status.id
end
end
@ -406,7 +406,7 @@ RSpec.describe DeliveryAntennaService, type: :service do
let(:mode) { :ltl }
let!(:antenna) { antenna_with_keyword(bob, 'anime', exclude_keywords: ['body'], ltl: true) }
it 'detecting antenna', :sidekiq_inline do
it 'detecting antenna', :inline_jobs do
expect(antenna_feed_of(antenna)).to include status.id
end
end