From a7c8d9311fdfba0697af19fcb33f130622d59b49 Mon Sep 17 00:00:00 2001 From: Jonathan Kolyer Date: Thu, 3 Apr 2014 05:03:28 +0000 Subject: [PATCH] VRFS-1483 fixing tests --- ruby/lib/jam_ruby/models/email_batch.rb | 13 +++++++++++++ ruby/spec/mailers/batch_mailer_spec.rb | 15 +++++++++------ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/ruby/lib/jam_ruby/models/email_batch.rb b/ruby/lib/jam_ruby/models/email_batch.rb index a2fd36387..9b13f1f4d 100644 --- a/ruby/lib/jam_ruby/models/email_batch.rb +++ b/ruby/lib/jam_ruby/models/email_batch.rb @@ -10,6 +10,18 @@ module JamRuby DEFAULT_SENDER = "support@jamkazam.com" + BODY_TEMPLATE =<Pellentesque facilisis metus ac cursus varius. Nunc laoreet diam mauris, et rhoncus quam commodo vel. Vestibulum nec diam lobortis, posuere sapien id, faucibus nulla. Vivamus vitae pellentesque massa. Proin quis nibh eu nibh imperdiet porttitor.

+ +

Vestibulum mollis enim eu fringilla vulputate. Nam tincidunt, enim eget fringilla blandit, mi neque dictum dolor, non pellentesque libero erat sed massa. Morbi sodales lobortis eros, sed feugiat eros euismod eget. Nulla vulputate lobortis porttitor.

+ +

Thanks for using JamKazam!

+ +The JamKazam Team +FOO + include AASM aasm do state :pending, :initial => true @@ -47,6 +59,7 @@ module JamRuby def self.create_with_params(params) obj = self.new params.each { |kk,vv| vv.strip! } + params[:body] = BODY_TEMPLATE if params[:body].empty? obj.update_with_conflict_validation(params) obj end diff --git a/ruby/spec/mailers/batch_mailer_spec.rb b/ruby/spec/mailers/batch_mailer_spec.rb index a1a216607..784279db8 100644 --- a/ruby/spec/mailers/batch_mailer_spec.rb +++ b/ruby/spec/mailers/batch_mailer_spec.rb @@ -3,18 +3,21 @@ require "spec_helper" describe BatchMailer do describe "should send test emails" do - BatchMailer.deliveries.clear - - let (:mail) { BatchMailer.deliveries[0] } + ActionMailer::Base.deliveries.clear batch = FactoryGirl.create(:email_batch) - batch.update_attribute(:test_emails, "jonathan@jamkazam.com") batch.send_test_batch + sleep(3) - it { BatchMailer.deliveries.length.should == 1 } + mail = BatchMailer.deliveries.detect { |dd| dd['to'].to_s.split(',')[0] == batch.test_emails.split(',')[0]} + # let (:mail) { BatchMailer.deliveries[0] } + # it { mail['to'].to_s.split(',')[0].should == batch.test_emails.split(',')[0] } + + it { mail.should_not be_nil } + + # it { BatchMailer.deliveries.length.should == 1 } it { mail['from'].to_s.should == EmailBatch::DEFAULT_SENDER } - it { mail['to'].to_s.split(',')[0].should == batch.test_emails.split(',')[0] } it { mail.subject.should == batch.subject } it { mail.multipart?.should == true } # because we send plain + html