0
@@ -32,11 +32,15 @@ private
0
   def send_mail(newsletter, page)
0
     subject = "[#{newsletter.config["subject_prefix"]}] #{page.title}"
0
     html_body = page.render    
0
-    from = newsletter.config["from"]
0
-    newsletter.recipients.each do |address|
0
-      recipients = address
0
-      email = NewsletterMailer.create_newsletter(subject, html_body, recipients, from)
0
-      NewsletterMailer.deliver(email)
0
+    from = newsletter.config["from"]    
0
+    newsletter.recipients.each do |address|      
0
+      mail = NewsletterMailer.create_newsletter(subject, html_body, address, from)
0
+      NewsletterEmail.create({
0
+        :page_id        => page.id,
0
+        :mail           => mail.encoded, 
0
+        :to             => address,
0
+        :from           => from
0
+      })
0
     end        
0
   end     
0
   

0
@@ -3,6 +3,7 @@
0
   <h2>Newsletter:</h2>
0
   <div class="form-area">
0
     <ul>
0
+      <li><strong>Queue</strong>: <%= NewsletterEmail.count(:conditions => ["page_id = ?", @page.id]) %></li>
0
       <li><strong>Active subscribers</strong>: <%= newsletter.active_subscribers.count %></li>
0
     </ul>
0
     <% form_tag({:controller => '/newsletter', :action => 'new', :page_id => @page.id}) do %>

0
@@ -19,4 +19,4 @@ class CreateNewsletterSubscribers < ActiveRecord::Migration
0
   def self.down
0
     drop_table :newsletter_subscribers
0
   end
0
-end
0
+end
0
\ No newline at end of file

0
@@ -32,3 +32,12 @@ first_email_for_newsletter:
0
   status_id: 100
0
   parent_id: 2
0
   published_at: <%= 1.day.ago.to_s :db %>
0
+second_email_for_newsletter:
0
+  id: 5
0
+  title: Second email for Newsletter
0
+  breadcrumb: second-email-for-newsletter
0
+  slug: second-email-for-newsletter
0
+  status_id: 100
0
+  parent_id: 2
0
+  published_at: <%= 1.day.ago.to_s :db %>
0
+  
0
\ No newline at end of file

0
@@ -48,15 +48,18 @@ class NewsletterControllerTest < Test::Unit::TestCase
0
   end
0
   
0
   def test_create_should_send_emails_if_page_is_child_of_a_newsletter_page
0
-    post :create, :page_id => pages(:first_email_for_newsletter).id
0
-    assert_response :redirect, :controller => '/admin/page', :action => 'edit', :id => pages(:first_email_for_newsletter).id
0
-    assert_equal 2, ActionMailer::Base.deliveries.size
0
-    mail    = ActionMailer::Base.deliveries[0]
0
-    mail_2  = ActionMailer::Base.deliveries[1]
0
-    assert_equal "[#{pages(:first_email_for_newsletter).parent.config["subject_prefix"]}] #{pages(:first_email_for_newsletter).title}", mail.header["subject"].body
0
-    assert_equal "Tom <tom@example.com>", mail.header["to"].body
0
-    assert_equal "Mike <mike@example.com>", mail_2.header["to"].body
0
-    assert_equal "Hello from the first newsletter", mail.body
0
+    subscribers_count = pages(:newsletter).active_subscribers.count
0
+    assert_difference NewsletterEmail, :count, subscribers_count * 2 do
0
+      post :create, :page_id => pages(:first_email_for_newsletter).id
0
+      assert_redirected_to :controller => '/admin/page', :action => 'edit', :id => pages(:first_email_for_newsletter).id      
0
+      assert_equal subscribers_count, NewsletterEmail.count(:conditions => ["page_id = ?", pages(:first_email_for_newsletter).id])
0
+      assert_equal pages(:first_email_for_newsletter), NewsletterEmail.find(:first).page
0
+      
0
+      post :create, :page_id => pages(:second_email_for_newsletter).id
0
+      assert_redirected_to :controller => '/admin/page', :action => 'edit', :id => pages(:first_email_for_newsletter).id
0
+      assert_equal subscribers_count, NewsletterEmail.count(:conditions => ["page_id = ?", pages(:second_email_for_newsletter).id])
0
+      assert_equal pages(:second_email_for_newsletter), NewsletterEmail.find(:all).last.page
0
+    end    
0
   end
0
   
0
 end