Merge remote-tracking branch 'upstream/pull/4452'

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

diff --git a/test/models/language_test.rb b/test/models/language_test.rb
index cb4c8c6318d195a0ee3a347128ab666a80a7ba2a..f777d8e1965a53d7348e52bfda21cbb9f349b931 100644 (file)
--- a/test/models/language_test.rb
+++ b/test/models/language_test.rb
@@ -1,21 +1,18 @@
-# coding: utf-8

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

-  fixtures :languages
-
-  def test_language_count
-    assert_equal 3, Language.count
+  def test_name
+    create(:language, :code => "sl", :english_name => "Slovenian", :native_name => "slovenščina")
+    assert_equal "Slovenian (slovenščina)", Language.find("sl").name

   end
 
   end
 

-  def test_name
-    assert_equal "English (English)", languages(:en).name
-    assert_equal "German (Deutsch)", languages(:de).name
-    assert_equal "Slovenian (slovenščina)", languages(:sl).name
+  def test_same_native_name
+    create(:language, :code => "af", :english_name => "Afrikaans", :native_name => "Afrikaans")
+    assert_equal "Afrikaans", Language.find("af").name

   end
 
   def test_load
   end
 
   def test_load

-    assert_equal 3, Language.count
+    assert_equal 0, Language.count

     assert_raise ActiveRecord::RecordNotFound do
       Language.find("zh")
     end
     assert_raise ActiveRecord::RecordNotFound do
       Language.find("zh")
     end