diaspora_federation-test 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dc6e8fc4fc68bb57ea24172708a10e05de05b0b
-  data.tar.gz: ad3b46952cbde420c8c8cc92b862c9af85c09981
+  metadata.gz: 9499524c854db4efe1a050de1a31b81367d46636
+  data.tar.gz: 250bbaf16de1b756777d2d5f6d55c48be51c3a37
 SHA512:
-  metadata.gz: 30c54fe4f48e80391ab0b9b063ec4943cff96417b1b969d2e774779cd4e097cda0c44f2ccc9c9951ebc939bc44b4340f6babaed7d22c5baca057813b7d641093
-  data.tar.gz: f42074bc3f0f15e2268ac2287ff951fa8a63014253bf6ba73560ecbe18ced619bd26333fa75f096105cde082607a9b0895893528d5f4b38f5078a2c3145a697a
+  metadata.gz: ec1957eef8d63640e3f7b83984427094862d0669f930a02520c3d35ad286bf2b28352d4008e5ca26dc554743c517c3e68fb048b88af1aa3ce831446e805b27f3
+  data.tar.gz: 5b875304bd33102d38916c68f5381605922cb85fb5eff75b00aff1fd5a2030520d0d82853839070e737d8163f7c594431ad8555c49aa713bbec216043f61c7b9

data/lib/diaspora_federation/test.rb

@@ -3,52 +3,5 @@ require "diaspora_federation/test/factories"
 module DiasporaFederation
   # This module encapsulates helper functions maybe wanted by a testsuite of a diaspora_federation gem user application
   module Test
-    # Sort hash according to an entity class's property sequence.
-    # This is used for rspec tests in order to generate correct input hash to
-    # compare results with.
-    #
-    # @param [Hash] data input hash for sorting
-    # @param [Entity.Class] klass entity type to sort according to
-    # @return [Hash] sorted hash
-    def self.sort_hash(data, klass)
-      Hash[klass.class_props.map { |prop|
-        [prop[:name], data[prop[:name]]] unless data[prop[:name]].nil?
-      }.compact]
-    end
-
-    # Generates attributes for entity constructor with correct signatures in it
-    #
-    # @param [Symbol] factory_name the factory to generate attributes for (normally entity name)
-    # @return [Hash] hash with correct signatures
-    def self.relayable_attributes_with_signatures(factory_name)
-      klass = FactoryGirl.factory_by_name(factory_name).build_class
-      sort_hash(FactoryGirl.attributes_for(factory_name), klass).tap do |data|
-        DiasporaFederation::Entities::Relayable.update_signatures!(data, klass)
-      end
-    end
-
-    # Generates attributes for signed retraction entity constructor with correct signatures in it
-    #
-    # @return [Hash] hash with correct signatures
-    def self.signed_retraction_attributes_with_signatures
-      sort_hash(FactoryGirl.attributes_for(:signed_retraction_entity), Entities::SignedRetraction).tap do |data|
-        Entities::SignedRetraction.update_signatures!(data)
-      end
-    end
-
-    # Generates attributes for relayable retraction entity constructor with correct signatures in it
-    #
-    # @return [Hash] hash with correct signatures
-    def self.relayable_retraction_attributes_with_signatures
-      sort_hash(
-        FactoryGirl.attributes_for(
-          :relayable_retraction_entity,
-          target_author_signature: "false sig"
-        ),
-        Entities::RelayableRetraction
-      ).tap do |data|
-        Entities::RelayableRetraction.update_signatures!(data)
-      end
-    end
   end
 end

data/lib/diaspora_federation/test/factories.rb

@@ -3,7 +3,9 @@ require "factory_girl"
 
 module DiasporaFederation
   module Test
+    # Factories for federation entities
     module Factories
+      # defines the federation entity factories
       def self.federation_factories
         FactoryGirl.define do
           initialize_with { new(attributes) }
@@ -40,16 +42,16 @@ module DiasporaFederation
 
           factory :person_entity, class: DiasporaFederation::Entities::Person do
             guid
-            diaspora_id
+            author { generate(:diaspora_id) }
             url "http://localhost:3000/"
             exported_key { generate(:public_key) }
             profile {
-              FactoryGirl.build(:profile_entity, diaspora_id: diaspora_id)
+              FactoryGirl.build(:profile_entity, author: author)
             }
           end
 
           factory :profile_entity, class: DiasporaFederation::Entities::Profile do
-            diaspora_id
+            author { generate(:diaspora_id) }
             first_name "my name"
             last_name nil
             image_url "/assets/user/default.png"
@@ -72,7 +74,7 @@ module DiasporaFederation
 
           factory :photo_entity, class: DiasporaFederation::Entities::Photo do
             guid
-            diaspora_id
+            author { generate(:diaspora_id) }
             public(true)
             created_at { Time.now.utc }
             remote_photo_path "https://diaspora.example.tld/uploads/images/"
@@ -89,84 +91,91 @@ module DiasporaFederation
 
           factory :participation_entity,
                   class: DiasporaFederation::Entities::Participation, parent: :relayable_entity do
+            author { generate(:diaspora_id) }
             guid
-            target_type "Post"
-            diaspora_id
+            parent_type "Post"
           end
 
           factory :status_message_entity, class: DiasporaFederation::Entities::StatusMessage do
             raw_message "i am a very interesting status update"
+            author { generate(:diaspora_id) }
             guid
-            diaspora_id
             public(true)
             created_at { Time.now.utc }
           end
 
           factory :request_entity, class: DiasporaFederation::Entities::Request do
-            sender_id { generate(:diaspora_id) }
-            recipient_id { generate(:diaspora_id) }
+            author { generate(:diaspora_id) }
+            recipient { generate(:diaspora_id) }
+          end
+
+          factory :contact_entity, class: DiasporaFederation::Entities::Contact do
+            author { generate(:diaspora_id) }
+            recipient { generate(:diaspora_id) }
+            following true
+            sharing true
           end
 
           factory :comment_entity, class: DiasporaFederation::Entities::Comment, parent: :relayable_entity do
+            author { generate(:diaspora_id) }
             guid
             text "this is a very informative comment"
-            diaspora_id
           end
 
           factory :like_entity, class: DiasporaFederation::Entities::Like, parent: :relayable_entity do
             positive true
+            author { generate(:diaspora_id) }
             guid
-            target_type "Post"
-            diaspora_id
+            parent_type "Post"
           end
 
           factory :account_deletion_entity, class: DiasporaFederation::Entities::AccountDeletion do
-            diaspora_id
+            author { generate(:diaspora_id) }
           end
 
           factory :conversation_entity, class: DiasporaFederation::Entities::Conversation do
+            author { generate(:diaspora_id) }
             guid
             subject "this is a very informative subject"
             created_at { Time.now.utc }
             messages []
-            diaspora_id
-            participant_ids { 3.times.map { generate(:diaspora_id) }.join(";") }
+            participants { Array.new(3) { generate(:diaspora_id) }.join(";") }
           end
 
           factory :message_entity, class: DiasporaFederation::Entities::Message, parent: :relayable_entity do
             guid
+            author { generate(:diaspora_id) }
             text "this is a very informative text"
             created_at { Time.now.utc }
-            diaspora_id
             conversation_guid { generate(:guid) }
           end
 
           factory :relayable_retraction_entity, class: DiasporaFederation::Entities::RelayableRetraction do
+            author { generate(:diaspora_id) }
             target_guid { generate(:guid) }
             target_type "Comment"
-            diaspora_id
           end
 
           factory :reshare_entity, class: DiasporaFederation::Entities::Reshare do
-            root_diaspora_id { generate(:diaspora_id) }
+            root_author { generate(:diaspora_id) }
             root_guid { generate(:guid) }
             guid
-            diaspora_id
+            author { generate(:diaspora_id) }
             public(true)
             created_at { Time.now.utc }
             provider_display_name { "the testsuite" }
           end
 
           factory :retraction_entity, class: DiasporaFederation::Entities::Retraction do
+            author { generate(:diaspora_id) }
             target_guid { generate(:guid) }
-            diaspora_id
             target_type "Post"
           end
 
           factory :signed_retraction_entity, class: DiasporaFederation::Entities::SignedRetraction do
+            author { generate(:diaspora_id) }
             target_guid { generate(:guid) }
             target_type "Post"
-            diaspora_id
           end
 
           factory :poll_answer_entity, class: DiasporaFederation::Entities::PollAnswer do
@@ -177,13 +186,13 @@ module DiasporaFederation
           factory :poll_entity, class: DiasporaFederation::Entities::Poll do
             guid
             question { "Select an answer" }
-            poll_answers { 3.times.map { FactoryGirl.build(:poll_answer_entity) } }
+            poll_answers { Array.new(3) { FactoryGirl.build(:poll_answer_entity) } }
           end
 
           factory :poll_participation_entity,
                   class:  DiasporaFederation::Entities::PollParticipation, parent: :relayable_entity do
+            author { generate(:diaspora_id) }
             guid
-            diaspora_id
             poll_answer_guid { generate(:guid) }
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diaspora_federation-test
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Benjamin Neff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-23 00:00:00.000000000 Z
+date: 2016-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diaspora_federation
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 0.0.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 0.0.13
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement