Merge branch 'develop' into master

avalonmediasystem · Mar 29, 2017 · f85d45f · f85d45f
2 parents 2ffa797 + 01b9d65
commit f85d45f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
@@ -31,16 +31,16 @@ def create
 
  if (@comment.valid?)
  begin
- CommentsMailer.contact_email(@comment).deliver_later
+ CommentsMailer.contact_email(@comment.to_h).deliver_later
  rescue Errno::ECONNRESET => e
- logger.warn "The mail server does not appear to be responding \n #{e}"
+ logger.warn "The mail server does not appear to be responding \n #{e}"
 
- flash[:notice] = "The message could not be sent in a timely fashion. Contact us at #{Avalon::Configuration.lookup('email.support')} to report the problem."
- render action: "index"
+ flash[:notice] = "The message could not be sent in a timely fashion. Contact us at #{Avalon::Configuration.lookup('email.support')} to report the problem."
+ render action: "index"
  end
  else
- flash[:error] = "There were problems submitting your comment. Please correct the errors and try again."
- render action: "index"
+  flash[:error] = "There were problems submitting your comment. Please correct the errors and try again."
+  render action: "index"
  end
  end
 

diff --git a/app/mailers/comments_mailer.rb b/app/mailers/comments_mailer.rb
@@ -16,7 +16,7 @@ class CommentsMailer < ActionMailer::Base
  default :to => Avalon::Configuration.lookup('email.comments')
 
  def contact_email(comment)
- @comment = comment
- mail(:from => comment.email, :subject => comment.subject)
+ @comment = OpenStruct.new(comment)
+ mail(:from => @comment.email, :subject => @comment.subject)
  end
 end
diff --git a/app/models/comment.rb b/app/models/comment.rb
@@ -65,4 +65,13 @@ def persisted?
  false
  end
 
+ def to_h
+ {
+ name: name,
+ subject: subject,
+ email: email,
+ nickname: nickname,
+ comment: comment
+ }
+ end
 end
diff --git a/spec/features/capybara_playlist_spec.rb b/spec/features/capybara_playlist_spec.rb
@@ -59,7 +59,7 @@
  page.should have_content('private_playlist')
  page.should have_button('Edit Playlist')
  page.should have_content('This is test')
- page.should have_content('This playlist currently has no items')
+ page.should have_content('This playlist currently has no playable items')
  end
  it 'is able to view playlist by accessing View Playlist' do
  user = FactoryGirl.create(:administrator)
@@ -75,7 +75,7 @@
  page.should have_content('private_playlist')
  page.should have_button('Edit Playlist')
  page.should have_content('This is test')
- page.should have_content('This playlist currently has no items')
+ page.should have_content('This playlist currently has no playable items')
  end
 
  it 'deletes playlist permanently from playlists page' do