nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow to receive reshares without root

Browse source 
closes #7590
This commit is contained in:
Benjamin Neff 2017-08-27 20:48:12 +02:00
parent 163ffdb19b
commit 04035c3eb7
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/reshare.rb
View file

@ -5,7 +5,7 @@
class Reshare < Post class Reshare < Post
belongs_to :root, class_name: "Post", foreign_key: :root_guid, primary_key: :guid, optional: true belongs_to :root, class_name: "Post", foreign_key: :root_guid, primary_key: :guid, optional: true
validate :root_must_be_public validate :root_must_be_public
validates_presence_of :root, :on => :create validates :root, presence: true, on: :create, if: proc {|reshare| reshare.author.local? }
validates :root_guid, uniqueness: {scope: :author_id}, allow_nil: true validates :root_guid, uniqueness: {scope: :author_id}, allow_nil: true
delegate :author, to: :root, prefix: true delegate :author, to: :root, prefix: true

9
spec/models/reshare_spec.rb
View file

@ -4,11 +4,16 @@ describe Reshare, type: :model do
end end
context "validation" do context "validation" do
it "requires root" do it "requires root when the author is local" do
reshare = FactoryGirl.build(:reshare, root: nil) reshare = FactoryGirl.build(:reshare, root: nil, author: alice.person)
expect(reshare).not_to be_valid expect(reshare).not_to be_valid
end end
it "doesn't require root when the author is remote" do
reshare = FactoryGirl.build(:reshare, root: nil, author: remote_raphael)
expect(reshare).to be_valid
end
it "require public root" do it "require public root" do
reshare = FactoryGirl.build(:reshare, root: FactoryGirl.create(:status_message, public: false)) reshare = FactoryGirl.build(:reshare, root: FactoryGirl.create(:status_message, public: false))
expect(reshare).not_to be_valid expect(reshare).not_to be_valid