From 86a6b34c5750bb3751710698d6eefd118b2b0bab Mon Sep 17 00:00:00 2001 From: GoldCat <55624311+Beardev118@users.noreply.github.com> Date: Wed, 6 Dec 2023 00:19:01 +0100 Subject: [PATCH] 8.0 stable (#388) Fix tests with `to_s` comparison --- test/cases/basic_test.rb | 4 ++-- test/test_helper.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/cases/basic_test.rb b/test/cases/basic_test.rb index 9b9d17ee..501caad9 100644 --- a/test/cases/basic_test.rb +++ b/test/cases/basic_test.rb @@ -106,7 +106,7 @@ def test_set_point_wkt_wrong_type def test_default_value create_model obj = SpatialModel.create - assert_equal factory.point(0, 0).to_s, obj.default_latlon.to_s + assert_equal factory(srid: 0).point(0, 0), obj.default_latlon end def test_custom_factory @@ -122,7 +122,7 @@ def test_custom_factory object.area = area object.save! object.reload - assert_equal area.to_s, object.area.to_s + assert_equal area, object.area end def test_spatial_factory_attrs_parsing diff --git a/test/test_helper.rb b/test/test_helper.rb index db3a6620..18bfdfec 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -76,8 +76,8 @@ def postgis_version @postgis_version ||= SpatialModel.connection.select_value("SELECT postgis_lib_version()") end - def factory - RGeo::Cartesian.preferred_factory(srid: 3785) + def factory(srid: 3785) + RGeo::Cartesian.preferred_factory(srid: srid) end def geographic_factory