diff options
| author | Mark Longair <mhl@pobox.com> | 2013-11-15 11:39:12 +0000 |
|---|---|---|
| committer | Mark Longair <mhl@pobox.com> | 2013-11-15 11:39:12 +0000 |
| commit | 64618741c17760fcb59647d74d1ccaff56160b15 (patch) | |
| tree | d84f1f035b136180f0bdacb22895fbb0f1abf2c1 /spec/models/outgoing_message_spec.rb | |
| parent | 96b3b5adbdafb25e5ab6ca94b89d6682a2e8f0e4 (diff) | |
| parent | cda26c36f309cdd8e8bbab9186f6cc0d4876e6c9 (diff) | |
Merge branch 'release/0.15' into wdtk
Conflicts:
lib/tasks/stats.rake
Diffstat (limited to 'spec/models/outgoing_message_spec.rb')
| -rw-r--r-- | spec/models/outgoing_message_spec.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/models/outgoing_message_spec.rb b/spec/models/outgoing_message_spec.rb index 20f07e8fe..bb270ca16 100644 --- a/spec/models/outgoing_message_spec.rb +++ b/spec/models/outgoing_message_spec.rb @@ -12,6 +12,8 @@ # last_sent_at :datetime # incoming_message_followup_id :integer # what_doing :string(255) not null +# prominence :string(255) default("normal"), not null +# prominence_reason :text # require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') @@ -144,7 +146,7 @@ describe OutgoingMessage, " when making an outgoing message" do end -describe IncomingMessage, " when censoring data" do +describe OutgoingMessage, " when censoring data" do before do @om = outgoing_messages(:useless_outgoing_message) |