* Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

ruby/lib/jam_ruby/models/email_batch.rb

@@ -67,7 +67,11 @@ FOO
     def deliver_batch
       self.perform_event('do_batch_run!')
       User.email_opt_in.find_in_batches(batch_size: 1000) do |users|
-        BatchMailer.send_batch_email(self.id, users.map(&:id)).deliver
+        if 'test' == Rails.env
+          BatchMailer.send_batch_email(self.id, users.map(&:id)).deliver!
+        else
+          BatchMailer.send_batch_email(self.id, users.map(&:id)).deliver
+        end
       end
     end
     
@@ -88,7 +92,11 @@ FOO
 
     def send_test_batch
       self.perform_event('do_test_run!')
-      BatchMailer.send_batch_email_test(self.id).deliver
+      if 'test' == Rails.env
+        BatchMailer.send_batch_email_test(self.id).deliver!
+      else
+        BatchMailer.send_batch_email_test(self.id).deliver
+      end
     end
 
     def merged_body(user)

ruby/spec/mailers/batch_mailer_spec.rb

@@ -8,8 +8,6 @@ describe BatchMailer do
     batch = FactoryGirl.create(:email_batch)
     batch.send_test_batch
 
-    sleep
-
     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] }