Also: - Fix locks not being removed when jobs go to the dead job queue - Add UI for managing locks to the Sidekiq dashboard - Remove unused Sidekiq workers Fix #13349
		
			
				
	
	
		
			172 lines
		
	
	
		
			7.1 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			172 lines
		
	
	
		
			7.1 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
| require 'rails_helper'
 | |
| 
 | |
| RSpec.describe ImportService, type: :service do
 | |
|   let!(:account) { Fabricate(:account, locked: false) }
 | |
|   let!(:bob)     { Fabricate(:account, username: 'bob', locked: false) }
 | |
|   let!(:eve)     { Fabricate(:account, username: 'eve', domain: 'example.com', locked: false, protocol: :activitypub, inbox_url: 'https://example.com/inbox') }
 | |
| 
 | |
|   before do
 | |
|     stub_request(:post, "https://example.com/inbox").to_return(status: 200)
 | |
|   end
 | |
| 
 | |
|   context 'import old-style list of muted users' do
 | |
|     subject { ImportService.new }
 | |
| 
 | |
|     let(:csv) { attachment_fixture('mute-imports.txt') }
 | |
| 
 | |
|     describe 'when no accounts are muted' do
 | |
|       let(:import) { Import.create(account: account, type: 'muting', data: csv) }
 | |
|       it 'mutes the listed accounts, including notifications' do
 | |
|         subject.call(import)
 | |
|         expect(account.muting.count).to eq 2
 | |
|         expect(Mute.find_by(account: account, target_account: bob).hide_notifications).to be true
 | |
|       end
 | |
|     end
 | |
| 
 | |
|     describe 'when some accounts are muted and overwrite is not set' do
 | |
|       let(:import) { Import.create(account: account, type: 'muting', data: csv) }
 | |
| 
 | |
|       it 'mutes the listed accounts, including notifications' do
 | |
|         account.mute!(bob, notifications: false)
 | |
|         subject.call(import)
 | |
|         expect(account.muting.count).to eq 2
 | |
|         expect(Mute.find_by(account: account, target_account: bob).hide_notifications).to be true
 | |
|       end
 | |
|     end
 | |
| 
 | |
|     describe 'when some accounts are muted and overwrite is set' do
 | |
|       let(:import) { Import.create(account: account, type: 'muting', data: csv, overwrite: true) }
 | |
| 
 | |
|       it 'mutes the listed accounts, including notifications' do
 | |
|         account.mute!(bob, notifications: false)
 | |
|         subject.call(import)
 | |
|         expect(account.muting.count).to eq 2
 | |
|         expect(Mute.find_by(account: account, target_account: bob).hide_notifications).to be true
 | |
|       end
 | |
|     end
 | |
|   end
 | |
| 
 | |
|   context 'import new-style list of muted users' do
 | |
|     subject { ImportService.new }
 | |
| 
 | |
|     let(:csv) { attachment_fixture('new-mute-imports.txt') }
 | |
| 
 | |
|     describe 'when no accounts are muted' do
 | |
|       let(:import) { Import.create(account: account, type: 'muting', data: csv) }
 | |
|       it 'mutes the listed accounts, respecting notifications' do
 | |
|         subject.call(import)
 | |
|         expect(account.muting.count).to eq 2
 | |
|         expect(Mute.find_by(account: account, target_account: bob).hide_notifications).to be true
 | |
|         expect(Mute.find_by(account: account, target_account: eve).hide_notifications).to be false
 | |
|       end
 | |
|     end
 | |
| 
 | |
|     describe 'when some accounts are muted and overwrite is not set' do
 | |
|       let(:import) { Import.create(account: account, type: 'muting', data: csv) }
 | |
| 
 | |
|       it 'mutes the listed accounts, respecting notifications' do
 | |
|         account.mute!(bob, notifications: true)
 | |
|         subject.call(import)
 | |
|         expect(account.muting.count).to eq 2
 | |
|         expect(Mute.find_by(account: account, target_account: bob).hide_notifications).to be true
 | |
|         expect(Mute.find_by(account: account, target_account: eve).hide_notifications).to be false
 | |
|       end
 | |
|     end
 | |
| 
 | |
|     describe 'when some accounts are muted and overwrite is set' do
 | |
|       let(:import) { Import.create(account: account, type: 'muting', data: csv, overwrite: true) }
 | |
| 
 | |
|       it 'mutes the listed accounts, respecting notifications' do
 | |
|         account.mute!(bob, notifications: true)
 | |
|         subject.call(import)
 | |
|         expect(account.muting.count).to eq 2
 | |
|         expect(Mute.find_by(account: account, target_account: bob).hide_notifications).to be true
 | |
|         expect(Mute.find_by(account: account, target_account: eve).hide_notifications).to be false
 | |
|       end
 | |
|     end
 | |
|   end
 | |
| 
 | |
|   context 'import old-style list of followed users' do
 | |
|     subject { ImportService.new }
 | |
| 
 | |
|     let(:csv) { attachment_fixture('mute-imports.txt') }
 | |
| 
 | |
|     describe 'when no accounts are followed' do
 | |
|       let(:import) { Import.create(account: account, type: 'following', data: csv) }
 | |
|       it 'follows the listed accounts, including boosts' do
 | |
|         subject.call(import)
 | |
|         expect(account.following.count).to eq 1
 | |
|         expect(account.follow_requests.count).to eq 1
 | |
|         expect(Follow.find_by(account: account, target_account: bob).show_reblogs).to be true
 | |
|       end
 | |
|     end
 | |
| 
 | |
|     describe 'when some accounts are already followed and overwrite is not set' do
 | |
|       let(:import) { Import.create(account: account, type: 'following', data: csv) }
 | |
| 
 | |
|       it 'follows the listed accounts, including notifications' do
 | |
|         account.follow!(bob, reblogs: false)
 | |
|         subject.call(import)
 | |
|         expect(account.following.count).to eq 1
 | |
|         expect(account.follow_requests.count).to eq 1
 | |
|         expect(Follow.find_by(account: account, target_account: bob).show_reblogs).to be true
 | |
|       end
 | |
|     end
 | |
| 
 | |
|     describe 'when some accounts are already followed and overwrite is set' do
 | |
|       let(:import) { Import.create(account: account, type: 'following', data: csv, overwrite: true) }
 | |
| 
 | |
|       it 'mutes the listed accounts, including notifications' do
 | |
|         account.follow!(bob, reblogs: false)
 | |
|         subject.call(import)
 | |
|         expect(account.following.count).to eq 1
 | |
|         expect(account.follow_requests.count).to eq 1
 | |
|         expect(Follow.find_by(account: account, target_account: bob).show_reblogs).to be true
 | |
|       end
 | |
|     end
 | |
|   end
 | |
| 
 | |
|   context 'import new-style list of followed users' do
 | |
|     subject { ImportService.new }
 | |
| 
 | |
|     let(:csv) { attachment_fixture('new-following-imports.txt') }
 | |
| 
 | |
|     describe 'when no accounts are followed' do
 | |
|       let(:import) { Import.create(account: account, type: 'following', data: csv) }
 | |
|       it 'follows the listed accounts, respecting boosts' do
 | |
|         subject.call(import)
 | |
|         expect(account.following.count).to eq 1
 | |
|         expect(account.follow_requests.count).to eq 1
 | |
|         expect(Follow.find_by(account: account, target_account: bob).show_reblogs).to be true
 | |
|         expect(FollowRequest.find_by(account: account, target_account: eve).show_reblogs).to be false
 | |
|       end
 | |
|     end
 | |
| 
 | |
|     describe 'when some accounts are already followed and overwrite is not set' do
 | |
|       let(:import) { Import.create(account: account, type: 'following', data: csv) }
 | |
| 
 | |
|       it 'mutes the listed accounts, respecting notifications' do
 | |
|         account.follow!(bob, reblogs: true)
 | |
|         subject.call(import)
 | |
|         expect(account.following.count).to eq 1
 | |
|         expect(account.follow_requests.count).to eq 1
 | |
|         expect(Follow.find_by(account: account, target_account: bob).show_reblogs).to be true
 | |
|         expect(FollowRequest.find_by(account: account, target_account: eve).show_reblogs).to be false
 | |
|       end
 | |
|     end
 | |
| 
 | |
|     describe 'when some accounts are already followed and overwrite is set' do
 | |
|       let(:import) { Import.create(account: account, type: 'following', data: csv, overwrite: true) }
 | |
| 
 | |
|       it 'mutes the listed accounts, respecting notifications' do
 | |
|         account.follow!(bob, reblogs: true)
 | |
|         subject.call(import)
 | |
|         expect(account.following.count).to eq 1
 | |
|         expect(account.follow_requests.count).to eq 1
 | |
|         expect(Follow.find_by(account: account, target_account: bob).show_reblogs).to be true
 | |
|         expect(FollowRequest.find_by(account: account, target_account: eve).show_reblogs).to be false
 | |
|       end
 | |
|     end
 | |
|   end
 | |
| end
 |