From: Eugen <eugen@zeonfederated.com>
Date: Fri, 7 Apr 2017 20:28:15 +0000 (+0200)
Subject: Merge pull request #1184 from thoughtbot/extract-proper-status
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=32748c0f718b44bcdb4d19526bc9931c325acb63;p=mastodon.git

Merge pull request #1184 from thoughtbot/extract-proper-status

DRY up reblog vs original status check
---

32748c0f718b44bcdb4d19526bc9931c325acb63
diff --cc spec/models/status_spec.rb
index 675e18418,db244ebe7..000bee0f5
--- a/spec/models/status_spec.rb
+++ b/spec/models/status_spec.rb
@@@ -100,11 -95,17 +100,22 @@@ RSpec.describe Status, type: :model d
    end
  
    describe '#favourites_count' do
 -    pending
 +    it 'is the number of favorites' do
 +      Fabricate(:favourite, account: bob, status: subject)
 +      Fabricate(:favourite, account: alice, status: subject)
 +
 +      expect(subject.favourites_count).to eq 2
 +    end
    end
+ 
+   describe '#proper' do
+     it 'is itself for original statuses' do
+       expect(subject.proper).to eq subject
+     end
+ 
+     it 'is the source status for reblogs' do
+       subject.reblog = other
+       expect(subject.proper).to eq other
+     end
+   end
  end