rails3: fix organization_mailing

Rodrigo Souto
1 parent bd238bbe
Showing 3 changed files with 49 additions and 51 deletions Show diff stats
app/mailers/organization_mailing.rb
app/models/organization_mailing.rb
test/unit/organization_mailing_test.rb
@@ -0,0 +1,30 @@
+class OrganizationMailing < Mailing
+
+  def generate_from
+    "#{person.name} <#{source.environment.contact_email}>"
+  end
+
+  def recipients(offset=0, limit=100)
+    source.members.all(:order => :id, :offset => offset, :limit => limit, :joins => "LEFT OUTER JOIN mailing_sents m ON (m.mailing_id = #{id} AND m.person_id = profiles.id)", :conditions => { "m.person_id" => nil })
+  end
+
+  def each_recipient
+    offset = 0
+    limit = 50
+    while !(people = recipients(offset, limit)).empty?
+      people.each do |person|
+        yield person
+      end
+      offset = offset + limit
+    end
+  end
+
+  def signature_message
+    _('Sent by community %s.') % source.name
+  end
+
+  include Rails.application.routes.url_helpers
+  def url
+    url_for(source.url)
+  end
+end
@@ -1,30 +0,0 @@
-class OrganizationMailing < Mailing
-
-  def generate_from
-    "#{person.name} <#{source.environment.contact_email}>"
-  end
-
-  def recipients(offset=0, limit=100)
-   source.members.all(:order => :id, :offset => offset, :limit => limit, :joins => "LEFT OUTER JOIN mailing_sents m ON (m.mailing_id = #{id} AND m.person_id = profiles.id)", :conditions => { "m.person_id" => nil })
-  end
-
-  def each_recipient
-    offset = 0
-    limit = 50
-    while !(people = recipients(offset, limit)).empty?
-      people.each do |person|
-          yield person
-      end
-      offset = offset + limit
-    end
-  end
-
-  def signature_message
-    _('Sent by community %s.') % source.name
-  end
-
-  include Rails.application.routes.url_helpers
-  def url
-    url_for(source.url)
-  end
-end
@@ -26,92 +26,90 @@ class OrganizationMailingTest &lt; ActiveSupport::TestCase
   end
   should 'return community name' do
-    mailing = OrganizationMailing.new(:source => community)
+    mailing = build(OrganizationMailing, :source => community)
     assert_equal community.name, mailing.source.name
   end
   should 'return community with source_id' do
-    mailing = OrganizationMailing.new(:source => community)
+    mailing = build(OrganizationMailing, :source => community)
     assert_equal community, mailing.source
   end
   should 'return person with person_id' do
-    mailing = OrganizationMailing.new(:source => community, :person => person)
+    mailing = build(OrganizationMailing, :source => community, :person => person)
     assert_equal person, mailing.person
   end
   should 'display name and email on generate_from' do
-    mailing = OrganizationMailing.new(:source => community, :person => person)
+    mailing = build(OrganizationMailing, :source => community, :person => person)
     assert_equal "#{person.name} <#{community.environment.contact_email}>", mailing.generate_from
   end
   should 'generate subject' do
-    mailing = OrganizationMailing.new(:source => community, :subject => 'Hello :)')
+    mailing = build(OrganizationMailing, :source => community, :subject => 'Hello :)')
     assert_equal "[#{community.name}] #{mailing.subject}", mailing.generate_subject
   end
   should 'return signature message' do
-    mailing = OrganizationMailing.new(:source => community)
+    mailing = build(OrganizationMailing, :source => community)
     assert_equal "Sent by community #{community.name}.", mailing.signature_message
   end
   should 'return url for organization on url' do
-    mailing = OrganizationMailing.new(:source => community)
-    assert_equal "#{community.environment.top_url}/#{community.name.to_slug}", mailing.url
+    mailing = build(OrganizationMailing, :source => community)
+    assert_equal "#{community.environment.top_url}/#{community.name.to_slug}/", mailing.url
   end
   should 'deliver mailing to each member after create' do
-    mailing = OrganizationMailing.create(:source => community, :subject => 'Hello', :body => 'We have some news', :person => person)
+    create(OrganizationMailing, :source => community, :subject => 'Hello', :body => 'We have some news', :person => person)
     process_delayed_job_queue
-    assert_equal 2, ActionMailer::Base.deliveries.count
+    assert_equal community.members.compact.count, ActionMailer::Base.deliveries.count
   end
   should 'deliver mailing when there are many mailings created' do
-    50.times { OrganizationMailing.create(:source => community, :subject => 'Hello', :body => 'We have some news', :person => person) }
+    50.times { create(OrganizationMailing, :source => community, :subject => 'Hello', :body => 'We have some news', :person => person) }
     process_delayed_job_queue
-    assert_equal 50*community.members_count, ActionMailer::Base.deliveries.count
+    assert_equal 50*community.members.compact.count, ActionMailer::Base.deliveries.count
   end
   should 'create mailing sent to each recipient after delivering mailing' do
-    mailing = OrganizationMailing.create(:source => community, :subject => 'Hello', :body => 'We have some news', :person => person)
+    mailing = create(OrganizationMailing, :source => community, :subject => 'Hello', :body => 'We have some news', :person => person)
     assert_difference MailingSent, :count, 2 do
       process_delayed_job_queue
     end
   end
   should 'change locale according to the mailing locale' do
-    mailing = OrganizationMailing.create(:source => community, :subject => 'Hello', :body => 'We have some news', :locale => 'pt', :person => person)
+    mailing = create(OrganizationMailing, :source => community, :subject => 'Hello', :body => 'We have some news', :locale => 'pt', :person => person)
     Noosfero.expects(:with_locale).with('pt')
     process_delayed_job_queue
   end
   should 'have community by source_id' do
-    mailing = community.mailings.build(:source => community, :subject => 'Hello', :body => 'We have some news', :person => person)
-    mailing.save!
-
+    mailing = create(OrganizationMailing, :source => community, :subject => 'Hello', :body => 'We have some news', :person => person)
     assert_equal community, Mailing.find(mailing.id).source
   end
   should 'return recipient' do
-    mailing = OrganizationMailing.create(:source => community, :subject => 'Hello', :body => 'We have some news', :person => person)
+    mailing = create(OrganizationMailing, :source => community, :subject => 'Hello', :body => 'We have some news', :person => person)
     assert_equal [Person['user_one'], Person['user_two']], mailing.recipients
   end
   should 'return recipients according to limit' do
-    mailing = OrganizationMailing.create(:source => community, :subject => 'Hello', :body => 'We have some news', :person => person)
+    mailing = create(OrganizationMailing, :source => community, :subject => 'Hello', :body => 'We have some news', :person => person)
     assert_equal [Person['user_one']], mailing.recipients(0, 1)
   end
   should 'return true if already sent mailing to a recipient' do
     member = Person['user_one']
-    mailing = OrganizationMailing.create(:source => community, :subject => 'Hello', :body => 'We have some news', :person => person)
+    mailing = create(OrganizationMailing, :source => community, :subject => 'Hello', :body => 'We have some news', :person => person)
     process_delayed_job_queue
     assert mailing.mailing_sents.find_by_person_id(member.id)
   end
   should 'return false if did not sent mailing to a recipient' do
     recipient = fast_create(Person)
-    mailing = OrganizationMailing.create(:source => community, :subject => 'Hello', :body => 'We have some news', :person => person)
+    mailing = create(OrganizationMailing, :source => community, :subject => 'Hello', :body => 'We have some news', :person => person)
     process_delayed_job_queue
     assert !mailing.mailing_sents.find_by_person_id(recipient.id)
@@ -0,0 +1,30 @@		@@ -0,0 +1,30 @@
	1	+class OrganizationMailing < Mailing
	2	+
	3	+ def generate_from
	4	+ "#{person.name} <#{source.environment.contact_email}>"
	5	+ end
	6	+
	7	+ def recipients(offset=0, limit=100)
	8	+ source.members.all(:order => :id, :offset => offset, :limit => limit, :joins => "LEFT OUTER JOIN mailing_sents m ON (m.mailing_id = #{id} AND m.person_id = profiles.id)", :conditions => { "m.person_id" => nil })
	9	+ end
	10	+
	11	+ def each_recipient
	12	+ offset = 0
	13	+ limit = 50
	14	+ while !(people = recipients(offset, limit)).empty?
	15	+ people.each do \|person\|
	16	+ yield person
	17	+ end
	18	+ offset = offset + limit
	19	+ end
	20	+ end
	21	+
	22	+ def signature_message
	23	+ _('Sent by community %s.') % source.name
	24	+ end
	25	+
	26	+ include Rails.application.routes.url_helpers
	27	+ def url
	28	+ url_for(source.url)
	29	+ end
	30	+end
	@@ -1,30 +0,0 @@	@@ -1,30 +0,0 @@
1	-class OrganizationMailing < Mailing
2	-
3	- def generate_from
4	- "#{person.name} <#{source.environment.contact_email}>"
5	- end
6	-
7	- def recipients(offset=0, limit=100)
8	- source.members.all(:order => :id, :offset => offset, :limit => limit, :joins => "LEFT OUTER JOIN mailing_sents m ON (m.mailing_id = #{id} AND m.person_id = profiles.id)", :conditions => { "m.person_id" => nil })
9	- end
10	-
11	- def each_recipient
12	- offset = 0
13	- limit = 50
14	- while !(people = recipients(offset, limit)).empty?
15	- people.each do \|person\|
16	- yield person
17	- end
18	- offset = offset + limit
19	- end
20	- end
21	-
22	- def signature_message
23	- _('Sent by community %s.') % source.name
24	- end
25	-
26	- include Rails.application.routes.url_helpers
27	- def url
28	- url_for(source.url)
29	- end
30	-end