Direct messages column (#4514)
* Added a timeline for Direct statuses * Lists all Direct statuses you've sent and received * Displayed in Getting Started * Streaming server support for direct TL * Changes to match other timelines in 2.0
This commit is contained in:
		
				
					committed by
					
						
						Eugen Rochko
					
				
			
			
				
	
			
			
			
						parent
						
							aedfea3554
						
					
				
				
					commit
					156b916caf
				
			@@ -304,6 +304,55 @@ RSpec.describe Status, type: :model do
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  describe '.as_direct_timeline' do
 | 
			
		||||
    let(:account) { Fabricate(:account) }
 | 
			
		||||
    let(:followed) { Fabricate(:account) }
 | 
			
		||||
    let(:not_followed) { Fabricate(:account) }
 | 
			
		||||
 | 
			
		||||
    before do
 | 
			
		||||
      Fabricate(:follow, account: account, target_account: followed)
 | 
			
		||||
 | 
			
		||||
      @self_public_status = Fabricate(:status, account: account, visibility: :public)
 | 
			
		||||
      @self_direct_status = Fabricate(:status, account: account, visibility: :direct)
 | 
			
		||||
      @followed_public_status = Fabricate(:status, account: followed, visibility: :public)
 | 
			
		||||
      @followed_direct_status = Fabricate(:status, account: followed, visibility: :direct)
 | 
			
		||||
      @not_followed_direct_status = Fabricate(:status, account: not_followed, visibility: :direct)
 | 
			
		||||
 | 
			
		||||
      @results = Status.as_direct_timeline(account)
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'does not include public statuses from self' do
 | 
			
		||||
      expect(@results).to_not include(@self_public_status)
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'includes direct statuses from self' do
 | 
			
		||||
      expect(@results).to include(@self_direct_status)
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'does not include public statuses from followed' do
 | 
			
		||||
      expect(@results).to_not include(@followed_public_status)
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'includes direct statuses mentioning recipient from followed' do
 | 
			
		||||
      Fabricate(:mention, account: account, status: @followed_direct_status)
 | 
			
		||||
      expect(@results).to include(@followed_direct_status)
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'does not include direct statuses not mentioning recipient from followed' do
 | 
			
		||||
      expect(@results).to_not include(@followed_direct_status)
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'includes direct statuses mentioning recipient from non-followed' do
 | 
			
		||||
      Fabricate(:mention, account: account, status: @not_followed_direct_status)
 | 
			
		||||
      expect(@results).to include(@not_followed_direct_status)
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'does not include direct statuses not mentioning recipient from non-followed' do
 | 
			
		||||
      expect(@results).to_not include(@not_followed_direct_status)
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  describe '.as_public_timeline' do
 | 
			
		||||
    it 'only includes statuses with public visibility' do
 | 
			
		||||
      public_status = Fabricate(:status, visibility: :public)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user