Use cancancan to authorize user_preference_controller

[rails.git] / test / models / message_test.rb

diff --git a/test/models/message_test.rb b/test/models/message_test.rb
index 84c46664995e54374dc9ffec53f3ed128698a9d5..48319843b9f91b2781c43fbf38e7c9fe2c039d8c 100644 (file)
--- a/test/models/message_test.rb
+++ b/test/models/message_test.rb
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-

 require "test_helper"
 
 class MessageTest < ActiveSupport::TestCase
 require "test_helper"
 
 class MessageTest < ActiveSupport::TestCase


@@ -6,11 +5,11 @@ class MessageTest < ActiveSupport::TestCase
 
   def test_check_empty_message_fails
     message = Message.new
 
   def test_check_empty_message_fails
     message = Message.new

-    assert !message.valid?
+    assert_not message.valid?

     assert message.errors[:title].any?
     assert message.errors[:body].any?
     assert message.errors[:sent_on].any?
     assert message.errors[:title].any?
     assert message.errors[:body].any?
     assert message.errors[:sent_on].any?

-    assert !message.message_read
+    assert_not message.message_read

   end
 
   def test_validating_msgs
   end
 
   def test_validating_msgs


@@ -24,7 +23,7 @@ class MessageTest < ActiveSupport::TestCase
     message = create(:message, :unread)
     message.sender = nil
     message.recipient = nil
     message = create(:message, :unread)
     message.sender = nil
     message.recipient = nil

-    assert !message.valid?
+    assert_not message.valid?

 
     assert_raise(ActiveRecord::RecordNotFound) { User.find(0) }
     message.from_user_id = 0
 
     assert_raise(ActiveRecord::RecordNotFound) { User.find(0) }
     message.from_user_id = 0


@@ -65,10 +64,8 @@ class MessageTest < ActiveSupport::TestCase
         # its OK to accept invalid UTF-8 as long as we return it unmodified.
         db_msg = msg.class.find(msg.id)
         assert_equal char, db_msg.title, "Database silently truncated message title"
         # its OK to accept invalid UTF-8 as long as we return it unmodified.
         db_msg = msg.class.find(msg.id)
         assert_equal char, db_msg.title, "Database silently truncated message title"

-

       rescue ArgumentError => ex
         assert_equal ex.to_s, "invalid byte sequence in UTF-8"
       rescue ArgumentError => ex
         assert_equal ex.to_s, "invalid byte sequence in UTF-8"

-

       end
     end
   end
       end
     end
   end