Merge branch 'proposal-notifications' of github.com:consul/consul into proposal-notifications

This commit is contained in:
Alberto Garcia Cabeza
2016-06-15 17:03:45 +02:00
3 changed files with 33 additions and 1 deletions

View File

@@ -35,4 +35,9 @@ module ApplicationHelper
} }
Redcarpet::Markdown.new(renderer, extensions).render(text).html_safe Redcarpet::Markdown.new(renderer, extensions).render(text).html_safe
end end
def author_of?(authorable, user)
return false if authorable.blank? || user.blank?
authorable.author_id == user.id
end
end end

View File

@@ -1,5 +1,5 @@
class ApplicationMailer < ActionMailer::Base class ApplicationMailer < ActionMailer::Base
helper :settings helper :settings
default from: "participacion@madrid.es" default from: "Decide Madrid <no-reply@madrid.es>"
layout 'mailer' layout 'mailer'
end end

View File

@@ -0,0 +1,27 @@
require 'rails_helper'
describe ApplicationHelper do
describe "#author_of?" do
it "should be true if user is the author" do
user = create(:user)
proposal = create(:proposal, author: user)
expect(author_of?(proposal, user)).to eq true
end
it "should be false if user is not the author" do
user = create(:user)
proposal = create(:proposal)
expect(author_of?(proposal, user)).to eq false
end
it "should be false if user or authorable is nil" do
user = create(:user)
proposal = create(:proposal)
expect(author_of?(nil, user)).to eq false
expect(author_of?(proposal, nil)).to eq false
end
end
end