forked from cybrespace/mastodon
		
	Reports spec for media attachments, clean up method (#2660)
* Add coverage for Report#media_attachments * Direct query on media attachment
This commit is contained in:
		
							parent
							
								
									b83bc0ae64
								
							
						
					
					
						commit
						5259319cf5
					
				
					 2 changed files with 12 additions and 5 deletions
				
			
		| 
						 | 
				
			
			@ -13,10 +13,6 @@ class Report < ApplicationRecord
 | 
			
		|||
  end
 | 
			
		||||
 | 
			
		||||
  def media_attachments
 | 
			
		||||
    media_attachments = []
 | 
			
		||||
    statuses.each do |s|
 | 
			
		||||
      media_attachments.concat s.media_attachments
 | 
			
		||||
    end
 | 
			
		||||
    media_attachments
 | 
			
		||||
    MediaAttachment.where(status_id: status_ids)
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -10,4 +10,15 @@ describe Report do
 | 
			
		|||
      expect(report.statuses).to eq [status]
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  describe 'media_attachments' do
 | 
			
		||||
    it 'returns media attachments from statuses' do
 | 
			
		||||
      status = Fabricate(:status)
 | 
			
		||||
      media_attachment = Fabricate(:media_attachment, status: status)
 | 
			
		||||
      _other_media_attachment = Fabricate(:media_attachment)
 | 
			
		||||
      report = Fabricate(:report, status_ids: [status.id])
 | 
			
		||||
 | 
			
		||||
      expect(report.media_attachments).to eq [media_attachment]
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		
		Reference in a new issue