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

[rails.git] / test / lib / country_test.rb

diff --git a/test/lib/country_test.rb b/test/lib/country_test.rb
index cc726e6f7c0daaf961cafe28ef5d0b24e1fbbd23..a6fc7c144d42f6f65f51d1a06b2eaeb0b4bf5876 100644 (file)
--- a/test/lib/country_test.rb
+++ b/test/lib/country_test.rb
@@ -2,27 +2,27 @@ require "test_helper"
 
 class CountryTest < ActiveSupport::TestCase
   def test_gb
 
 class CountryTest < ActiveSupport::TestCase
   def test_gb

-    gb = Country.find_by_code("GB")
+    gb = Country.find("GB")

     assert_not_nil gb
     assert_equal "GB", gb.code
     assert_not_nil gb
     assert_equal "GB", gb.code

-    assert_equal -8.623555, gb.min_lon
+    assert_equal(-8.623555, gb.min_lon)

     assert_equal 59.360249, gb.max_lat
     assert_equal 1.759, gb.max_lon
     assert_equal 49.906193, gb.min_lat
   end
 
   def test_au
     assert_equal 59.360249, gb.max_lat
     assert_equal 1.759, gb.max_lon
     assert_equal 49.906193, gb.min_lat
   end
 
   def test_au

-    au = Country.find_by_code("AU")
+    au = Country.find("AU")

     assert_not_nil au
     assert_equal "AU", au.code
     assert_equal 112.911057, au.min_lon
     assert_not_nil au
     assert_equal "AU", au.code
     assert_equal 112.911057, au.min_lon

-    assert_equal -10.062805, au.max_lat
+    assert_equal(-10.062805, au.max_lat)

     assert_equal 153.639252, au.max_lon
     assert_equal 153.639252, au.max_lon

-    assert_equal -43.64397, au.min_lat
+    assert_equal(-43.64397, au.min_lat)

   end
 
   def test_xx
   end
 
   def test_xx

-    xx = Country.find_by_code("XX")
+    xx = Country.find("XX")

     assert_nil xx
   end
 end
     assert_nil xx
   end
 end