diff --git a/spec/factories.rb b/spec/factories.rb
index d2830a7..8c188cd 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -173,6 +173,7 @@ FactoryGirl.define do
diaspora_id
public(true)
created_at { DateTime.now.utc }
+ provider_display_name { "the testsuite" }
end
factory :retraction_entity, class: DiasporaFederation::Entities::Retraction do
diff --git a/spec/lib/diaspora_federation/entities/account_deletion_spec.rb b/spec/lib/diaspora_federation/entities/account_deletion_spec.rb
index af9aa39..5b3a4a0 100644
--- a/spec/lib/diaspora_federation/entities/account_deletion_spec.rb
+++ b/spec/lib/diaspora_federation/entities/account_deletion_spec.rb
@@ -1,11 +1,11 @@
module DiasporaFederation
describe Entities::AccountDeletion do
- let(:data) { {diaspora_id: "me@goes.byebye.tld"} }
+ let(:data) { FactoryGirl.attributes_for(:account_deletion_entity) }
let(:xml) {
<<-XML
- me@goes.byebye.tld
+ #{data[:diaspora_id]}
XML
}
diff --git a/spec/lib/diaspora_federation/entities/comment_spec.rb b/spec/lib/diaspora_federation/entities/comment_spec.rb
index 06e024e..525c0c6 100644
--- a/spec/lib/diaspora_federation/entities/comment_spec.rb
+++ b/spec/lib/diaspora_federation/entities/comment_spec.rb
@@ -1,23 +1,16 @@
module DiasporaFederation
describe Entities::Comment do
- let(:data) {
- {guid: "0123456789abcdef",
- parent_guid: "fedcba9876543210",
- parent_author_signature: "BBBBBB==",
- author_signature: "AAAAAA==",
- text: "my comment text",
- diaspora_id: "bob@pod.somedomain.tld"}
- }
+ let(:data) { FactoryGirl.attributes_for(:comment_entity) }
let(:xml) {
<<-XML
- 0123456789abcdef
- fedcba9876543210
- BBBBBB==
- AAAAAA==
- my comment text
- bob@pod.somedomain.tld
+ #{data[:guid]}
+ #{data[:parent_guid]}
+ #{data[:parent_author_signature]}
+ #{data[:author_signature]}
+ #{data[:text]}
+ #{data[:diaspora_id]}
XML
}
diff --git a/spec/lib/diaspora_federation/entities/like_spec.rb b/spec/lib/diaspora_federation/entities/like_spec.rb
index a926e71..bc24952 100644
--- a/spec/lib/diaspora_federation/entities/like_spec.rb
+++ b/spec/lib/diaspora_federation/entities/like_spec.rb
@@ -1,25 +1,17 @@
module DiasporaFederation
describe Entities::Like do
- let(:data) {
- {positive: true,
- guid: "0123456789abcdef",
- target_type: "Post",
- parent_guid: "fedcba9876543210",
- parent_author_signature: "BBBBBB==",
- author_signature: "AAAAAA==",
- diaspora_id: "luke@diaspora.example.tld"}
- }
+ let(:data) { FactoryGirl.attributes_for(:like_entity) }
let(:xml) {
<<-XML
- true
- 0123456789abcdef
- Post
- fedcba9876543210
- BBBBBB==
- AAAAAA==
- luke@diaspora.example.tld
+ #{data[:positive]}
+ #{data[:guid]}
+ #{data[:target_type]}
+ #{data[:parent_guid]}
+ #{data[:parent_author_signature]}
+ #{data[:author_signature]}
+ #{data[:diaspora_id]}
XML
}
diff --git a/spec/lib/diaspora_federation/entities/participation_spec.rb b/spec/lib/diaspora_federation/entities/participation_spec.rb
index 5653c41..53c9db0 100644
--- a/spec/lib/diaspora_federation/entities/participation_spec.rb
+++ b/spec/lib/diaspora_federation/entities/participation_spec.rb
@@ -1,13 +1,6 @@
module DiasporaFederation
describe Entities::Participation do
- let(:data) {
- {guid: "0123456789abcdef",
- target_type: "Post",
- parent_guid: "fedcba9876543210",
- parent_author_signature: "BBBBBB==",
- author_signature: "AAAAAA==",
- diaspora_id: "luke@diaspora.example.tld"}
- }
+ let(:data) { FactoryGirl.attributes_for(:participation_entity) }
let(:xml) {
<<-XML
diff --git a/spec/lib/diaspora_federation/entities/relayable_retraction_spec.rb b/spec/lib/diaspora_federation/entities/relayable_retraction_spec.rb
index 981fb3d..afb4cf1 100644
--- a/spec/lib/diaspora_federation/entities/relayable_retraction_spec.rb
+++ b/spec/lib/diaspora_federation/entities/relayable_retraction_spec.rb
@@ -1,21 +1,15 @@
module DiasporaFederation
describe Entities::RelayableRetraction do
- let(:data) {
- {parent_author_signature: "AAAAAA=",
- target_guid: "0123456789abcdef",
- target_type: "Comment",
- sender_id: "luke@diaspora.example.tld",
- target_author_signature: "BBBBBB="}
- }
+ let(:data) { FactoryGirl.attributes_for(:relayable_retraction_entity) }
let(:xml) {
<<-XML
- AAAAAA=
- 0123456789abcdef
- Comment
- luke@diaspora.example.tld
- BBBBBB=
+ #{data[:parent_author_signature]}
+ #{data[:target_guid]}
+ #{data[:target_type]}
+ #{data[:sender_id]}
+ #{data[:target_author_signature]}
XML
}
diff --git a/spec/lib/diaspora_federation/entities/request_spec.rb b/spec/lib/diaspora_federation/entities/request_spec.rb
index 62592fb..36968ad 100644
--- a/spec/lib/diaspora_federation/entities/request_spec.rb
+++ b/spec/lib/diaspora_federation/entities/request_spec.rb
@@ -1,15 +1,12 @@
module DiasporaFederation
describe Entities::Request do
- let(:data) {
- {sender_id: "alice@somepod.org",
- recipient_id: "bob@otherpod.net"}
- }
+ let(:data) { FactoryGirl.attributes_for(:request_entity) }
let(:xml) {
<<-XML
- alice@somepod.org
- bob@otherpod.net
+ #{data[:sender_id]}
+ #{data[:recipient_id]}
XML
}
diff --git a/spec/lib/diaspora_federation/entities/reshare_spec.rb b/spec/lib/diaspora_federation/entities/reshare_spec.rb
index ac83472..2483291 100644
--- a/spec/lib/diaspora_federation/entities/reshare_spec.rb
+++ b/spec/lib/diaspora_federation/entities/reshare_spec.rb
@@ -1,29 +1,17 @@
module DiasporaFederation
describe Entities::Reshare do
- before do
- @datetime = DateTime.now.utc
- end
-
- let(:data) {
- {root_diaspora_id: "robert_root@pod.example.tld",
- root_guid: "fedcba9876543210",
- guid: "0123456789abcdef",
- diaspora_id: "alice@diaspora.domain.tld",
- public: true,
- created_at: @datetime,
- provider_display_name: "mobile"}
- }
+ let(:data) { FactoryGirl.attributes_for(:reshare_entity) }
let(:xml) {
<<-XML
- robert_root@pod.example.tld
- fedcba9876543210
- 0123456789abcdef
- alice@diaspora.domain.tld
- true
- #{@datetime}
- mobile
+ #{data[:root_diaspora_id]}
+ #{data[:root_guid]}
+ #{data[:guid]}
+ #{data[:diaspora_id]}
+ #{data[:public]}
+ #{data[:created_at]}
+ #{data[:provider_display_name]}
XML
}
diff --git a/spec/lib/diaspora_federation/entities/retraction_spec.rb b/spec/lib/diaspora_federation/entities/retraction_spec.rb
index 95098f1..fb67be3 100644
--- a/spec/lib/diaspora_federation/entities/retraction_spec.rb
+++ b/spec/lib/diaspora_federation/entities/retraction_spec.rb
@@ -1,17 +1,13 @@
module DiasporaFederation
describe Entities::Retraction do
- let(:data) {
- {post_guid: "0123456789abcdef",
- diaspora_id: "luke@diaspora.example.tld",
- type: "StatusMessage"}
- }
+ let(:data) { FactoryGirl.attributes_for(:retraction_entity) }
let(:xml) {
<<-XML
- 0123456789abcdef
- luke@diaspora.example.tld
- StatusMessage
+ #{data[:post_guid]}
+ #{data[:diaspora_id]}
+ #{data[:type]}
XML
}
diff --git a/spec/lib/diaspora_federation/entities/signed_retraction_spec.rb b/spec/lib/diaspora_federation/entities/signed_retraction_spec.rb
index 2fa0c76..494592e 100644
--- a/spec/lib/diaspora_federation/entities/signed_retraction_spec.rb
+++ b/spec/lib/diaspora_federation/entities/signed_retraction_spec.rb
@@ -1,19 +1,14 @@
module DiasporaFederation
describe Entities::SignedRetraction do
- let(:data) {
- {target_guid: "0123456789abcdef",
- target_type: "StatusMessage",
- sender_id: "luke@diaspora.example.tld",
- target_author_signature: "AAAAAA=="}
- }
+ let(:data) { FactoryGirl.attributes_for(:signed_retraction_entity) }
let(:xml) {
<<-XML
- 0123456789abcdef
- StatusMessage
- luke@diaspora.example.tld
- AAAAAA==
+ #{data[:target_guid]}
+ #{data[:target_type]}
+ #{data[:sender_id]}
+ #{data[:target_author_signature]}
XML
}
diff --git a/spec/lib/diaspora_federation/validators/comment_validator_spec.rb b/spec/lib/diaspora_federation/validators/comment_validator_spec.rb
index 884bf69..cad4627 100644
--- a/spec/lib/diaspora_federation/validators/comment_validator_spec.rb
+++ b/spec/lib/diaspora_federation/validators/comment_validator_spec.rb
@@ -15,15 +15,15 @@ module DiasporaFederation
end
end
- context "#author_signature and #parent_author_signature" do
- %i(author_signature parent_author_signature).each do |prop|
+ %i(author_signature parent_author_signature).each do |prop|
+ describe "##{prop}" do
it_behaves_like "a property that mustn't be empty" do
let(:property) { prop }
end
end
end
- context "#text" do
+ describe "#text" do
it_behaves_like "a property with a value validation/restriction" do
let(:property) { :text }
let(:wrong_values) { ["", "a" * 65_536] }
diff --git a/spec/lib/diaspora_federation/validators/conversation_validator_spec.rb b/spec/lib/diaspora_federation/validators/conversation_validator_spec.rb
index 3d2a550..3784902 100644
--- a/spec/lib/diaspora_federation/validators/conversation_validator_spec.rb
+++ b/spec/lib/diaspora_federation/validators/conversation_validator_spec.rb
@@ -13,7 +13,7 @@ module DiasporaFederation
let(:property) { :guid }
end
- context "participant_ids" do
+ describe "participant_ids" do
# must not contain more than 20 participant handles
it_behaves_like "a property with a value validation/restriction" do
let(:property) { :participant_ids }
diff --git a/spec/lib/diaspora_federation/validators/h_card_validator_spec.rb b/spec/lib/diaspora_federation/validators/h_card_validator_spec.rb
index 7efde15..7f9042d 100644
--- a/spec/lib/diaspora_federation/validators/h_card_validator_spec.rb
+++ b/spec/lib/diaspora_federation/validators/h_card_validator_spec.rb
@@ -22,10 +22,8 @@ module DiasporaFederation
%i(photo_large_url photo_medium_url photo_small_url).each do |prop|
describe "##{prop}" do
- it_behaves_like "a property with data-types restriction" do
+ it_behaves_like "a property that mustn't be empty" do
let(:property) { prop }
- let(:wrong_values) { [nil, ""] }
- let(:correct_values) { [] }
end
it_behaves_like "a url path validator" do
diff --git a/spec/lib/diaspora_federation/validators/like_validator_spec.rb b/spec/lib/diaspora_federation/validators/like_validator_spec.rb
index 4cdaff4..798138b 100644
--- a/spec/lib/diaspora_federation/validators/like_validator_spec.rb
+++ b/spec/lib/diaspora_federation/validators/like_validator_spec.rb
@@ -9,8 +9,8 @@ module DiasporaFederation
end
end
- context "#author_signature and #parent_author_signature" do
- %i(author_signature parent_author_signature).each do |prop|
+ %i(author_signature parent_author_signature).each do |prop|
+ describe "##{prop}" do
it_behaves_like "a property that mustn't be empty" do
let(:property) { prop }
end
diff --git a/spec/lib/diaspora_federation/validators/location_validator_spec.rb b/spec/lib/diaspora_federation/validators/location_validator_spec.rb
index 5297c2f..76bcc4e 100644
--- a/spec/lib/diaspora_federation/validators/location_validator_spec.rb
+++ b/spec/lib/diaspora_federation/validators/location_validator_spec.rb
@@ -3,8 +3,8 @@ module DiasporaFederation
let(:entity) { :location_entity }
it_behaves_like "a common validator"
- context "#lat and #lng" do
- %i(lat lng).each do |prop|
+ %i(lat lng).each do |prop|
+ describe "##{prop}" do
it_behaves_like "a property that mustn't be empty" do
let(:property) { prop }
end
diff --git a/spec/lib/diaspora_federation/validators/message_validator_spec.rb b/spec/lib/diaspora_federation/validators/message_validator_spec.rb
index 120be13..ea530b2 100644
--- a/spec/lib/diaspora_federation/validators/message_validator_spec.rb
+++ b/spec/lib/diaspora_federation/validators/message_validator_spec.rb
@@ -8,16 +8,16 @@ module DiasporaFederation
let(:mandatory) { true }
end
- context "#guid, #parent_guid, #conversation_guid" do
- %i(guid parent_guid conversation_guid).each do |prop|
+ %i(guid parent_guid conversation_guid).each do |prop|
+ describe "##{prop}" do
it_behaves_like "a guid validator" do
let(:property) { prop }
end
end
end
- context "#author_signature and #parent_author_signature" do
- %i(author_signature parent_author_signature).each do |prop|
+ %i(author_signature parent_author_signature).each do |prop|
+ describe "##{prop}" do
it_behaves_like "a property that mustn't be empty" do
let(:property) { prop }
end
diff --git a/spec/lib/diaspora_federation/validators/participation_validator_spec.rb b/spec/lib/diaspora_federation/validators/participation_validator_spec.rb
index 60e4cd5..285889b 100644
--- a/spec/lib/diaspora_federation/validators/participation_validator_spec.rb
+++ b/spec/lib/diaspora_federation/validators/participation_validator_spec.rb
@@ -9,16 +9,16 @@ module DiasporaFederation
let(:mandatory) { true }
end
- context "#guid, #parent_guid" do
- %i(guid parent_guid).each do |prop|
+ %i(guid parent_guid).each do |prop|
+ describe "##{prop}" do
it_behaves_like "a guid validator" do
let(:property) { prop }
end
end
end
- context "#target_type and #author_signature and #parent_author_signature" do
- %i(target_type author_signature parent_author_signature).each do |prop|
+ %i(target_type author_signature parent_author_signature).each do |prop|
+ describe "##{prop}" do
it_behaves_like "a property that mustn't be empty" do
let(:property) { prop }
end
diff --git a/spec/lib/diaspora_federation/validators/photo_validator_spec.rb b/spec/lib/diaspora_federation/validators/photo_validator_spec.rb
index abee4f8..a978c0c 100644
--- a/spec/lib/diaspora_federation/validators/photo_validator_spec.rb
+++ b/spec/lib/diaspora_federation/validators/photo_validator_spec.rb
@@ -9,8 +9,8 @@ module DiasporaFederation
let(:mandatory) { true }
end
- context "#guid, #status_message_guid" do
- %i(guid status_message_guid).each do |prop|
+ %i(guid status_message_guid).each do |prop|
+ describe "##{prop}" do
it_behaves_like "a guid validator" do
let(:property) { prop }
end
@@ -21,16 +21,16 @@ module DiasporaFederation
let(:property) { :public }
end
- context "#remote_photo_path, #remote_photo_name" do
- %i(remote_photo_name remote_photo_path).each do |prop|
+ %i(remote_photo_name remote_photo_path).each do |prop|
+ describe "##{prop}" do
it_behaves_like "a property that mustn't be empty" do
let(:property) { prop }
end
end
end
- context "#height, #width" do
- %i(height width).each do |prop|
+ %i(height width).each do |prop|
+ describe "##{prop}" do
it_behaves_like "a property with a value validation/restriction" do
let(:property) { prop }
let(:wrong_values) { [true, :num, "asdf"] }
diff --git a/spec/lib/diaspora_federation/validators/relayable_retraction_validator_spec.rb b/spec/lib/diaspora_federation/validators/relayable_retraction_validator_spec.rb
index 8660241..2e1e88e 100644
--- a/spec/lib/diaspora_federation/validators/relayable_retraction_validator_spec.rb
+++ b/spec/lib/diaspora_federation/validators/relayable_retraction_validator_spec.rb
@@ -12,8 +12,8 @@ module DiasporaFederation
let(:property) { :target_guid }
end
- context "#parent_author_signature, #target_author_signature" do
- %i(parent_author_signature target_author_signature).each do |prop|
+ %i(parent_author_signature target_author_signature).each do |prop|
+ describe "##{prop}" do
it_behaves_like "a property that mustn't be empty" do
let(:property) { prop }
end
diff --git a/spec/lib/diaspora_federation/validators/request_validator_spec.rb b/spec/lib/diaspora_federation/validators/request_validator_spec.rb
index 79a34c4..d8e0dcc 100644
--- a/spec/lib/diaspora_federation/validators/request_validator_spec.rb
+++ b/spec/lib/diaspora_federation/validators/request_validator_spec.rb
@@ -4,8 +4,8 @@ module DiasporaFederation
it_behaves_like "a common validator"
- context "#sender_id, #recipient_id" do
- %i(sender_id recipient_id).each do |prop|
+ %i(sender_id recipient_id).each do |prop|
+ describe "##{prop}" do
it_behaves_like "a diaspora id validator" do
let(:property) { prop }
let(:mandatory) { true }
diff --git a/spec/lib/diaspora_federation/validators/reshare_validator_spec.rb b/spec/lib/diaspora_federation/validators/reshare_validator_spec.rb
index b2dc070..4f32d7b 100644
--- a/spec/lib/diaspora_federation/validators/reshare_validator_spec.rb
+++ b/spec/lib/diaspora_federation/validators/reshare_validator_spec.rb
@@ -3,8 +3,8 @@ module DiasporaFederation
let(:entity) { :reshare_entity }
it_behaves_like "a common validator"
- context "#root_diaspora_id, #diaspora_id" do
- %i(root_diaspora_id diaspora_id).each do |prop|
+ %i(root_diaspora_id diaspora_id).each do |prop|
+ describe "##{prop}" do
it_behaves_like "a diaspora id validator" do
let(:property) { prop }
let(:mandatory) { true }
@@ -12,8 +12,8 @@ module DiasporaFederation
end
end
- context "#root_guid, #guid" do
- %i(root_guid guid).each do |prop|
+ %i(root_guid guid).each do |prop|
+ describe "##{prop}" do
it_behaves_like "a guid validator" do
let(:property) { prop }
end
diff --git a/spec/lib/diaspora_federation/validators/retraction_validator_spec.rb b/spec/lib/diaspora_federation/validators/retraction_validator_spec.rb
index 4c42c39..ac14653 100644
--- a/spec/lib/diaspora_federation/validators/retraction_validator_spec.rb
+++ b/spec/lib/diaspora_federation/validators/retraction_validator_spec.rb
@@ -12,7 +12,7 @@ module DiasporaFederation
let(:mandatory) { true }
end
- context "#type" do
+ describe "#type" do
it_behaves_like "a property that mustn't be empty" do
let(:property) { :type }
end
diff --git a/spec/lib/diaspora_federation/validators/signed_retraction_validator_spec.rb b/spec/lib/diaspora_federation/validators/signed_retraction_validator_spec.rb
index 36720eb..6c59445 100644
--- a/spec/lib/diaspora_federation/validators/signed_retraction_validator_spec.rb
+++ b/spec/lib/diaspora_federation/validators/signed_retraction_validator_spec.rb
@@ -12,8 +12,8 @@ module DiasporaFederation
let(:property) { :target_guid }
end
- context "#target_type, #target_author_signature" do
- %i(target_type target_author_signature).each do |prop|
+ %i(target_type target_author_signature).each do |prop|
+ describe "##{prop}" do
it_behaves_like "a property that mustn't be empty" do
let(:property) { prop }
end
diff --git a/spec/lib/diaspora_federation/validators/web_finger_validator_spec.rb b/spec/lib/diaspora_federation/validators/web_finger_validator_spec.rb
index 288d476..1d91e7e 100644
--- a/spec/lib/diaspora_federation/validators/web_finger_validator_spec.rb
+++ b/spec/lib/diaspora_federation/validators/web_finger_validator_spec.rb
@@ -5,10 +5,8 @@ module DiasporaFederation
it_behaves_like "a common validator"
describe "#acct_uri" do
- it_behaves_like "a property with data-types restriction" do
+ it_behaves_like "a property that mustn't be empty" do
let(:property) { :acct_uri }
- let(:wrong_values) { [nil, ""] }
- let(:correct_values) { [] }
end
end