summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2019-03-20 15:43:40 -0300
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2019-03-20 16:51:46 -0300
commitbcc988a6c6c9896450b7c40d2718a1aa9dbd689f (patch)
tree0731b717a7975bf04817e4f9e3fa4d00e70b6080
parent3fd8e612719dbeb9d4790aef6875b005d9dd6aff (diff)
downloadgitlab-ce-bcc988a6c6c9896450b7c40d2718a1aa9dbd689f.tar.gz
Does not exclude message_html from attributes
-rw-r--r--app/models/broadcast_message.rb2
-rw-r--r--spec/models/broadcast_message_spec.rb6
2 files changed, 7 insertions, 1 deletions
diff --git a/app/models/broadcast_message.rb b/app/models/broadcast_message.rb
index 2d237383e60..e77a1236c39 100644
--- a/app/models/broadcast_message.rb
+++ b/app/models/broadcast_message.rb
@@ -4,7 +4,7 @@ class BroadcastMessage < ActiveRecord::Base
include CacheMarkdownField
include Sortable
- cache_markdown_field :message, pipeline: :broadcast_message
+ cache_markdown_field :message, pipeline: :broadcast_message, hidden: false
validates :message, presence: true
validates :starts_at, presence: true
diff --git a/spec/models/broadcast_message_spec.rb b/spec/models/broadcast_message_spec.rb
index 89839709131..30ca07d5d2c 100644
--- a/spec/models/broadcast_message_spec.rb
+++ b/spec/models/broadcast_message_spec.rb
@@ -95,6 +95,12 @@ describe BroadcastMessage do
end
end
+ describe '#attributes' do
+ it 'includes message_html field' do
+ expect(subject.attributes.keys).to include("cached_markdown_version", "message_html")
+ end
+ end
+
describe '#active?' do
it 'is truthy when started and not ended' do
message = build(:broadcast_message)