extended specs and made them work

PragTob · PragTob · commit 6c7621e6fa04 · 2013-10-11T23:46:04.000+02:00
diff --git a/app/controllers/mailer_controller.rb b/app/controllers/mailer_controller.rb
@@ -1,7 +1,7 @@
 class MailerController < ApplicationController
   def new
     @users = Array(params[:user])
-    @emails = User.where(:username => @users).all.map(&:email);
+    @emails = User.where(:username => @users).all.map(&:email)
   	@message = Message.new
   end
 
@@ -14,8 +14,7 @@ def create
       end
   		redirect_to users_index_path, :notice => "Email sent correctly"
   	else
-  		notice = "There was an error"
-  		render :new
-  	end
+  		render :new, notice: "There was an error"
+    end
   end
 end
diff --git a/app/models/message.rb b/app/models/message.rb
@@ -4,4 +4,8 @@ class Message
 	key :subject, String
 	key :body, String
 	validates_presence_of :email, :body
+
+  def to_param
+    {email: email, subject: subject, body: body}
+  end
 end
diff --git a/spec/controllers/mailer_controller_spec.rb b/spec/controllers/mailer_controller_spec.rb
@@ -6,39 +6,54 @@
 
   describe "GET 'new' for a single user email" do
     it "returns http success" do
-      get 'new', user: Array(user)
+      get :new, user: Array(user)
       response.should be_success
     end
   end
 
   describe "GET 'new' for a diffusion" do
     it "returns http success" do
-      get 'new', user: Array(users)
+      get :new, user: Array(users)
       response.should be_success
     end
   end
 
   describe "POST 'create' for a single user email" do
-    it "returns http success" do
+    before :each do
       @message = Fabricate.build(:message)
-      post 'create', message: @message
-      response.should be_success
-      #We expect after send a message that the deliveries raise one
-      expect { MessageMailer.new_message(@message, @message.email).deliver }.to change { ActionMailer::Base.deliveries.size }.by(1)
+    end
+
+    it 'delivers the email' do
+      expect {
+        post :create, message: @message
+      }.to change {ActionMailer::Base.deliveries.size}.by(1)
+    end
+
+    describe 'delivered message' do
+      before :each do
+        post :create, message: @message
+      end
+
+      it "returns http success" do
+        response.should be_redirect
+      end
+
+      it 'delivers the mail with the subject that we wanted to' do
+        ActionMailer::Base.deliveries.last.subject.should == @message.subject
+      end
+
+      it 'delivers the mail with the body that we wanted to' do
+        ActionMailer::Base.deliveries.last.body.to_s.should match @message.body
+      end
     end
   end
 
   describe "POST 'create' for a diffusion" do
     it "returns http success" do
       @diffusion = Fabricate.build(:diffusion)
-      post 'create', message: @diffusion
-      response.should be_success
-
-      @before_send = ActionMailer::Base.deliveries.size
-      @diffusion.email.each do |email|
-        MessageMailer.new_message(@diffusion, email).deliver
-      end
-      ActionMailer::Base.deliveries.size.should eq @before_send + @diffusion.email.size
+      expect {
+        post 'create', message: @diffusion
+      }.to change {ActionMailer::Base.deliveries.size}.by(@diffusion.email.size)
     end
   end
 end
