Rename 'clickable' to 'interactive' per leaflet 1.x change

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

diff --git a/test/models/message_test.rb b/test/models/message_test.rb
index 05f3d90345a692640089772d0623313baebf3bbc..4f8c4b8e2ca2d06e7ea492b4c247f0b0766751ba 100644 (file)
--- a/test/models/message_test.rb
+++ b/test/models/message_test.rb
@@ -1,17 +1,10 @@
 # -*- coding: utf-8 -*-
-require 'test_helper'
+require "test_helper"
 
 class MessageTest < ActiveSupport::TestCase
   api_fixtures
-  fixtures :messages
 
-  EURO = "\xe2\x82\xac" # euro symbol
-
-  # This needs to be updated when new fixtures are added
-  # or removed.
-  def test_check_message_count
-    assert_equal 2, Message.count
-  end
+  EURO = "\xe2\x82\xac".freeze # euro symbol
 
   def test_check_empty_message_fails
     message = Message.new
@@ -23,14 +16,14 @@ class MessageTest < ActiveSupport::TestCase
   end
 
   def test_validating_msgs
-    message = messages(:unread_message)
+    message = create(:message, :unread)
     assert message.valid?
-    massage = messages(:read_message)
+    message = create(:message, :read)
     assert message.valid?
   end
 
   def test_invalid_send_recipient
-    message = messages(:unread_message)
+    message = create(:message, :unread)
     message.sender = nil
     message.recipient = nil
     assert !message.valid?
@@ -43,26 +36,25 @@ class MessageTest < ActiveSupport::TestCase
 
   def test_utf8_roundtrip
     (1..255).each do |i|
-      assert_message_ok('c', i)
+      assert_message_ok("c", i)
       assert_message_ok(EURO, i)
     end
   end
 
   def test_length_oversize
-    assert_raise(ActiveRecord::RecordInvalid) { make_message('c', 256).save! }
+    assert_raise(ActiveRecord::RecordInvalid) { make_message("c", 256).save! }
     assert_raise(ActiveRecord::RecordInvalid) { make_message(EURO, 256).save! }
   end
 
   def test_invalid_utf8
     # See e.g http://en.wikipedia.org/wiki/UTF-8 for byte sequences
-    # FIXME - Invalid Unicode characters can still be encoded into "valid" utf-8 byte sequences - maybe check this too?
+    # FIXME: Invalid Unicode characters can still be encoded into "valid" utf-8 byte sequences - maybe check this too?
     invalid_sequences = ["\xC0",         # always invalid utf8
                          "\xC2\x4a",     # 2-byte multibyte identifier, followed by plain ASCII
                          "\xC2\xC2",     # 2-byte multibyte identifier, followed by another one
                          "\x4a\x82",     # plain ASCII, followed by multibyte continuation
                          "\x82\x82",     # multibyte continuations without multibyte identifier
-                         "\xe1\x82\x4a", # three-byte identifier, contination and (incorrectly) plain ASCII
-                        ]
+                         "\xe1\x82\x4a"] # three-byte identifier, contination and (incorrectly) plain ASCII
     invalid_sequences.each do |char|
       begin
         # create a message and save to the database
@@ -79,8 +71,6 @@ class MessageTest < ActiveSupport::TestCase
       rescue ArgumentError => ex
         assert_equal ex.to_s, "invalid byte sequence in UTF-8"
 
-      rescue ActiveRecord::RecordInvalid
-        # because we only test invalid sequences it is OK to barf on them
       end
     end
   end
@@ -91,7 +81,7 @@ class MessageTest < ActiveSupport::TestCase
       to "to@example.com"
       subject "Test message"
       date Time.now
-      content_type 'text/plain; charset=utf-8'
+      content_type "text/plain; charset=utf-8"
       body "This is a test & a message"
     end
     message = Message.from_mail(mail, users(:normal_user), users(:public_user))
@@ -109,7 +99,7 @@ class MessageTest < ActiveSupport::TestCase
       to "to@example.com"
       subject "Test message"
       date Time.now
-      content_type 'text/html; charset=utf-8'
+      content_type "text/html; charset=utf-8"
       body "<p>This is a <b>test</b> &amp; a message</p>"
     end
     message = Message.from_mail(mail, users(:normal_user), users(:public_user))
@@ -129,12 +119,12 @@ class MessageTest < ActiveSupport::TestCase
       date Time.now
 
       text_part do
-        content_type 'text/plain; charset=utf-8'
+        content_type "text/plain; charset=utf-8"
         body "This is a test & a message in text format"
       end
 
       html_part do
-        content_type 'text/html; charset=utf-8'
+        content_type "text/html; charset=utf-8"
         body "<p>This is a <b>test</b> &amp; a message in HTML format</p>"
       end
     end
@@ -153,7 +143,7 @@ class MessageTest < ActiveSupport::TestCase
       date Time.now
 
       html_part do
-        content_type 'text/html; charset=utf-8'
+        content_type "text/html; charset=utf-8"
         body "<p>This is a <b>test</b> &amp; a message in HTML format</p>"
       end
     end
@@ -172,7 +162,7 @@ class MessageTest < ActiveSupport::TestCase
       to "to@example.com"
       subject "[OpenStreetMap] Test message"
       date Time.now
-      content_type 'text/plain; charset=utf-8'
+      content_type "text/plain; charset=utf-8"
       body "This is a test & a message"
     end
     message = Message.from_mail(mail, users(:normal_user), users(:public_user))
@@ -187,7 +177,7 @@ class MessageTest < ActiveSupport::TestCase
   private
 
   def make_message(char, count)
-    message = messages(:unread_message)
+    message = build(:message, :unread)
     message.title = char * count
     message
   end