rails3: fix pending_task_notifier

Rodrigo Souto
1 parent 990b96ad
Showing 3 changed files with 22 additions and 19 deletions Show diff stats
app/mailers/pending_task_notifier.rb
app/models/pending_task_notifier.rb
test/unit/pending_task_notifier_test.rb
@@ -0,0 +1,19 @@
+class PendingTaskNotifier < ActionMailer::Base
+
+  def notification(person)
+    @person = person
+    @tasks = person.tasks.pending
+    @organizations_with_pending_tasks = person.organizations_with_pending_tasks
+    @environment = person.environment.name
+    @url = url_for(:host => person.environment.default_hostname, :controller => 'home')
+    @default_hostname = person.environment.default_hostname
+    @url_for_pending_tasks = url_for(:host => person.environment.default_hostname, :controller => 'tasks', :profile => person.identifier)
+
+    mail(
+      to: person.email,
+      from: "#{person.environment.name} <#{person.environment.contact_email}>",
+      subject: _("[%s] Pending tasks") % person.environment.name
+    )
+  end
+
+end
@@ -1,16 +0,0 @@
-class PendingTaskNotifier < ActionMailer::Base
-
-  def notification(person)
-    recipients person.email
-    from "#{person.environment.name} <#{person.environment.contact_email}>"
-    subject _("[%s] Pending tasks") % person.environment.name
-    body :person => person,
-      :tasks => person.tasks.pending,
-      :organizations_with_pending_tasks => person.organizations_with_pending_tasks,
-      :environment => person.environment.name,
-      :url => url_for(:host => person.environment.default_hostname, :controller => 'home'),
-      :default_hostname => person.environment.default_hostname,
-      :url_for_pending_tasks => url_for(:host => person.environment.default_hostname, :controller => 'tasks', :profile => person.identifier)
-  end
-
-end
@@ -14,7 +14,7 @@ class PendingTaskNotifierTest &lt; ActiveSupport::TestCase
   should 'be able to deliver notification' do
     env = Environment.default
     p = create_user('maelcum').person
-    response = PendingTaskNotifier.deliver_notification(p)
+    response = PendingTaskNotifier.notification(p).deliver
     assert_equal "[#{env.name}] Pending tasks", response.subject
     assert_equal p.email, response.to[0]
   end
@@ -25,8 +25,8 @@ class PendingTaskNotifierTest &lt; ActiveSupport::TestCase
     c.add_admin(p)
     c.tasks << Task.new(:requestor => p)
-    response = PendingTaskNotifier.deliver_notification(p)
-    assert_match /sent you a task/, response.body
+    response = PendingTaskNotifier.notification(p).deliver
+    assert_match /sent you a task/, response.body.to_s
   end
   private
@@ -0,0 +1,19 @@		@@ -0,0 +1,19 @@
	1	+class PendingTaskNotifier < ActionMailer::Base
	2	+
	3	+ def notification(person)
	4	+ @person = person
	5	+ @tasks = person.tasks.pending
	6	+ @organizations_with_pending_tasks = person.organizations_with_pending_tasks
	7	+ @environment = person.environment.name
	8	+ @url = url_for(:host => person.environment.default_hostname, :controller => 'home')
	9	+ @default_hostname = person.environment.default_hostname
	10	+ @url_for_pending_tasks = url_for(:host => person.environment.default_hostname, :controller => 'tasks', :profile => person.identifier)
	11	+
	12	+ mail(
	13	+ to: person.email,
	14	+ from: "#{person.environment.name} <#{person.environment.contact_email}>",
	15	+ subject: _("[%s] Pending tasks") % person.environment.name
	16	+ )
	17	+ end
	18	+
	19	+end
	@@ -1,16 +0,0 @@	@@ -1,16 +0,0 @@
1	-class PendingTaskNotifier < ActionMailer::Base
2	-
3	- def notification(person)
4	- recipients person.email
5	- from "#{person.environment.name} <#{person.environment.contact_email}>"
6	- subject _("[%s] Pending tasks") % person.environment.name
7	- body :person => person,
8	- :tasks => person.tasks.pending,
9	- :organizations_with_pending_tasks => person.organizations_with_pending_tasks,
10	- :environment => person.environment.name,
11	- :url => url_for(:host => person.environment.default_hostname, :controller => 'home'),
12	- :default_hostname => person.environment.default_hostname,
13	- :url_for_pending_tasks => url_for(:host => person.environment.default_hostname, :controller => 'tasks', :profile => person.identifier)
14	- end
15	-
16	-end