seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

* VRFS-711 - added test to prove that the welcome email comes back after you click signup confirm

This commit is contained in:
Seth Call 2013-09-27 14:54:51 +00:00
parent b8eefb717c
commit 71710f1ce8
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruby/lib/jam_ruby/app/mailers/user_mailer.rb
View File

@ -25,7 +25,7 @@
sendgrid_category "Confirm Email"
sendgrid_unique_args :type => "confirm_email"
mail(:to => user.email, :subject => "#{user.first_name}, please confirm your JamKazam email") do |format|
mail(:to => user.email, :subject => "Please confirm your JamKazam email") do |format|
format.text
format.html
end
@ -36,7 +36,7 @@
sendgrid_category "Welcome"
sendgrid_unique_args :type => "welcome_message"
mail(:to => user.email, :subject => "Welcome to JamKazam, #{user.first_name}") do |format|
mail(:to => user.email, :subject => "Welcome to JamKazam") do |format|
format.text
format.html
end

6
ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/welcome_message.html.erb
View File

@ -6,17 +6,17 @@
</p>
<p>
Tutorial videos that show you how to use the key features of the product:
Tutorial videos that show you how to use the key features of the product:</br>
<a href="https://jamkazam.desk.com/customer/portal/articles/1304097-tutorial-videos">https://jamkazam.desk.com/customer/portal/articles/1304097-tutorial-videos</a>
</p>
<p>
Getting Started knowledge base articles:
Getting Started knowledge base articles:</br>
<a href="https://jamkazam.desk.com/customer/portal/topics/564807-getting-started/articles">https://jamkazam.desk.com/customer/portal/topics/564807-getting-started/articles</a>
</p>
<p>
Support Portal in case you run into trouble and need help:
Support Portal in case you run into trouble and need help:</br>
<a href="https://jamkazam.desk.com/">https://jamkazam.desk.com/</a>
</p>

15
web/spec/features/signup_spec.rb
View File

@ -32,7 +32,21 @@ describe "Signup" do
it { User.find_by_email('noone@jamkazam.com').musician_instruments.length.should == 1 }
# an email is sent on no-invite signup
it { UserMailer.deliveries.length.should == 1 }
it { UserMailer.deliveries[0].html_part.body.include?("To confirm this email address")== 1 }
it {uri = URI.parse(current_url); "#{uri.path}?#{uri.query}".should == congratulations_musician_path(:type => 'Native')}
describe "user can confirm email and receive welcome email" do
before(:each) do
UserMailer.deliveries.clear
visit signup_confirm_path(User.find_by_email('noone@jamkazam.com').signup_token)
end
it { page.should have_title("JamKazam") }
it { should have_selector('h2', text: "musicians") }
it { UserMailer.deliveries.length.should == 1 }
it { UserMailer.deliveries[0].html_part.body.include?("Following are links to some resources")== 1 }
end
end
describe "with valid fan information" do
@ -78,7 +92,6 @@ describe "Signup" do
it { page.should have_title("JamKazam") }
it { should have_selector('h1', text: "congratulations") }
# there is no email sent though when you signup based on an invite (because you just left your email to get here)
it { UserMailer.deliveries.length.should == 1 }
it {uri = URI.parse(current_url); "#{uri.path}?#{uri.query}".should == congratulations_musician_path(:type => 'Native')}
end