From d36ec17436b03124c1f2a1f1e370524a99a11355 Mon Sep 17 00:00:00 2001
From: Jonathan Kolyer <jonathan@jamkazam.com>
Date: Tue, 3 Jun 2014 03:25:23 +0000
Subject: [PATCH] VRFS-1664 fixed mail sending test

---
 ruby/lib/jam_ruby/app/mailers/user_mailer.rb                  | 1 -
 .../app/views/jam_ruby/user_mailer/new_musicians.html.erb     | 2 +-
 .../app/views/jam_ruby/user_mailer/new_musicians.text.erb     | 2 +-
 ruby/lib/jam_ruby/models/email_batch_new_musician.rb          | 2 +-
 ruby/spec/jam_ruby/models/email_batch_spec_new_musicians.rb   | 4 ++--
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/ruby/lib/jam_ruby/app/mailers/user_mailer.rb b/ruby/lib/jam_ruby/app/mailers/user_mailer.rb
index 29ddc3e68..a292357f3 100644
--- a/ruby/lib/jam_ruby/app/mailers/user_mailer.rb
+++ b/ruby/lib/jam_ruby/app/mailers/user_mailer.rb
@@ -104,7 +104,6 @@
 
       def new_musicians(user, new_musicians, host='www.jamkazam.com')
         @user, @new_musicians, @host = user, new_musicians, host
-
         sendgrid_recipients([user.email])
         sendgrid_substitute('@USERID', [user.id])
         sendgrid_unique_args :type => "new_musicians"
diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.html.erb
index 0a48b367e..8551c23df 100644
--- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.html.erb
+++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.html.erb
@@ -24,7 +24,7 @@ Hi <%= @user.first_name %>,
 <% end %>
 </table>
 </p>
-<p>There are currently <%= @new_nearby.size%> musicians on JamKazam with low enough latency Internet connections to you to support a good online session. To see ALL the JamKazam musicians with whom you may want to connect and play, view our Musicians page at: <a href="http://www.jamkazam.com/client#/musicians">http://www.jamkazam.com/client#/musicians</a>. 
+<p>There are currently <%= @new_musicians.size%> musicians on JamKazam with low enough latency Internet connections to you to support a good online session. To see ALL the JamKazam musicians with whom you may want to connect and play, view our Musicians page at: <a href="http://www.jamkazam.com/client#/musicians">http://www.jamkazam.com/client#/musicians</a>. 
 </p>
 
 <p>Best Regards,</p>
diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.text.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.text.erb
index c1d1c236a..df39c005a 100644
--- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.text.erb
+++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.text.erb
@@ -11,7 +11,7 @@ The following new musicians have joined JamKazam within the last week, and have
   <%= user.biography %>
 <% end %>
 
-There are currently <%= @new_nearby.size%> musicians on JamKazam with low enough latency Internet connections to you to support a good online session. To see ALL the JamKazam musicians with whom you may want to connect and play, view our Musicians page at: http://www.jamkazam.com/client#/musicians. 
+There are currently <%= @new_musicians.size%> musicians on JamKazam with low enough latency Internet connections to you to support a good online session. To see ALL the JamKazam musicians with whom you may want to connect and play, view our Musicians page at: http://www.jamkazam.com/client#/musicians. 
 
 Best Regards,
 Team JamKazam 
diff --git a/ruby/lib/jam_ruby/models/email_batch_new_musician.rb b/ruby/lib/jam_ruby/models/email_batch_new_musician.rb
index 8f16b8d7f..4eadd5311 100644
--- a/ruby/lib/jam_ruby/models/email_batch_new_musician.rb
+++ b/ruby/lib/jam_ruby/models/email_batch_new_musician.rb
@@ -100,7 +100,7 @@ SQL
       self.fetch_recipients do |user, new_musicians|
         self.opt_in_count += 1
         bset = EmailBatchSet.new_musician_set(self, user, new_musicians)
-        UserMailer.new_musicians(uu, new_musicians).deliver
+        UserMailer.new_musicians(user, new_musicians).deliver
       end
       self.sent_count = self.opt_in_count
       self.save
diff --git a/ruby/spec/jam_ruby/models/email_batch_spec_new_musicians.rb b/ruby/spec/jam_ruby/models/email_batch_spec_new_musicians.rb
index e259ed865..d6dd13626 100644
--- a/ruby/spec/jam_ruby/models/email_batch_spec_new_musicians.rb
+++ b/ruby/spec/jam_ruby/models/email_batch_spec_new_musicians.rb
@@ -54,10 +54,10 @@ describe EmailBatchNewMusician do
     end
 
     it 'sends email' do
-      pending
+      receiver; drummer; loser; vocalist
       ebatch = new_musician_batch
       ebatch.deliver_batch
-      expect(UserMailer.deliveries.length).to eq(3)
+      expect(UserMailer.deliveries.length).to eq(1)
     end
 
   end