From 66a0a11891aa4354155f4ee627bf5ddd33e4d413 Mon Sep 17 00:00:00 2001
From: Alex Reisner <alex@alexreisner.com>
Date: Fri, 7 Feb 2014 21:03:55 -0500
Subject: [PATCH] Create ModelTest and move relevant tests into it.
---
test/unit/configuration_test.rb | 16 +---------------
.../unit/{custom_block_test.rb => model_test.rb} | 9 +++++++--
2 files changed, 8 insertions(+), 17 deletions(-)
rename test/unit/{custom_block_test.rb => model_test.rb} (74%)
diff --git a/test/unit/configuration_test.rb b/test/unit/configuration_test.rb
index 212f87ae..8b9575a3 100644
--- a/test/unit/configuration_test.rb
+++ b/test/unit/configuration_test.rb
@@ -35,20 +35,6 @@ class ConfigurationTest < Test::Unit::TestCase
assert_equal "aaa", Geocoder.config_for_lookup(:google).api_key
end
- def test_model_configuration
- PlaceReverseGeocoded.reverse_geocoded_by :latitude, :longitude, :method => :spherical, :units => :km
- assert_equal :km, PlaceReverseGeocoded.geocoder_options[:units]
- assert_equal :spherical, PlaceReverseGeocoded.geocoder_options[:method]
-
- v = PlaceReverseGeocoded.new(*reverse_geocoded_object_params(:msg))
- v.latitude = 0
- v.longitude = 0
- assert_equal 111, v.distance_to([0,1]).round
- v.latitude = 40.750354
- v.longitude = -73.993371
- assert_equal 136, v.bearing_from([50,-85]).round
- end
-
def test_configuration_chain
v = PlaceReverseGeocoded.new(*reverse_geocoded_object_params(:msg))
v.latitude = 0
@@ -59,7 +45,7 @@ class ConfigurationTest < Test::Unit::TestCase
assert_equal 69, v.distance_to([0,1], :mi).round
# per-model configuration > global configuration
- PlaceReverseGeocoded.reverse_geocoded_by :latitude, :longitude, :method => :spherical, :units => :mi
+ PlaceReverseGeocoded.reverse_geocoded_by :latitude, :longitude, method: :spherical, units: :mi
assert_equal 69, v.distance_to([0,1]).round
# method option > per-model configuration
diff --git a/test/unit/custom_block_test.rb b/test/unit/model_test.rb
similarity index 74%
rename from test/unit/custom_block_test.rb
rename to test/unit/model_test.rb
index 7ec5b3ea..f539eb04 100644
--- a/test/unit/custom_block_test.rb
+++ b/test/unit/model_test.rb
@@ -1,7 +1,7 @@
# encoding: utf-8
require 'test_helper'
-class CustomBlockTest < Test::Unit::TestCase
+class ModelTest < Test::Unit::TestCase
def test_geocode_with_block_runs_block
e = PlaceWithCustomResultsHandling.new(*geocoded_object_params(:msg))
@@ -28,5 +28,10 @@ class CustomBlockTest < Test::Unit::TestCase
e.reverse_geocode
assert_nil e.address
end
-end
+ def test_units_and_method
+ PlaceReverseGeocoded.reverse_geocoded_by :latitude, :longitude, method: :spherical, units: :km
+ assert_equal :km, PlaceReverseGeocoded.geocoder_options[:units]
+ assert_equal :spherical, PlaceReverseGeocoded.geocoder_options[:method]
+ end
+end
--
GitLab