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

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

diff --git a/test/lib/country_test.rb b/test/lib/country_test.rb
index 14827c05f3ddaa9c1f2f60ca3369e9f371a4d675..596690c6c64ec515caecc0cc042beee4924e3e61 100644 (file)
--- a/test/lib/country_test.rb
+++ b/test/lib/country_test.rb
@@ -1,28 +1,28 @@
-require 'test_helper'
+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 59.360249, gb.max_lat
-    assert_equal 1.759, gb.max_lon
-    assert_equal 49.906193, gb.min_lat
+    assert_in_delta(-8.623555, gb.min_lon)
+    assert_in_delta(59.360249, gb.max_lat)
+    assert_in_delta(1.759, gb.max_lon)
+    assert_in_delta(49.906193, gb.min_lat)

   end
 
   def test_au
   end
 
   def test_au

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

     assert_not_nil au
     assert_equal "AU", au.code
     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 153.639252, au.max_lon
-    assert_equal -43.64397, au.min_lat
+    assert_in_delta(112.911057, au.min_lon)
+    assert_in_delta(-10.062805, au.max_lat)
+    assert_in_delta(153.639252, au.max_lon)
+    assert_in_delta(-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