From 090f2a0245f05ddd3eafe27a32fd38ac11975949 Mon Sep 17 00:00:00 2001 From: Sarah Julia Kriesch Date: Thu, 14 May 2015 16:36:31 +0200 Subject: [PATCH 1/2] Update email_settings.rb add 'send_on_$ACTION false', registration_body, $ACTION_subject and $ACTION_body for #603 --- spec/factories/email_settings.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spec/factories/email_settings.rb b/spec/factories/email_settings.rb index 4fc7764e..fba11723 100644 --- a/spec/factories/email_settings.rb +++ b/spec/factories/email_settings.rb @@ -3,6 +3,7 @@ FactoryGirl.define do factory :email_settings do send_on_registration true + send_on_$ACTION false send_on_accepted false send_on_rejected false send_on_confirmed_without_registration false @@ -18,6 +19,9 @@ FactoryGirl.define do venue_update_subject 'Venue has been updated' venue_update_template 'Venue has been Updated to Sample Location' registration_subject 'Lorem Ipsum Dolsum' + $ACTION_subject 'You can add a specific subject' + registration_body 'I want to be here' + $ACTION_body 'Add more informations' registration_email_template 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit' call_for_papers_dates_updates_subject 'Call for Papers dates have been updated' call_for_papers_dates_updates_template 'Please checkout the new updates to submit your proposal for Sample Conference' From 71c37c41425e90208965342a9cdff5e7a6b2cd41 Mon Sep 17 00:00:00 2001 From: Sarah Julia Kriesch Date: Thu, 14 May 2015 17:43:11 +0200 Subject: [PATCH 2/2] Update email_settings.rb removing $ACTION parts again, because it will be used for test cases --- spec/factories/email_settings.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/spec/factories/email_settings.rb b/spec/factories/email_settings.rb index fba11723..f902f96a 100644 --- a/spec/factories/email_settings.rb +++ b/spec/factories/email_settings.rb @@ -3,7 +3,6 @@ FactoryGirl.define do factory :email_settings do send_on_registration true - send_on_$ACTION false send_on_accepted false send_on_rejected false send_on_confirmed_without_registration false @@ -19,9 +18,7 @@ FactoryGirl.define do venue_update_subject 'Venue has been updated' venue_update_template 'Venue has been Updated to Sample Location' registration_subject 'Lorem Ipsum Dolsum' - $ACTION_subject 'You can add a specific subject' registration_body 'I want to be here' - $ACTION_body 'Add more informations' registration_email_template 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit' call_for_papers_dates_updates_subject 'Call for Papers dates have been updated' call_for_papers_dates_updates_template 'Please checkout the new updates to submit your proposal for Sample Conference'