From 0e7bb6d75643e84a770f58a5eb17d83c2eddccb9 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 28 Dec 2015 01:39:21 +0100 Subject: [PATCH] define federation entity factories --- spec/factories.rb | 3 +++ spec/support/fixture_builder.rb | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/spec/factories.rb b/spec/factories.rb index 87110bcf0fd..0d95a96067a 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -10,6 +10,9 @@ def r_str SecureRandom.hex(3) end +require "diaspora_federation/test" +DiasporaFederation::Test::Factories.federation_factories + FactoryGirl.define do factory :profile do sequence(:first_name) { |n| "Robert#{n}#{r_str}" } diff --git a/spec/support/fixture_builder.rb b/spec/support/fixture_builder.rb index 34f981a3310..e7d90d83f74 100644 --- a/spec/support/fixture_builder.rb +++ b/spec/support/fixture_builder.rb @@ -34,11 +34,11 @@ local_leia.contacts.create(:person => remote_raphael, :aspects => [leias_aspect]) local_luke.contacts.create(:person => remote_raphael, :aspects => [lukes_aspect]) - + # Set up a follower peter = FactoryGirl.create(:user_with_aspect, :username => "peter") peters_aspect = peter.aspects.where(:name => "generic").first - + peter.contacts.create!(:person => alice.person, :aspects => [peters_aspect], :sharing => false,