From 6ef1545fd0bd8e839a454bcc85b6fc181919104f Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Tue, 29 Mar 2016 03:45:32 +0200 Subject: [PATCH] cleanup parent_type for relayables --- lib/diaspora_federation/entities/comment.rb | 6 ------ lib/diaspora_federation/entities/message.rb | 6 ------ lib/diaspora_federation/entities/poll_participation.rb | 6 ------ spec/lib/diaspora_federation/entities/comment_spec.rb | 6 ------ spec/lib/diaspora_federation/entities/like_spec.rb | 6 ------ spec/lib/diaspora_federation/entities/message_spec.rb | 6 ------ spec/lib/diaspora_federation/entities/participation_spec.rb | 6 ------ .../diaspora_federation/entities/poll_participation_spec.rb | 6 ------ 8 files changed, 48 deletions(-) diff --git a/lib/diaspora_federation/entities/comment.rb b/lib/diaspora_federation/entities/comment.rb index dfd91b6..0c40dfc 100644 --- a/lib/diaspora_federation/entities/comment.rb +++ b/lib/diaspora_federation/entities/comment.rb @@ -21,12 +21,6 @@ module DiasporaFederation # comment entity creation time # @return [Time] creation time property :created_at, default: -> { Time.now.utc } - - # The {Comment} parent is a Post - # @return [String] parent type - def parent_type - PARENT_TYPE - end end end end diff --git a/lib/diaspora_federation/entities/message.rb b/lib/diaspora_federation/entities/message.rb index 892e37e..11332e7 100644 --- a/lib/diaspora_federation/entities/message.rb +++ b/lib/diaspora_federation/entities/message.rb @@ -28,12 +28,6 @@ module DiasporaFederation # @see Conversation#guid # @return [String] conversation guid property :conversation_guid - - # The {Message} parent is a {Conversation} - # @return [String] parent type - def parent_type - PARENT_TYPE - end end end end diff --git a/lib/diaspora_federation/entities/poll_participation.rb b/lib/diaspora_federation/entities/poll_participation.rb index 408181f..3d6d5fc 100644 --- a/lib/diaspora_federation/entities/poll_participation.rb +++ b/lib/diaspora_federation/entities/poll_participation.rb @@ -18,12 +18,6 @@ module DiasporaFederation # @see PollAnswer#guid # @return [String] poll answer guid property :poll_answer_guid - - # The {PollParticipation} parent is a {Poll} - # @return [String] parent type - def parent_type - PARENT_TYPE - end end end end diff --git a/spec/lib/diaspora_federation/entities/comment_spec.rb b/spec/lib/diaspora_federation/entities/comment_spec.rb index 37806cb..0ac567d 100644 --- a/spec/lib/diaspora_federation/entities/comment_spec.rb +++ b/spec/lib/diaspora_federation/entities/comment_spec.rb @@ -43,11 +43,5 @@ XML expect(parsed_comment.created_at).to eq(created_at.to_s) end end - - describe "#parent_type" do - it "returns \"Post\" as parent type" do - expect(described_class.new(data).parent_type).to eq("Post") - end - end end end diff --git a/spec/lib/diaspora_federation/entities/like_spec.rb b/spec/lib/diaspora_federation/entities/like_spec.rb index bbce006..43e5853 100644 --- a/spec/lib/diaspora_federation/entities/like_spec.rb +++ b/spec/lib/diaspora_federation/entities/like_spec.rb @@ -31,11 +31,5 @@ XML it_behaves_like "an XML Entity" it_behaves_like "a relayable Entity" - - describe "#parent_type" do - it "returns data[:parent_type] as parent type" do - expect(described_class.new(data).parent_type).to eq(data[:parent_type]) - end - end end end diff --git a/spec/lib/diaspora_federation/entities/message_spec.rb b/spec/lib/diaspora_federation/entities/message_spec.rb index 48b710c..8ba0926 100644 --- a/spec/lib/diaspora_federation/entities/message_spec.rb +++ b/spec/lib/diaspora_federation/entities/message_spec.rb @@ -27,11 +27,5 @@ XML it_behaves_like "an XML Entity" it_behaves_like "a relayable Entity" - - describe "#parent_type" do - it "returns \"Conversation\" as parent type" do - expect(described_class.new(data).parent_type).to eq("Conversation") - end - end end end diff --git a/spec/lib/diaspora_federation/entities/participation_spec.rb b/spec/lib/diaspora_federation/entities/participation_spec.rb index a47cf67..b26516e 100644 --- a/spec/lib/diaspora_federation/entities/participation_spec.rb +++ b/spec/lib/diaspora_federation/entities/participation_spec.rb @@ -30,11 +30,5 @@ XML it_behaves_like "an XML Entity" it_behaves_like "a relayable Entity" - - describe "#parent_type" do - it "returns data[:parent_type] as parent type" do - expect(described_class.new(data).parent_type).to eq(data[:parent_type]) - end - end end end diff --git a/spec/lib/diaspora_federation/entities/poll_participation_spec.rb b/spec/lib/diaspora_federation/entities/poll_participation_spec.rb index e886475..e45b37c 100644 --- a/spec/lib/diaspora_federation/entities/poll_participation_spec.rb +++ b/spec/lib/diaspora_federation/entities/poll_participation_spec.rb @@ -29,11 +29,5 @@ XML it_behaves_like "an XML Entity" it_behaves_like "a relayable Entity" - - describe "#parent_type" do - it "returns \"Poll\" as parent type" do - expect(described_class.new(data).parent_type).to eq("Poll") - end - end end end