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

DRY up reblog vs original status check

diff --cc spec/models/status_spec.rb
index 675e184181f47e7f18d3855b0933bea2c36ae094,db244ebe7de89325fa543ab8e7271d4a7f8ead87..000bee0f50b3f8eb1b11e56ffa7f41113650e1e5
--- 1/spec/models/status_spec.rb
--- 2/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