diff --git a/app/models/email_settings.rb b/app/models/email_settings.rb index f22c2102..3c624e1d 100644 --- a/app/models/email_settings.rb +++ b/app/models/email_settings.rb @@ -7,8 +7,7 @@ class EmailSettings < ActiveRecord::Base :send_on_updated_conference_dates, :updated_conference_dates_subject, :updated_conference_dates_template, :send_on_updated_conference_registration_dates, :updated_conference_registration_dates_subject, :updated_conference_registration_dates_template, - :send_on_venue_update, - :venue_update_subject, :venue_update_template + :send_on_venue_update, :venue_update_subject, :venue_update_template def get_values(conference, user, event = nil) h = { diff --git a/spec/factories/email_settings.rb b/spec/factories/email_settings.rb index ec4887ed..d840a94c 100644 --- a/spec/factories/email_settings.rb +++ b/spec/factories/email_settings.rb @@ -12,6 +12,9 @@ FactoryGirl.define do updated_conference_dates_subject 'Conference dates have been updated' updated_conference_registration_dates_subject 'Conference registration dates have been updated' updated_conference_registration_dates_template 'Sample Conference\n New Dates: January 17 - 21 2014' + send_on_venue_update true + venue_update_subject "Venue has been updated" + venue_update_template "Venue has been Updated to Sample Location" registration_subject 'Lorem Ipsum Dolsum' registration_email_template 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit' end diff --git a/spec/views/admin/emails/index.html.haml_spec.rb b/spec/views/admin/emails/index.html.haml_spec.rb index c6acb8d1..e859ff2e 100644 --- a/spec/views/admin/emails/index.html.haml_spec.rb +++ b/spec/views/admin/emails/index.html.haml_spec.rb @@ -8,9 +8,9 @@ describe 'admin/emails/index' do assign :settings, @settings render expect(rendered). - to have_selector("input[type='checkbox'][value='1']", count: 6) + to have_selector("input[type='checkbox'][value='1']", count: 7) expect(rendered). - to have_selector("input[checked='checked'][type='checkbox'][value='1']", count: 3) + to have_selector("input[checked='checked'][type='checkbox'][value='1']", count: 4) expect(rendered).to include('Lorem Ipsum Dolsum') expect(rendered). to include('Lorem ipsum dolor sit amet, consectetuer adipiscing elit') @@ -18,5 +18,7 @@ describe 'admin/emails/index' do to include('Conference dates have been updated') expect(rendered). to include('Conference registration dates have been updated') + expect(rendered).to include("Venue has been updated") + expect(rendered).to include("Venue has been Updated to Sample Location") end end