Gabriel Silva · Gabriel Silva
Showing 14 changed files Show diff stats
app/models/add_member.rb
app/models/circle.rb
app/models/concerns/followable.rb
app/models/concerns/follower.rb
app/models/external_person.rb
app/models/person.rb
app/models/profile.rb
db/schema.rb
test/unit/article_test.rb
test/unit/follower_test.rb
test/unit/friendship_test.rb
test/unit/notify_activity_to_profiles_job_test.rb
test/unit/organization_test.rb
test/unit/profile_test.rb
@@ -22,7 +22,7 @@ class AddMember &lt; Task
       self.roles = [Profile::Roles.member(organization.environment.id).id]
     end
     target.affiliate(requestor, self.roles.select{|r| !r.to_i.zero? }.map{|i| Role.find(i)})
-    person.follow(organization, Circle.find_or_create_by(:person => person, :name =>_('memberships'), :profile_type => 'Community'))
+    person.follow(organization, Circle.find_or_create_by(:owner => person, :name =>_('memberships'), :profile_type => 'Community'))
   end
   def title
@@ -25,7 +25,8 @@ class Circle &lt; ApplicationRecord
     {
       _("Person") => Person.name,
       _("Community") => Community.name,
-      _("Enterprise") => Enterprise.name
+      _("Enterprise") => Enterprise.name,
+      _("Organization") => Organization.name
     }
   end
@@ -0,0 +1,18 @@
+module Followable
+  extend ActiveSupport::Concern
+
+  def followers
+    person_followers = Person.joins(:owned_circles).merge(circles).uniq
+    external_person_followers = ExternalPerson.joins(:owned_circles).merge(circles).uniq
+
+    person_followers + external_person_followers
+  end
+
+  def followed_by?(person)
+    (person == self) || (person.in? self.followers)
+  end
+
+  def in_circle?(circle)
+    circle.in? self.circles
+  end
+end
@@ -4,14 +4,14 @@ module Follower
   def follow(profile, circles)
     circles = [circles] unless circles.is_a?(Array)
     circles.each do |new_circle|
-      next if new_circle.owner != self || new_circle.profile_type != profile.class.name
+      next if new_circle.owner != self || !profile.kind_of?(new_circle.profile_type.constantize)
       ProfileFollower.create(profile: profile, circle: new_circle)
     end
   end
   def follows?(profile)
     return false if profile.nil?
-    p profile.followed_by?(self)
+    profile.followed_by?(self)
   end
   def unfollow(profile)
@@ -19,7 +19,10 @@ module Follower
   end
   def followed_profiles
-    Profile.followed_by self
+    external_people = ExternalPerson.joins(:circles).where("circles.owner_id = ?", self.id)
+    profiles = Profile.joins(:circles).where("circles.owner_id = ?", self.id)
+
+    external_people.uniq + profiles.uniq
   end
   def update_profile_circles(profile, new_circles)
@@ -37,4 +40,8 @@ module Follower
     ProfileFollower.with_profile(profile).with_circle(circle).destroy_all
   end
+  def in_circle?(circle)
+    circle.in? self.circles
+  end
+
 end
@@ -4,9 +4,10 @@ class ExternalPerson &lt; ActiveRecord::Base
   include Human
   include ProfileEntity
   include Follower
+  include Followable
-  has_many :profile_followers
-  has_many :circles, :through => :profile_followers, :as => :profile
+  has_many :profile_followers, :as => :profile
+  has_many :circles, :through => :profile_followers
   has_many :owned_circles, as: :owner, :class_name => "Circle"
   validates_uniqueness_of :identifier, scope: :source
@@ -204,7 +205,7 @@ class ExternalPerson &lt; ActiveRecord::Base
      each_friend: nil, is_last_admin?: false, is_last_admin_leaving?: false,
      leave: nil, last_notification: nil, notification_time: 0, notifier: nil,
      remove_suggestion: nil, allow_invitation_from?: false, in_social_circle?: false,
-     allow_followers: false, in_circles: Circle.none, followers: [], in_circle?: false
+     allow_followers: false
     }
     derivated_methods = generate_derivated_methods(methods_and_responses)
@@ -258,7 +259,7 @@ class ExternalPerson &lt; ActiveRecord::Base
      more_popular_label: _('no members'), profile_custom_image: nil,
      is_on_homepage?: false, activities: ProfileActivity.none,
      may_display_field_to?: true, may_display_location_to?: true, public_fields:
-     {}, followed_by?: false, display_private_info_to?: true, can_view_field?:
+     {}, display_private_info_to?: true, can_view_field?:
      true, remove_from_suggestion_list: nil, layout_template: 'default',
      is_admin?: false, add_friend: false, is_a_friend?: false,
      already_request_friendship?: false, tracked_actions: ActionTracker::Record.none
@@ -275,6 +276,7 @@ class ExternalPerson &lt; ActiveRecord::Base
     if profile_instance_methods.keys.include? method
       return profile_instance_methods[method]
     end
+    super
   end
   def respond_to_missing?(method_name, include_private = false)
@@ -283,6 +285,10 @@ class ExternalPerson &lt; ActiveRecord::Base
     super
   end
+  def kind_of?(klass)
+    (klass == Person) ? true : super
+  end
+
   private
   def generate_derivated_methods(methods)
@@ -570,10 +570,6 @@ class Person &lt; Profile
     }
   end
-  def followed_profiles
-    Profile.followed_by self
-  end
-
   def in_social_circle?(person)
     self.is_a_friend?(person) || super
   end
@@ -4,6 +4,7 @@
 class Profile < ApplicationRecord
   include ProfileEntity
+  include Followable
   attr_accessible :public_profile, :nickname, :custom_footer, :custom_header, :address, :zip_code, :contact_phone, :image_builder, :description, :closed, :template_id, :lat, :lng, :is_template, :fields_privacy, :preferred_domain_id, :category_ids, :country, :city, :state, :national_region_code, :email, :contact_email, :redirect_l10n, :notification_time,
     :custom_url_redirection, :email_suggestions, :allow_members_to_invite, :invite_friends_only, :secret, :profile_admin_mail_notification, :redirection_after_login, :allow_followers
@@ -219,13 +220,6 @@ class Profile &lt; ApplicationRecord
   scope :more_active, -> { order 'activities_count DESC' }
   scope :more_recent, -> { order "created_at DESC" }
-  scope :followed_by, -> person{
-    distinct.select('profiles.*').
-    joins('left join profiles_circles ON profiles_circles.profile_id = profiles.id').
-    joins('left join circles ON circles.id = profiles_circles.circle_id').
-    where('circles.owner_id = ?', person.id)
-  }
-
   settings_items :allow_followers, :type => :boolean, :default => true
   alias_method :allow_followers?, :allow_followers
@@ -241,15 +235,8 @@ class Profile &lt; ApplicationRecord
   has_many :email_templates, :foreign_key => :owner_id
-  has_many :profile_followers
-  has_many :circles, :through => :profile_followers, :as => :profile
-
-  def followers
-    person_followers = Person.joins(:owned_circles).merge(circles).uniq
-    external_person_followers = ExternalPerson.joins(:owned_circles).merge(circles).uniq
-
-    person_followers + external_person_followers
-  end
+  has_many :profile_followers, :as => :profile
+  has_many :circles, :through => :profile_followers
   # has_many :followers, -> { uniq }, :through => :profile_followers, :source => :person
@@ -1010,10 +997,6 @@ private :generate_url, :url_options
     self.active_fields
   end
-  def followed_by?(person)
-    (person == self) || (person.in? self.followers)
-  end
-
   def in_social_circle?(person)
     (person == self) || (person.is_member_of?(self))
   end
@@ -1057,7 +1040,4 @@ private :generate_url, :url_options
     person.kind_of?(Profile) && person.has_permission?('destroy_profile', self)
   end
-  def in_circle?(circle)
-    circle.in? self.circles
-  end
 end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20160608123748) do
+ActiveRecord::Schema.define(version: 20160822184703) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -277,11 +277,13 @@ ActiveRecord::Schema.define(version: 20160608123748) do
   create_table "circles", force: :cascade do |t|
     t.string  "name"
-    t.integer "person_id"
-    t.string  "profile_type", null: false
+    t.integer "owner_id"
+    t.string  "profile_type",                    null: false
+    t.string  "owner_type",   default: "Person"
   end
-  add_index "circles", ["person_id", "name"], name: "circles_composite_key_index", unique: true, using: :btree
+  add_index "circles", ["owner_id", "name"], name: "circles_composite_key_index", unique: true, using: :btree
+  add_index "circles", ["owner_id", "owner_type"], name: "index_circles_on_owner_id_and_owner_type", using: :btree
   create_table "comments", force: :cascade do |t|
     t.string   "title"
@@ -553,6 +555,11 @@ ActiveRecord::Schema.define(version: 20160608123748) do
     t.datetime "updated_at"
   end
+  create_table "private_scraps", force: :cascade do |t|
+    t.integer "person_id"
+    t.integer "scrap_id"
+  end
+
   create_table "product_qualifiers", force: :cascade do |t|
     t.integer  "product_id"
     t.integer  "qualifier_id"
@@ -681,9 +688,11 @@ ActiveRecord::Schema.define(version: 20160608123748) do
     t.integer  "circle_id"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.string   "profile_type", default: "Person"
   end
   add_index "profiles_circles", ["profile_id", "circle_id"], name: "profiles_circles_composite_key_index", unique: true, using: :btree
+  add_index "profiles_circles", ["profile_id", "profile_type"], name: "index_profiles_circles_on_profile_id_and_profile_type", using: :btree
   create_table "qualifier_certifiers", force: :cascade do |t|
     t.integer "qualifier_id"
@@ -1101,7 +1101,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
   should 'create notifications to followers when creating an article' do
     friend = fast_create(Person)
-    circle = Circle.create!(:person=> friend, :name => "Zombies", :profile_type => 'Person')
+    circle = Circle.create!(:owner=> friend, :name => "Zombies", :profile_type => 'Person')
     friend.follow(profile, circle)
     Article.destroy_all
     ActionTracker::Record.destroy_all
@@ -1115,7 +1115,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
   should 'create the notification to the follower when one follower has the notification and the other no' do
     f1 = fast_create(Person)
-    circle = Circle.create!(:person=> f1, :name => "Zombies", :profile_type => 'Person')
+    circle = Circle.create!(:owner=> f1, :name => "Zombies", :profile_type => 'Person')
     f1.follow(profile, circle)
     User.current = profile.user
@@ -1125,7 +1125,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert_equal 2, ActionTrackerNotification.where(action_tracker_id: article.activity.id).count
     f2 = fast_create(Person)
-    circle2 = Circle.create!(:person=> f2, :name => "Zombies", :profile_type => 'Person')
+    circle2 = Circle.create!(:owner=> f2, :name => "Zombies", :profile_type => 'Person')
     f2.follow(profile, circle2)
     article2 = create TinyMceArticle, :name => 'Tracked Article 2', :profile_id => profile.id
@@ -1137,7 +1137,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
   should 'destroy activity and notifications of followers when destroying an article' do
     friend = fast_create(Person)
-    circle = Circle.create!(:person=> friend, :name => "Zombies", :profile_type => 'Person')
+    circle = Circle.create!(:owner=> friend, :name => "Zombies", :profile_type => 'Person')
     friend.follow(profile, circle)
@@ -8,6 +8,7 @@ class FollowerTest &lt; ActiveSupport::TestCase
     @circle1 = Circle.create!(owner: @person1, name: "Zombies", profile_type: 'Person')
     @circle2 = Circle.create!(owner: @person1, name: "Humans", profile_type: 'Person')
+    @circle3 = Circle.create!(owner: @person1, name: "Crypt", profile_type: 'Community')
     @external_person = ExternalPerson.create!(identifier: 'johnlocke',
                                      name: 'John Locke',
@@ -85,27 +86,32 @@ class FollowerTest &lt; ActiveSupport::TestCase
   should 'get the followed profiles for a regular user' do
     person3 = create_user('person-test-3').person
+    community = fast_create(Community)
     @person1.follow(@person2, @circle1)
     @person1.follow(person3, @circle1)
-    assert_equivalent [@person2, person3], @person1.followed_profiles
+    @person1.follow(community, @circle3)
+    assert_equivalent [@person2, person3, community], @person1.followed_profiles
   end
   should 'get the followed profiles for an external user' do
     person3 = create_user('person-test-3').person
+    community = fast_create(Community)
     @circle1.update_attributes(owner: @external_person)
+    @circle3.update_attributes(owner: @external_person)
     @external_person.follow(@person2, @circle1)
     @external_person.follow(person3, @circle1)
-    assert_equivalent [@person2, person3], @external_person.followed_profiles
+    @external_person.follow(community, @circle3)
+    assert_equivalent [@person2, person3, community], @external_person.followed_profiles
   end
   should 'not follow same person twice even with different circles' do
-    circle3 = Circle.create!(owner: @person1, name: "Free Folk", profile_type: 'Person')
+    circle4 = Circle.create!(owner: @person1, name: "Free Folk", profile_type: 'Person')
     @person1.follow(@person2, @circle1)
     @person1.follow(@person2, @circle2)
-    @person1.follow(@person2, circle3)
+    @person1.follow(@person2, circle4)
     assert_equivalent [@person2], @person1.followed_profiles
   end
@@ -118,21 +124,21 @@ class FollowerTest &lt; ActiveSupport::TestCase
   end
   should 'update profile circles for a person' do
-    circle3 = Circle.create!(owner: @person1, name: "Brains", profile_type: 'Person')
+    circle4 = Circle.create!(owner: @person1, name: "Brains", profile_type: 'Person')
     @person1.follow(@person2, [@circle1, @circle2])
-    @person1.update_profile_circles(@person2, [@circle2, circle3])
-    assert_equivalent [@circle2, circle3], @person2.circles
+    @person1.update_profile_circles(@person2, [@circle2, circle4])
+    assert_equivalent [@circle2, circle4], @person2.circles
   end
   should 'keep other follower circles after update' do
     person3 = create_user('person-test-3').person
-    circle3 = Circle.create!(owner: person3, name: "Humans", profile_type: 'Person')
+    circle4 = Circle.create!(owner: person3, name: "Humans", profile_type: 'Person')
     @person1.follow(@person2, @circle1)
-    person3.follow(@person2, circle3)
+    person3.follow(@person2, circle4)
     @person1.update_profile_circles(@person2, [@circle1, @circle2])
-    assert_equivalent [@circle1, @circle2, circle3], @person2.circles
+    assert_equivalent [@circle1, @circle2, circle4], @person2.circles
   end
   should 'remove a person from a circle' do
@@ -150,14 +156,10 @@ class FollowerTest &lt; ActiveSupport::TestCase
     assert_equivalent [@circle1, @circle2], @person2.circles
   end
-  should 'external person be followable' do
-    person = fast_create(Person, :environment_id => Environment.default.id)
-    circle = Circle.create(owner: @external_person, profile_type: "Person", name: "FRIENDSSS")
-    pf = ProfileFollower.create(profile: @external_person, circle: circle)
-    assert person.follows? @external_person
-
-    # assert_difference 'ProfileFollower.all.count' do
-    #   person.follow(@external_person, circle)
-    # end
+  should 'follow External Person' do
+    assert_difference 'ProfileFollower.count' do
+      @person1.follow(@external_person, @circle1)
+    end
+    assert @person1.follows? @external_person
   end
 end
@@ -115,8 +115,8 @@ class FriendshipTest &lt; ActiveSupport::TestCase
     p1 = create_user('testuser1').person
     p2 = create_user('testuser2').person
-    circle1 = Circle.create!(:person=> p1, :name => "Zombies", :profile_type => 'Person')
-    circle2 = Circle.create!(:person=> p2, :name => "Zombies", :profile_type => 'Person')
+    circle1 = Circle.create!(:owner=> p1, :name => "Zombies", :profile_type => 'Person')
+    circle2 = Circle.create!(:owner=> p2, :name => "Zombies", :profile_type => 'Person')
     p1.follow(p2, circle1)
     p2.follow(p1, circle2)
@@ -31,9 +31,9 @@ class NotifyActivityToProfilesJobTest &lt; ActiveSupport::TestCase
     refute NotifyActivityToProfilesJob::NOTIFY_ONLY_COMMUNITY.include?(action_tracker.verb)
     p1, p2, m1, m2 = fast_create(Person), fast_create(Person), fast_create(Person), fast_create(Person)
-    circle1 = Circle.create!(:person=> p1, :name => "Zombies", :profile_type => 'Person')
-    circle2 = Circle.create!(:person=> p2, :name => "Zombies", :profile_type => 'Person')
-    circle = Circle.create!(:person=> person, :name => "Zombies", :profile_type => 'Person')
+    circle1 = Circle.create!(:owner=> p1, :name => "Zombies", :profile_type => 'Person')
+    circle2 = Circle.create!(:owner=> p2, :name => "Zombies", :profile_type => 'Person')
+    circle = Circle.create!(:owner=> person, :name => "Zombies", :profile_type => 'Person')
     fast_create(ProfileFollower, :profile_id => person.id, :circle_id => circle1.id)
     fast_create(ProfileFollower, :profile_id => person.id, :circle_id => circle2.id)
@@ -79,7 +79,7 @@ class NotifyActivityToProfilesJobTest &lt; ActiveSupport::TestCase
     refute NotifyActivityToProfilesJob::NOTIFY_ONLY_COMMUNITY.include?(action_tracker.verb)
     p1, p2, m1, m2 = fast_create(Person), fast_create(Person), fast_create(Person), fast_create(Person)
-    circle1 = Circle.create!(:person=> p1, :name => "Zombies", :profile_type => 'Person')
+    circle1 = Circle.create!(:owner=> p1, :name => "Zombies", :profile_type => 'Person')
     fast_create(ProfileFollower, :profile_id => person.id, :circle_id => circle1.id)
     fast_create(RoleAssignment, :accessor_id => m1.id, :role_id => 3, :resource_id => community.id)
@@ -127,8 +127,8 @@ class NotifyActivityToProfilesJobTest &lt; ActiveSupport::TestCase
     refute NotifyActivityToProfilesJob::NOTIFY_ONLY_COMMUNITY.include?(action_tracker.verb)
     p1, p2, m1, m2 = fast_create(Person), fast_create(Person), fast_create(Person), fast_create(Person)
-    circle1 = Circle.create!(:person=> p1, :name => "Zombies", :profile_type => 'Person')
-    circle2 = Circle.create!(:person=> p2, :name => "Zombies", :profile_type => 'Person')
+    circle1 = Circle.create!(:owner=> p1, :name => "Zombies", :profile_type => 'Person')
+    circle2 = Circle.create!(:owner=> p2, :name => "Zombies", :profile_type => 'Person')
     fast_create(ProfileFollower, :profile_id => person.id, :circle_id => circle1.id)
     fast_create(ProfileFollower, :profile_id => person.id, :circle_id => circle2.id)
@@ -267,9 +267,9 @@ class OrganizationTest &lt; ActiveSupport::TestCase
     o.add_member(p3)
     assert p3.is_member_of?(o)
-    assert_equal true, o.send(:followed_by?,p1)
-    assert_equal true, o.send(:followed_by?,p3)
-    assert_equal false, o.send(:followed_by?,p2)
+    assert o.followed_by? p1
+    assert o.followed_by? p3
+    refute o.followed_by? p2
   end
   should "compose bare jabber id by identifier plus 'conference' and default hostname" do
@@ -2249,30 +2249,4 @@ class ProfileTest &lt; ActiveSupport::TestCase
     assert_equivalent person3.followers, [person1, person2]
   end
-  should 'return all profiles followed by a regular person' do
-    person1 = create_user('testperson-1').person
-    person2 = create_user('testperson-2').person
-    community = fast_create(Community)
-    circle1 = Circle.create!(:owner => person1, :name => "Night's Watch", :profile_type => 'Person')
-    circle2 = Circle.create!(:owner => person1, :name => "Free Folk", :profile_type => 'Community')
-
-    person1.follow(person2, circle1)
-    person1.follow(community, circle2)
-    assert_equivalent [person2, community], Profile.followed_by(person1)
-  end
-
-  should 'return all profiles followed by an external person' do
-    external_person = ExternalPerson.create!(identifier: 'johnlocke', name: 'John Locke',
-                                             source: 'anerenvironment.org', email: 'locke@island.org',
-                                             created_at: Date.yesterday)
-    person = create_user('testperson-2').person
-    community = fast_create(Community)
-    circle1 = Circle.create!(:owner => external_person, :name => "Night's Watch", :profile_type => 'Person')
-    circle2 = Circle.create!(:owner => external_person, :name => "Free Folk", :profile_type => 'Community')
-
-    external_person.follow(person, circle1)
-    external_person.follow(community, circle2)
-    assert_equivalent [person, community], Profile.followed_by(external_person)
-  end
-
 end
	@@ -22,7 +22,7 @@ class AddMember < Task		@@ -22,7 +22,7 @@ class AddMember < Task
22	self.roles = [Profile::Roles.member(organization.environment.id).id]	22	self.roles = [Profile::Roles.member(organization.environment.id).id]
23	end	23	end
24	target.affiliate(requestor, self.roles.select{\|r\| !r.to_i.zero? }.map{\|i\| Role.find(i)})	24	target.affiliate(requestor, self.roles.select{\|r\| !r.to_i.zero? }.map{\|i\| Role.find(i)})
25	- person.follow(organization, Circle.find_or_create_by(:person => person, :name =>_('memberships'), :profile_type => 'Community'))	25	+ person.follow(organization, Circle.find_or_create_by(:owner => person, :name =>_('memberships'), :profile_type => 'Community'))
26	end	26	end
27		27
28	def title	28	def title
@@ -0,0 +1,18 @@		@@ -0,0 +1,18 @@
	1	+module Followable
	2	+ extend ActiveSupport::Concern
	3	+
	4	+ def followers
	5	+ person_followers = Person.joins(:owned_circles).merge(circles).uniq
	6	+ external_person_followers = ExternalPerson.joins(:owned_circles).merge(circles).uniq
	7	+
	8	+ person_followers + external_person_followers
	9	+ end
	10	+
	11	+ def followed_by?(person)
	12	+ (person == self) \|\| (person.in? self.followers)
	13	+ end
	14	+
	15	+ def in_circle?(circle)
	16	+ circle.in? self.circles
	17	+ end
	18	+end
	@@ -1101,7 +1101,7 @@ class ArticleTest < ActiveSupport::TestCase		@@ -1101,7 +1101,7 @@ class ArticleTest < ActiveSupport::TestCase
1101		1101
1102	should 'create notifications to followers when creating an article' do	1102	should 'create notifications to followers when creating an article' do
1103	friend = fast_create(Person)	1103	friend = fast_create(Person)
1104	- circle = Circle.create!(:person=> friend, :name => "Zombies", :profile_type => 'Person')	1104	+ circle = Circle.create!(:owner=> friend, :name => "Zombies", :profile_type => 'Person')
1105	friend.follow(profile, circle)	1105	friend.follow(profile, circle)
1106	Article.destroy_all	1106	Article.destroy_all
1107	ActionTracker::Record.destroy_all	1107	ActionTracker::Record.destroy_all
	@@ -1115,7 +1115,7 @@ class ArticleTest < ActiveSupport::TestCase		@@ -1115,7 +1115,7 @@ class ArticleTest < ActiveSupport::TestCase
1115		1115
1116	should 'create the notification to the follower when one follower has the notification and the other no' do	1116	should 'create the notification to the follower when one follower has the notification and the other no' do
1117	f1 = fast_create(Person)	1117	f1 = fast_create(Person)
1118	- circle = Circle.create!(:person=> f1, :name => "Zombies", :profile_type => 'Person')	1118	+ circle = Circle.create!(:owner=> f1, :name => "Zombies", :profile_type => 'Person')
1119	f1.follow(profile, circle)	1119	f1.follow(profile, circle)
1120		1120
1121	User.current = profile.user	1121	User.current = profile.user
	@@ -1125,7 +1125,7 @@ class ArticleTest < ActiveSupport::TestCase		@@ -1125,7 +1125,7 @@ class ArticleTest < ActiveSupport::TestCase
1125	assert_equal 2, ActionTrackerNotification.where(action_tracker_id: article.activity.id).count	1125	assert_equal 2, ActionTrackerNotification.where(action_tracker_id: article.activity.id).count
1126		1126
1127	f2 = fast_create(Person)	1127	f2 = fast_create(Person)
1128	- circle2 = Circle.create!(:person=> f2, :name => "Zombies", :profile_type => 'Person')	1128	+ circle2 = Circle.create!(:owner=> f2, :name => "Zombies", :profile_type => 'Person')
1129	f2.follow(profile, circle2)	1129	f2.follow(profile, circle2)
1130		1130
1131	article2 = create TinyMceArticle, :name => 'Tracked Article 2', :profile_id => profile.id	1131	article2 = create TinyMceArticle, :name => 'Tracked Article 2', :profile_id => profile.id
	@@ -1137,7 +1137,7 @@ class ArticleTest < ActiveSupport::TestCase		@@ -1137,7 +1137,7 @@ class ArticleTest < ActiveSupport::TestCase
1137	should 'destroy activity and notifications of followers when destroying an article' do	1137	should 'destroy activity and notifications of followers when destroying an article' do
1138	friend = fast_create(Person)	1138	friend = fast_create(Person)
1139		1139
1140	- circle = Circle.create!(:person=> friend, :name => "Zombies", :profile_type => 'Person')	1140	+ circle = Circle.create!(:owner=> friend, :name => "Zombies", :profile_type => 'Person')
1141		1141
1142	friend.follow(profile, circle)	1142	friend.follow(profile, circle)
1143		1143
	@@ -2249,30 +2249,4 @@ class ProfileTest < ActiveSupport::TestCase		@@ -2249,30 +2249,4 @@ class ProfileTest < ActiveSupport::TestCase
2249	assert_equivalent person3.followers, [person1, person2]	2249	assert_equivalent person3.followers, [person1, person2]
2250	end	2250	end
2251		2251
2252	- should 'return all profiles followed by a regular person' do
2253	- person1 = create_user('testperson-1').person
2254	- person2 = create_user('testperson-2').person
2255	- community = fast_create(Community)
2256	- circle1 = Circle.create!(:owner => person1, :name => "Night's Watch", :profile_type => 'Person')
2257	- circle2 = Circle.create!(:owner => person1, :name => "Free Folk", :profile_type => 'Community')
2258	-
2259	- person1.follow(person2, circle1)
2260	- person1.follow(community, circle2)
2261	- assert_equivalent [person2, community], Profile.followed_by(person1)
2262	- end
2263	-
2264	- should 'return all profiles followed by an external person' do
2265	- external_person = ExternalPerson.create!(identifier: 'johnlocke', name: 'John Locke',
2266	- source: 'anerenvironment.org', email: 'locke@island.org',
2267	- created_at: Date.yesterday)
2268	- person = create_user('testperson-2').person
2269	- community = fast_create(Community)
2270	- circle1 = Circle.create!(:owner => external_person, :name => "Night's Watch", :profile_type => 'Person')
2271	- circle2 = Circle.create!(:owner => external_person, :name => "Free Folk", :profile_type => 'Community')
2272	-
2273	- external_person.follow(person, circle1)
2274	- external_person.follow(community, circle2)
2275	- assert_equivalent [person, community], Profile.followed_by(external_person)
2276	- end
2277	-
2278	end	2252	end