* Change account and user fabricators to simplify and improve tests - `Fabricate(:account)` implicitly fabricates an associated `user` if no `domain` attribute is given (an account with `domain: nil` is considered a local account, but no user record was created), unless `user: nil` is passed - `Fabricate(:account, user: Fabricate(:user))` should still be possible but is discouraged. * Fix and refactor tests - avoid passing unneeded attributes to `Fabricate(:user)` or `Fabricate(:account)` - avoid embedding `Fabricate(:user)` into a `Fabricate(:account)` or the other way around - prefer `Fabricate(:user, account_attributes: …)` to `Fabricate(:user, account: Fabricate(:account, …)` - also, some tests were using remote accounts with local user records, which is not representative of production code.
		
			
				
	
	
		
			38 lines
		
	
	
	
		
			1.1 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
			
		
		
	
	
			38 lines
		
	
	
	
		
			1.1 KiB
		
	
	
	
		
			Ruby
		
	
	
	
	
	
| require 'rails_helper'
 | |
| 
 | |
| RSpec.describe UpdateAccountService, type: :service do
 | |
|   subject { UpdateAccountService.new }
 | |
| 
 | |
|   describe 'switching form locked to unlocked accounts' do
 | |
|     let(:account) { Fabricate(:account, locked: true) }
 | |
|     let(:alice)   { Fabricate(:account) }
 | |
|     let(:bob)     { Fabricate(:account) }
 | |
|     let(:eve)     { Fabricate(:account) }
 | |
| 
 | |
|     before do
 | |
|       bob.touch(:silenced_at)
 | |
|       account.mute!(eve)
 | |
| 
 | |
|       FollowService.new.call(alice, account)
 | |
|       FollowService.new.call(bob, account)
 | |
|       FollowService.new.call(eve, account)
 | |
| 
 | |
|       subject.call(account, { locked: false })
 | |
|     end
 | |
| 
 | |
|     it 'auto-accepts pending follow requests' do
 | |
|       expect(alice.following?(account)).to be true
 | |
|       expect(alice.requested?(account)).to be false
 | |
|     end
 | |
| 
 | |
|     it 'does not auto-accept pending follow requests from silenced users' do
 | |
|       expect(bob.following?(account)).to be false
 | |
|       expect(bob.requested?(account)).to be true
 | |
|     end
 | |
| 
 | |
|     it 'auto-accepts pending follow requests from muted users so as to not leak mute' do
 | |
|       expect(eve.following?(account)).to be true
 | |
|       expect(eve.requested?(account)).to be false
 | |
|     end
 | |
|   end
 | |
| end
 |