Fixed subject of emails notifications

(ActionItem1829)

Fixed subject of emails notifications
(ActionItem1829)
Daniela Feitosa
1 parent 629998e7
Showing 16 changed files with 212 additions and 58 deletions Show diff stats
app/models/add_friend.rb
app/models/add_member.rb
app/models/approve_article.rb
app/models/create_community.rb
app/models/create_enterprise.rb
app/models/suggest_article.rb
app/models/task.rb
app/models/task_mailer.rb
test/unit/add_friend_test.rb
test/unit/add_member_test.rb
test/unit/approve_article_test.rb
test/unit/create_community_test.rb
test/unit/create_enterprise_test.rb
test/unit/suggest_article_test.rb
test/unit/task_mailer_test.rb
test/unit/task_test.rb
@@ -23,8 +23,12 @@ class AddFriend &lt; Task
     :manage_friends
   end
  
+  def target_notification_description
+    _('%{requestor} wants to be your friend.') % {:requestor => requestor.name}
+  end
+
   def target_notification_message
-    _('%{requestor} wants to be your friend.') % {:requestor => requestor.name} + "\n\n" +
+    target_notification_description + "\n\n" +
     _('You need to login to %{system} in order to accept %{requestor} as your friend.') % { :system => target.environment.name, :requestor => requestor.name }
   end
  
@@ -35,8 +35,12 @@ class AddMember &lt; Task
     :manage_memberships
   end
  
+  def target_notification_description
+    _('%{requestor} wants to be a member of this community.') % {:requestor => requestor.name}
+  end
+
   def target_notification_message
-    _('%{requestor} wants to be a member of this community.') % {:requestor => requestor.name} + "\n\n" +
+    target_notification_description + "\n\n" +
     _('You will need login to %{system} in order to accept or reject %{requestor} as a member of %{organization}.') % { :system => target.environment.name, :requestor => requestor.name, :organization => organization.name }
   end
  
@@ -117,9 +117,13 @@ class ApproveArticle &lt; Task
     article.blank?
   end
  
+  def target_notification_description
+    _('%{requestor} wants to publish the article: %{article}.') % {:requestor => requestor.name, :article => article.name}
+  end
+
   def target_notification_message
     return nil if target.organization? && !target.moderated_articles?
-    _('%{requestor} wants to publish the article: %{article}.') % {:requestor => requestor.name, :article => article.name} + "\n\n"
+    target_notification_description + "\n\n" +
     _('You need to login on %{system} in order to approve or reject this article.') % { :system => target.environment.name }
   end
  
@@ -88,6 +88,10 @@ class CreateCommunity &lt; Task
     self.status == Task::Status::FINISHED
   end
  
+  def target_notification_description
+    _('%{requestor} wants to create community %{subject}') % {:requestor => requestor.name, :subject => subject}
+  end
+
   def target_notification_message
     _("User \"%{user}\" just requested to create community %{community}. You have to approve or reject it through the \"Pending Validations\" section in your control panel.\n") % { :user => self.requestor.name, :community => self.name }
   end
@@ -210,6 +210,10 @@ class CreateEnterprise &lt; Task
     msg
   end
  
+  def target_notification_description
+    _('%{requestor} wants to create enterprise %{subject}.') % {:requestor => requestor.name, :subject => subject}
+  end
+
   def permission
     :validate_enterprise
   end
@@ -56,9 +56,13 @@ class SuggestArticle &lt; Task
     result = {:type => :defined_image, :src => '/images/icons-app/article-minor.png', :name => article_name}
   end
  
-  def target_notification_message
+  def target_notification_description
     _('%{sender} suggested the publication of the article: %{article}.') %
-    {:sender => sender, :article => article_name} + "\n\n" +
+    {:sender => sender, :article => article_name}
+  end
+
+  def target_notification_message
+    target_notification_description + "\n\n" +
     _('You need to login on %{system} in order to approve or reject this article.') % { :system => target.environment.name }
   end
  
@@ -186,6 +186,10 @@ class Task &lt; ActiveRecord::Base
     raise NotImplementedError, "#{self} does not implement #target_notification_message"
   end
  
+  def target_notification_description
+    ''
+  end
+
   # What permission is required to perform task?
   def permission
     :perform_task
@@ -17,7 +17,7 @@ class TaskMailer &lt; ActionMailer::Base
     url_for_tasks_list = task.target.kind_of?(Environment) ? '' : url_for(task.target.url.merge(:controller => 'tasks', :action => 'index'))
  
     from self.class.generate_from(task)
-    subject '[%s] %s' % [task.environment.name, task.information]
+    subject '[%s] %s' % [task.environment.name, task.target_notification_description]
     body :target => task.target.name,
       :message => msg,
       :environment => task.environment.name,
@@ -2,31 +2,32 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
  
 class AddFriendTest < ActiveSupport::TestCase
  
+  def setup
+    @person1 = create_user('testuser1').person
+    @person2 = create_user('testuser2').person
+  end
+  attr_reader :person1, :person2
+
   should 'be a task' do
     ok { AddFriend.new.kind_of?(Task) }
   end
  
   should 'actually create friendships (two way) when confirmed' do
-    p1 = create_user('testuser1').person
-    p2 = create_user('testuser2').person
  
-    task = fast_create(AddFriend, :requestor_id => p1.id, :target_id => p2.id, :target_type => 'Person')
+    task = fast_create(AddFriend, :requestor_id => person1.id, :target_id => person2.id, :target_type => 'Person')
  
     assert_difference Friendship, :count, 2 do
       task.finish
     end
-    p1.friends.reload
-    p2.friends.reload
+    person1.friends.reload
+    person2.friends.reload
  
-    ok('p1 should have p2 as friend') { p1.friends.include?(p2) }
-    ok('p2 should have p1 as friend') { p2.friends.include?(p1) }
+    ok('person1 should have person2 as friend') { person1.friends.include?(person2) }
+    ok('person2 should have person1 as friend') { person2.friends.include?(person1) }
   end
  
   should 'put friendships in the right groups' do
-    p1 = create_user('testuser1').person
-    p2 = create_user('testuser2').person
-
-    task = fast_create(AddFriend, :requestor_id => p1, :target_id => p2.id, :target_type => 'Person')
+    task = fast_create(AddFriend, :requestor_id => person1, :target_id => person2.id, :target_type => 'Person')
     task.group_for_person = 'friend1'
     task.group_for_friend = 'friend2'
     assert task.save
@@ -35,8 +36,8 @@ class AddFriendTest &lt; ActiveSupport::TestCase
       task.finish
     end
  
-    ok('p1 should list p2 as friend1') { p1.friendships.first.group == 'friend1' }
-    ok('p2 should have p1 as friend2') { p2.friendships.first.group == 'friend2' }
+    ok('person1 should list person2 as friend1') { person1.friendships.first.group == 'friend1' }
+    ok('person2 should have person1 as friend2') { person2.friendships.first.group == 'friend2' }
   end
  
   should 'require requestor (person adding other as friend)' do
@@ -63,12 +64,9 @@ class AddFriendTest &lt; ActiveSupport::TestCase
   end
  
   should 'send e-mails' do
-    p1 = create_user('testuser1').person
-    p2 = create_user('testuser2').person
-
     TaskMailer.expects(:deliver_target_notification).at_least_once
  
-    task = AddFriend.create!(:person => p1, :friend => p2)
+    task = AddFriend.create!(:person => person1, :friend => person2)
   end
  
   should 'has permission to manage friends' do
@@ -77,18 +75,14 @@ class AddFriendTest &lt; ActiveSupport::TestCase
   end
  
   should 'not add friend twice' do
-    p1 = create_user('testuser1').person
-    p2 = create_user('testuser2').person
-    fast_create(AddFriend, :requestor_id => p1.id, :target_id => p2.id)
+    fast_create(AddFriend, :requestor_id => person1.id, :target_id => person2.id)
     assert_raise ActiveRecord::RecordInvalid do
-      AddFriend.create!(:person => p1, :friend => p2)
+      AddFriend.create!(:person => person1, :friend => person2)
     end
   end
  
   should 'override target notification message method from Task' do
-    p1 = create_user('testuser1').person
-    p2 = create_user('testuser2').person
-    task = AddFriend.new(:person => p1, :friend => p2)
+    task = AddFriend.new(:person => person1, :friend => person2)
     assert_nothing_raised NotImplementedError do
       task.target_notification_message
     end
@@ -122,5 +116,23 @@ class AddFriendTest &lt; ActiveSupport::TestCase
     assert !task.errors[:group_for_friend]
   end
  
+  should 'have target notification message if is organization and not moderated' do
+    task = AddFriend.new(:person => person1, :friend => person2)
+
+    assert_match(/wants to be your friend.*[\n]*.*to accept/, task.target_notification_message)
+  end
+
+  should 'have target notification description' do
+    task = AddFriend.new(:person => person1, :friend => person2)
+
+    assert_match(/#{task.requestor.name} wants to be your friend/, task.target_notification_description)
+  end
+
+  should 'deliver target notification message' do
+    task = AddFriend.new(:person => person1, :friend => person2)
+
+    email = TaskMailer.deliver_target_notification(task, task.target_notification_message)
+    assert_match(/#{task.requestor.name} wants to be your friend/, email.subject)
+  end
  
 end
@@ -2,19 +2,24 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
  
 class AddMemberTest < ActiveSupport::TestCase
  
+  def setup
+    @person = fast_create(Person)
+    @community = fast_create(Community)
+  end
+  attr_reader :person, :community
+
+
   should 'be a task' do
     ok { AddMember.new.kind_of?(Task) }
   end
  
   should 'actually add memberships when confirmed' do
-    p = create_user('testuser1').person
-    c = fast_create(Community, :name => 'closed community')
-    c.update_attribute(:closed, true)
+    community.update_attribute(:closed, true)
     TaskMailer.stubs(:deliver_target_notification)
-    task = fast_create(AddMember, :requestor_id => p.id, :target_id => c.id, :target_type => 'Community')
+    task = fast_create(AddMember, :requestor_id => person.id, :target_id => community.id, :target_type => 'Community')
     task.finish
  
-    assert_equal [p], c.members
+    assert_equal [person], community.members
   end
  
   should 'require requestor' do
@@ -40,13 +45,11 @@ class AddMemberTest &lt; ActiveSupport::TestCase
   end
  
   should 'send e-mails' do
-    p = create_user('testuser1').person
-    c = fast_create(Community, :name => 'closed community')
-    c.update_attribute(:closed, true)
+    community.update_attribute(:closed, true)
  
     TaskMailer.expects(:deliver_target_notification).at_least_once
  
-    task = AddMember.create!(:person => p, :organization => c)
+    task = AddMember.create!(:person => person, :organization => community)
   end
  
   should 'has permission to manage members' do
@@ -55,47 +58,56 @@ class AddMemberTest &lt; ActiveSupport::TestCase
   end
  
   should 'have roles' do
-    p = create_user('testuser1').person
-    c = fast_create(Community, :name => 'community_test')
     TaskMailer.stubs(:deliver_target_notification)
-    task = AddMember.create!(:roles => [1,2,3], :person => p, :organization => c)
+    task = AddMember.create!(:roles => [1,2,3], :person => person, :organization => community)
     assert_equal [1,2,3], task.roles
   end
  
   should 'put member with the right roles' do
-    p = create_user('testuser1').person
-    c = fast_create(Community, :name => 'community_test')
-
-    roles = [Profile::Roles.member(c.environment.id), Profile::Roles.admin(c.environment.id)]
+    roles = [Profile::Roles.member(community.environment.id), Profile::Roles.admin(community.environment.id)]
     TaskMailer.stubs(:deliver_target_notification)
-    task = AddMember.create!(:roles => roles.map(&:id), :person => p, :organization => c)
+    task = AddMember.create!(:roles => roles.map(&:id), :person => person, :organization => community)
     task.finish
  
-    current_roles = p.find_roles(c).map(&:role)
+    current_roles = person.find_roles(community).map(&:role)
     assert_includes current_roles, roles[0]
     assert_includes current_roles, roles[1]
   end
  
   should 'override target notification message method from Task' do
-    p1 = create_user('testuser1').person
-    p2 = create_user('testuser2').person
-    task = AddFriend.new(:person => p1, :friend => p2)
+    task = AddMember.new(:person => person, :organization => community)
     assert_nothing_raised NotImplementedError do
       task.target_notification_message
     end
   end
  
   should 'ignore roles with id zero' do
-    p = create_user('testuser1').person
-    c = fast_create(Community, :name => 'community_test')
-
-    role = Profile::Roles.member(c.environment.id)
+    role = Profile::Roles.member(community.environment.id)
     TaskMailer.stubs(:deliver_target_notification)
-    task = AddMember.create!(:roles => ["0", role.id, nil], :person => p, :organization => c)
+    task = AddMember.create!(:roles => ["0", role.id, nil], :person => person, :organization => community)
     task.finish
  
-    current_roles = p.find_roles(c).map(&:role)
+    current_roles = person.find_roles(community).map(&:role)
     assert_includes current_roles, role
   end
  
+  should 'have target notification message' do
+    task = AddMember.new(:person => person, :organization => community)
+
+    assert_match(/#{person.name} wants to be a member of this community.*[\n]*.*to accept or reject/, task.target_notification_message)
+  end
+
+  should 'have target notification description' do
+    task = AddMember.new(:person => person, :organization => community)
+
+    assert_match(/#{task.requestor.name} wants to be a member of this community/, task.target_notification_description)
+  end
+
+  should 'deliver target notification message' do
+    task = AddMember.new(:person => person, :organization => community)
+
+    email = TaskMailer.deliver_target_notification(task, task.target_notification_message)
+    assert_match(/#{task.requestor.name} wants to be a member of this community/, email.subject)
+  end
+
 end
@@ -330,5 +330,36 @@ class ApproveArticleTest &lt; ActiveSupport::TestCase
     assert_equal article.is_trackable?, article.class.last.is_trackable?
   end
  
+  should 'not have target notification message if it is not a moderated oganization' do
+    community.moderated_articles = false; community.save
+    task = ApproveArticle.new(:article => article, :target => community, :requestor => profile)
+
+    assert_nil task.target_notification_message
+  end
+
+  should 'have target notification message if is organization and not moderated' do
+    task = ApproveArticle.new(:article => article, :target => community, :requestor => profile)
+
+    community.expects(:moderated_articles?).returns(['true'])
+
+    assert_match(/wants to publish the article.*[\n]*.*to approve or reject/, task.target_notification_message)
+  end
+
+  should 'have target notification description' do
+    community.moderated_articles = false; community.save
+    task = ApproveArticle.new(:article => article, :target => community, :requestor => profile)
+
+    assert_match(/#{task.requestor.name} wants to publish the article: #{article.name}/, task.target_notification_description)
+  end
+
+  should 'deliver target notification message' do
+    task = ApproveArticle.new(:article => article, :target => community, :requestor => profile)
+
+    community.expects(:notification_emails).returns(['target@example.com'])
+    community.expects(:moderated_articles?).returns(['true'])
+
+    email = TaskMailer.deliver_target_notification(task, task.target_notification_message)
+    assert_match(/#{task.requestor.name} wants to publish the article: #{article.name}/, email.subject)
+  end
  
 end
@@ -83,4 +83,23 @@ class CreateCommunityTest &lt; Test::Unit::TestCase
     assert_equal 'rails.png', Community['my-new-community'].image.filename
   end
  
+  should 'have target notification message' do
+    task = CreateCommunity.new(:name => 'community test', :target => Environment.default, :requestor => person)
+
+    assert_match(/requested to create community.*to approve or reject/, task.target_notification_message)
+  end
+
+  should 'have target notification description' do
+    task = CreateCommunity.new(:name => 'community test', :target => Environment.default, :requestor => person)
+
+    assert_match(/#{task.requestor.name} wants to create community #{task.subject}/, task.target_notification_description)
+  end
+
+  should 'deliver target notification message' do
+    task = CreateCommunity.new(:name => 'community test', :target => Environment.default, :requestor => person)
+
+    email = TaskMailer.deliver_target_notification(task, task.target_notification_message)
+    assert_match(/#{task.requestor.name} wants to create community #{task.subject}/, email.subject)
+  end
+
 end
@@ -2,6 +2,11 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
  
 class CreateEnterpriseTest < Test::Unit::TestCase
  
+  def setup
+    @person = fast_create(Person)
+  end
+  attr_reader :person
+
   should 'provide needed data' do
     task = CreateEnterprise.new
  
@@ -253,4 +258,25 @@ class CreateEnterpriseTest &lt; Test::Unit::TestCase
     t = CreateEnterprise.new
     assert_equal :validate_enterprise, t.permission
   end
+
+  should 'have target notification message' do
+    task = CreateEnterprise.new(:name => 'My enterprise', :requestor => person, :target => Environment.default)
+
+    assert_match(/#{task.name}.*requested to enter #{person.environment}.*approve or reject/, task.target_notification_message)
+  end
+
+  should 'have target notification description' do
+    task = CreateEnterprise.new(:name => 'My enterprise', :requestor => person, :target => Environment.default)
+
+    assert_match(/#{task.requestor.name} wants to create enterprise #{task.subject}/, task.target_notification_description)
+  end
+
+  should 'deliver target notification message' do
+    task = CreateEnterprise.new(:name => 'My enterprise', :requestor => person, :target => Environment.default)
+
+    email = TaskMailer.deliver_target_notification(task, task.target_notification_message)
+
+    assert_match(/#{task.requestor.name} wants to create enterprise #{task.subject}/, email.subject)
+  end
+
 end
@@ -134,4 +134,25 @@ class SuggestArticleTest &lt; ActiveSupport::TestCase
     assert_equal 'some name', article.author_name
   end
  
+  should 'have target notification message' do
+    task = build(SuggestArticle, :target => @profile, :article_name => 'suggested article', :name => 'johndoe')
+
+    assert_match(/#{task.name}.*suggested the publication of the article: #{task.subject}.*[\n]*.*to approve or reject/, task.target_notification_message)
+  end
+
+  should 'have target notification description' do
+    task = build(SuggestArticle,:target => @profile, :article_name => 'suggested article', :name => 'johndoe')
+
+    assert_match(/#{task.name}.*suggested the publication of the article: #{task.subject}/, task.target_notification_description)
+  end
+
+  should 'deliver target notification message' do
+    task = build(SuggestArticle, :target => @profile, :article_name => 'suggested article', :name => 'johndoe', :email => 'johndoe@example.com')
+
+    email = TaskMailer.deliver_target_notification(task, task.target_notification_message)
+
+    assert_match(/#{task.name}.*suggested the publication of the article: #{task.subject}/, email.subject)
+  end
+
+
 end
@@ -85,7 +85,7 @@ class TaskMailerTest &lt; Test::Unit::TestCase
  
   should 'be able to send a "target notification" message' do
     task = Task.new
-    task.expects(:information).returns('the task')
+    task.expects(:target_notification_description).returns('the task')
  
     target = mock()
     target.expects(:notification_emails).returns(['target@example.com'])
@@ -232,6 +232,11 @@ class TaskTest &lt; Test::Unit::TestCase
     assert_equal task.environment, nil
   end
  
+  should 'have blank string on target_notification_description in Task base class' do
+    task = Task.new
+    assert_equal '', task.target_notification_description
+  end
+
   protected
  
   def sample_user
...	...	@@ -23,8 +23,12 @@ class AddFriend < Task
23	23	:manage_friends
24	24	end
25	25
	26	+ def target_notification_description
	27	+ _('%{requestor} wants to be your friend.') % {:requestor => requestor.name}
	28	+ end
	29	+
26	30	def target_notification_message
27		- _('%{requestor} wants to be your friend.') % {:requestor => requestor.name} + "\n\n" +
	31	+ target_notification_description + "\n\n" +
28	32	_('You need to login to %{system} in order to accept %{requestor} as your friend.') % { :system => target.environment.name, :requestor => requestor.name }
29	33	end
30	34
...	...
...	...	@@ -35,8 +35,12 @@ class AddMember < Task
35	35	:manage_memberships
36	36	end
37	37
	38	+ def target_notification_description
	39	+ _('%{requestor} wants to be a member of this community.') % {:requestor => requestor.name}
	40	+ end
	41	+
38	42	def target_notification_message
39		- _('%{requestor} wants to be a member of this community.') % {:requestor => requestor.name} + "\n\n" +
	43	+ target_notification_description + "\n\n" +
40	44	_('You will need login to %{system} in order to accept or reject %{requestor} as a member of %{organization}.') % { :system => target.environment.name, :requestor => requestor.name, :organization => organization.name }
41	45	end
42	46
...	...
...	...	@@ -117,9 +117,13 @@ class ApproveArticle < Task
117	117	article.blank?
118	118	end
119	119
	120	+ def target_notification_description
	121	+ _('%{requestor} wants to publish the article: %{article}.') % {:requestor => requestor.name, :article => article.name}
	122	+ end
	123	+
120	124	def target_notification_message
121	125	return nil if target.organization? && !target.moderated_articles?
122		- _('%{requestor} wants to publish the article: %{article}.') % {:requestor => requestor.name, :article => article.name} + "\n\n"
	126	+ target_notification_description + "\n\n" +
123	127	_('You need to login on %{system} in order to approve or reject this article.') % { :system => target.environment.name }
124	128	end
125	129
...	...
...	...	@@ -88,6 +88,10 @@ class CreateCommunity < Task
88	88	self.status == Task::Status::FINISHED
89	89	end
90	90
	91	+ def target_notification_description
	92	+ _('%{requestor} wants to create community %{subject}') % {:requestor => requestor.name, :subject => subject}
	93	+ end
	94	+
91	95	def target_notification_message
92	96	_("User \"%{user}\" just requested to create community %{community}. You have to approve or reject it through the \"Pending Validations\" section in your control panel.\n") % { :user => self.requestor.name, :community => self.name }
93	97	end
...	...
...	...	@@ -210,6 +210,10 @@ class CreateEnterprise < Task
210	210	msg
211	211	end
212	212
	213	+ def target_notification_description
	214	+ _('%{requestor} wants to create enterprise %{subject}.') % {:requestor => requestor.name, :subject => subject}
	215	+ end
	216	+
213	217	def permission
214	218	:validate_enterprise
215	219	end
...	...
...	...	@@ -56,9 +56,13 @@ class SuggestArticle < Task
56	56	result = {:type => :defined_image, :src => '/images/icons-app/article-minor.png', :name => article_name}
57	57	end
58	58
59		- def target_notification_message
	59	+ def target_notification_description
60	60	_('%{sender} suggested the publication of the article: %{article}.') %
61		- {:sender => sender, :article => article_name} + "\n\n" +
	61	+ {:sender => sender, :article => article_name}
	62	+ end
	63	+
	64	+ def target_notification_message
	65	+ target_notification_description + "\n\n" +
62	66	_('You need to login on %{system} in order to approve or reject this article.') % { :system => target.environment.name }
63	67	end
64	68
...	...
...	...	@@ -186,6 +186,10 @@ class Task < ActiveRecord::Base
186	186	raise NotImplementedError, "#{self} does not implement #target_notification_message"
187	187	end
188	188
	189	+ def target_notification_description
	190	+ ''
	191	+ end
	192	+
189	193	# What permission is required to perform task?
190	194	def permission
191	195	:perform_task
...	...
...	...	@@ -17,7 +17,7 @@ class TaskMailer < ActionMailer::Base
17	17	url_for_tasks_list = task.target.kind_of?(Environment) ? '' : url_for(task.target.url.merge(:controller => 'tasks', :action => 'index'))
18	18
19	19	from self.class.generate_from(task)
20		- subject '[%s] %s' % [task.environment.name, task.information]
	20	+ subject '[%s] %s' % [task.environment.name, task.target_notification_description]
21	21	body :target => task.target.name,
22	22	:message => msg,
23	23	:environment => task.environment.name,
...	...
...	...	@@ -2,31 +2,32 @@ require File.dirname(__FILE__) + '/../test_helper'
2	2
3	3	class AddFriendTest < ActiveSupport::TestCase
4	4
	5	+ def setup
	6	+ @person1 = create_user('testuser1').person
	7	+ @person2 = create_user('testuser2').person
	8	+ end
	9	+ attr_reader :person1, :person2
	10	+
5	11	should 'be a task' do
6	12	ok { AddFriend.new.kind_of?(Task) }
7	13	end
8	14
9	15	should 'actually create friendships (two way) when confirmed' do
10		- p1 = create_user('testuser1').person
11		- p2 = create_user('testuser2').person
12	16
13		- task = fast_create(AddFriend, :requestor_id => p1.id, :target_id => p2.id, :target_type => 'Person')
	17	+ task = fast_create(AddFriend, :requestor_id => person1.id, :target_id => person2.id, :target_type => 'Person')
14	18
15	19	assert_difference Friendship, :count, 2 do
16	20	task.finish
17	21	end
18		- p1.friends.reload
19		- p2.friends.reload
	22	+ person1.friends.reload
	23	+ person2.friends.reload
20	24
21		- ok('p1 should have p2 as friend') { p1.friends.include?(p2) }
22		- ok('p2 should have p1 as friend') { p2.friends.include?(p1) }
	25	+ ok('person1 should have person2 as friend') { person1.friends.include?(person2) }
	26	+ ok('person2 should have person1 as friend') { person2.friends.include?(person1) }
23	27	end
24	28
25	29	should 'put friendships in the right groups' do
26		- p1 = create_user('testuser1').person
27		- p2 = create_user('testuser2').person
28		-
29		- task = fast_create(AddFriend, :requestor_id => p1, :target_id => p2.id, :target_type => 'Person')
	30	+ task = fast_create(AddFriend, :requestor_id => person1, :target_id => person2.id, :target_type => 'Person')
30	31	task.group_for_person = 'friend1'
31	32	task.group_for_friend = 'friend2'
32	33	assert task.save
...	...	@@ -35,8 +36,8 @@ class AddFriendTest < ActiveSupport::TestCase
35	36	task.finish
36	37	end
37	38
38		- ok('p1 should list p2 as friend1') { p1.friendships.first.group == 'friend1' }
39		- ok('p2 should have p1 as friend2') { p2.friendships.first.group == 'friend2' }
	39	+ ok('person1 should list person2 as friend1') { person1.friendships.first.group == 'friend1' }
	40	+ ok('person2 should have person1 as friend2') { person2.friendships.first.group == 'friend2' }
40	41	end
41	42
42	43	should 'require requestor (person adding other as friend)' do
...	...	@@ -63,12 +64,9 @@ class AddFriendTest < ActiveSupport::TestCase
63	64	end
64	65
65	66	should 'send e-mails' do
66		- p1 = create_user('testuser1').person
67		- p2 = create_user('testuser2').person
68		-
69	67	TaskMailer.expects(:deliver_target_notification).at_least_once
70	68
71		- task = AddFriend.create!(:person => p1, :friend => p2)
	69	+ task = AddFriend.create!(:person => person1, :friend => person2)
72	70	end
73	71
74	72	should 'has permission to manage friends' do
...	...	@@ -77,18 +75,14 @@ class AddFriendTest < ActiveSupport::TestCase
77	75	end
78	76
79	77	should 'not add friend twice' do
80		- p1 = create_user('testuser1').person
81		- p2 = create_user('testuser2').person
82		- fast_create(AddFriend, :requestor_id => p1.id, :target_id => p2.id)
	78	+ fast_create(AddFriend, :requestor_id => person1.id, :target_id => person2.id)
83	79	assert_raise ActiveRecord::RecordInvalid do
84		- AddFriend.create!(:person => p1, :friend => p2)
	80	+ AddFriend.create!(:person => person1, :friend => person2)
85	81	end
86	82	end
87	83
88	84	should 'override target notification message method from Task' do
89		- p1 = create_user('testuser1').person
90		- p2 = create_user('testuser2').person
91		- task = AddFriend.new(:person => p1, :friend => p2)
	85	+ task = AddFriend.new(:person => person1, :friend => person2)
92	86	assert_nothing_raised NotImplementedError do
93	87	task.target_notification_message
94	88	end
...	...	@@ -122,5 +116,23 @@ class AddFriendTest < ActiveSupport::TestCase
122	116	assert !task.errors[:group_for_friend]
123	117	end
124	118
	119	+ should 'have target notification message if is organization and not moderated' do
	120	+ task = AddFriend.new(:person => person1, :friend => person2)
	121	+
	122	+ assert_match(/wants to be your friend.[\n].*to accept/, task.target_notification_message)
	123	+ end
	124	+
	125	+ should 'have target notification description' do
	126	+ task = AddFriend.new(:person => person1, :friend => person2)
	127	+
	128	+ assert_match(/#{task.requestor.name} wants to be your friend/, task.target_notification_description)
	129	+ end
	130	+
	131	+ should 'deliver target notification message' do
	132	+ task = AddFriend.new(:person => person1, :friend => person2)
	133	+
	134	+ email = TaskMailer.deliver_target_notification(task, task.target_notification_message)
	135	+ assert_match(/#{task.requestor.name} wants to be your friend/, email.subject)
	136	+ end
125	137
126	138	end
...	...
...	...	@@ -2,19 +2,24 @@ require File.dirname(__FILE__) + '/../test_helper'
2	2
3	3	class AddMemberTest < ActiveSupport::TestCase
4	4
	5	+ def setup
	6	+ @person = fast_create(Person)
	7	+ @community = fast_create(Community)
	8	+ end
	9	+ attr_reader :person, :community
	10	+
	11	+
5	12	should 'be a task' do
6	13	ok { AddMember.new.kind_of?(Task) }
7	14	end
8	15
9	16	should 'actually add memberships when confirmed' do
10		- p = create_user('testuser1').person
11		- c = fast_create(Community, :name => 'closed community')
12		- c.update_attribute(:closed, true)
	17	+ community.update_attribute(:closed, true)
13	18	TaskMailer.stubs(:deliver_target_notification)
14		- task = fast_create(AddMember, :requestor_id => p.id, :target_id => c.id, :target_type => 'Community')
	19	+ task = fast_create(AddMember, :requestor_id => person.id, :target_id => community.id, :target_type => 'Community')
15	20	task.finish
16	21
17		- assert_equal [p], c.members
	22	+ assert_equal [person], community.members
18	23	end
19	24
20	25	should 'require requestor' do
...	...	@@ -40,13 +45,11 @@ class AddMemberTest < ActiveSupport::TestCase
40	45	end
41	46
42	47	should 'send e-mails' do
43		- p = create_user('testuser1').person
44		- c = fast_create(Community, :name => 'closed community')
45		- c.update_attribute(:closed, true)
	48	+ community.update_attribute(:closed, true)
46	49
47	50	TaskMailer.expects(:deliver_target_notification).at_least_once
48	51
49		- task = AddMember.create!(:person => p, :organization => c)
	52	+ task = AddMember.create!(:person => person, :organization => community)
50	53	end
51	54
52	55	should 'has permission to manage members' do
...	...	@@ -55,47 +58,56 @@ class AddMemberTest < ActiveSupport::TestCase
55	58	end
56	59
57	60	should 'have roles' do
58		- p = create_user('testuser1').person
59		- c = fast_create(Community, :name => 'community_test')
60	61	TaskMailer.stubs(:deliver_target_notification)
61		- task = AddMember.create!(:roles => [1,2,3], :person => p, :organization => c)
	62	+ task = AddMember.create!(:roles => [1,2,3], :person => person, :organization => community)
62	63	assert_equal [1,2,3], task.roles
63	64	end
64	65
65	66	should 'put member with the right roles' do
66		- p = create_user('testuser1').person
67		- c = fast_create(Community, :name => 'community_test')
68		-
69		- roles = [Profile::Roles.member(c.environment.id), Profile::Roles.admin(c.environment.id)]
	67	+ roles = [Profile::Roles.member(community.environment.id), Profile::Roles.admin(community.environment.id)]
70	68	TaskMailer.stubs(:deliver_target_notification)
71		- task = AddMember.create!(:roles => roles.map(&:id), :person => p, :organization => c)
	69	+ task = AddMember.create!(:roles => roles.map(&:id), :person => person, :organization => community)
72	70	task.finish
73	71
74		- current_roles = p.find_roles(c).map(&:role)
	72	+ current_roles = person.find_roles(community).map(&:role)
75	73	assert_includes current_roles, roles[0]
76	74	assert_includes current_roles, roles[1]
77	75	end
78	76
79	77	should 'override target notification message method from Task' do
80		- p1 = create_user('testuser1').person
81		- p2 = create_user('testuser2').person
82		- task = AddFriend.new(:person => p1, :friend => p2)
	78	+ task = AddMember.new(:person => person, :organization => community)
83	79	assert_nothing_raised NotImplementedError do
84	80	task.target_notification_message
85	81	end
86	82	end
87	83
88	84	should 'ignore roles with id zero' do
89		- p = create_user('testuser1').person
90		- c = fast_create(Community, :name => 'community_test')
91		-
92		- role = Profile::Roles.member(c.environment.id)
	85	+ role = Profile::Roles.member(community.environment.id)
93	86	TaskMailer.stubs(:deliver_target_notification)
94		- task = AddMember.create!(:roles => ["0", role.id, nil], :person => p, :organization => c)
	87	+ task = AddMember.create!(:roles => ["0", role.id, nil], :person => person, :organization => community)
95	88	task.finish
96	89
97		- current_roles = p.find_roles(c).map(&:role)
	90	+ current_roles = person.find_roles(community).map(&:role)
98	91	assert_includes current_roles, role
99	92	end
100	93
	94	+ should 'have target notification message' do
	95	+ task = AddMember.new(:person => person, :organization => community)
	96	+
	97	+ assert_match(/#{person.name} wants to be a member of this community.[\n].*to accept or reject/, task.target_notification_message)
	98	+ end
	99	+
	100	+ should 'have target notification description' do
	101	+ task = AddMember.new(:person => person, :organization => community)
	102	+
	103	+ assert_match(/#{task.requestor.name} wants to be a member of this community/, task.target_notification_description)
	104	+ end
	105	+
	106	+ should 'deliver target notification message' do
	107	+ task = AddMember.new(:person => person, :organization => community)
	108	+
	109	+ email = TaskMailer.deliver_target_notification(task, task.target_notification_message)
	110	+ assert_match(/#{task.requestor.name} wants to be a member of this community/, email.subject)
	111	+ end
	112	+
101	113	end
...	...