rails3: fix user unit tests

Change the way of sending signup mail

rails3: fix user unit tests
Change the way of sending signup mail
Victor Costa
1 parent a0b2a343
Showing 3 changed files with 13 additions and 5 deletions Show diff stats
app/mailers/user_mailer.rb
app/models/user.rb
test/unit/user_test.rb
@@ -34,7 +34,14 @@ class UserMailer &lt; ActionMailer::Base
       content_type: 'text/html',
       to: user.email,
       from: "#{user.environment.name} <#{user.environment.contact_email}>",
-      subject: email_subject.blank? ? _("Welcome to environment %s") % [user.environment.name] : email_subject
+      subject: email_subject.blank? ? _("Welcome to environment %s") % [user.environment.name] : email_subject,
+      body: @body
     )
   end
+
+  class Job < Struct.new(:user, :method)
+    def perform
+      UserMailer.send(method, user).deliver
+    end
+  end
 end
@@ -113,7 +113,7 @@ class User &lt; ActiveRecord::Base
       false
     else
       if environment.enabled?('send_welcome_email_to_new_users') && environment.has_signup_welcome_text?
-        UserMailer.delay.signup_welcome_email(self)
+        Delayed::Job.enqueue(UserMailer::Job.new(self, :signup_welcome_email))
       end
       true
     end
@@ -517,9 +517,8 @@ class UserTest &lt; ActiveSupport::TestCase
   end
   should 'delay activation check' do
-    assert_difference 'Delayed::Job.count', 1 do
-      user = new_user
-    end
+    user = new_user
+    assert_match /UserActivationJob/, Delayed::Job.last.handler
   end
   should 'deactivate an user' do
@@ -605,6 +604,7 @@ class UserTest &lt; ActiveSupport::TestCase
     user = new_user :email => 'pending@activation.com'
     assert_difference 'ActionMailer::Base.deliveries.size', 1 do
       user.activate
+      process_delayed_job_queue
     end
     sent = ActionMailer::Base.deliveries.last
@@ -623,6 +623,7 @@ class UserTest &lt; ActiveSupport::TestCase
     user = new_user :name => 'John Doe', :email => 'pending@activation.com'
     assert_difference 'ActionMailer::Base.deliveries.size', 1 do
       user.activate
+      process_delayed_job_queue
     end
     sent = ActionMailer::Base.deliveries.last
	@@ -34,7 +34,14 @@ class UserMailer < ActionMailer::Base		@@ -34,7 +34,14 @@ class UserMailer < ActionMailer::Base
34	content_type: 'text/html',	34	content_type: 'text/html',
35	to: user.email,	35	to: user.email,
36	from: "#{user.environment.name} <#{user.environment.contact_email}>",	36	from: "#{user.environment.name} <#{user.environment.contact_email}>",
37	- subject: email_subject.blank? ? _("Welcome to environment %s") % [user.environment.name] : email_subject	37	+ subject: email_subject.blank? ? _("Welcome to environment %s") % [user.environment.name] : email_subject,
		38	+ body: @body
38	)	39	)
39	end	40	end
		41	+
		42	+ class Job < Struct.new(:user, :method)
		43	+ def perform
		44	+ UserMailer.send(method, user).deliver
		45	+ end
		46	+ end
40	end	47	end
	@@ -113,7 +113,7 @@ class User < ActiveRecord::Base		@@ -113,7 +113,7 @@ class User < ActiveRecord::Base
113	false	113	false
114	else	114	else
115	if environment.enabled?('send_welcome_email_to_new_users') && environment.has_signup_welcome_text?	115	if environment.enabled?('send_welcome_email_to_new_users') && environment.has_signup_welcome_text?
116	- UserMailer.delay.signup_welcome_email(self)	116	+ Delayed::Job.enqueue(UserMailer::Job.new(self, :signup_welcome_email))
117	end	117	end
118	true	118	true
119	end	119	end