From 95a16519d588cfeadfa30dd48fceb196ecc54bd4 Mon Sep 17 00:00:00 2001 From: Michael Noack Date: Mon, 10 Oct 2016 22:27:40 +1030 Subject: [PATCH] get_last_url -> last_url --- test/helper.rb | 2 +- test/test_bing_geocoder.rb | 2 +- test/test_fcc_geocoder.rb | 2 +- test/test_free_geo_ip_geocoder.rb | 2 +- test/test_geo_plugin_geocoder.rb | 2 +- test/test_geobytes_geocoder.rb | 2 +- test/test_geocodio_geocoder.rb | 2 +- test/test_geonames_geocoder.rb | 2 +- test/test_ripe_geocoder.rb | 2 +- test/test_yahoo_geocoder.rb | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/helper.rb b/test/helper.rb index 47d6be59..d0c8f704 100644 --- a/test/helper.rb +++ b/test/helper.rb @@ -38,7 +38,7 @@ class TestHelper def self.last_url(url) @@url = url end - def self.get_last_url + def self.last_url @@url end end diff --git a/test/test_bing_geocoder.rb b/test/test_bing_geocoder.rb index a5a8601f..e3436c07 100644 --- a/test/test_bing_geocoder.rb +++ b/test/test_bing_geocoder.rb @@ -8,7 +8,7 @@ def setup end def assert_url(expected_url) - assert_equal expected_url, TestHelper.get_last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, '') + assert_equal expected_url, TestHelper.last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, '') end # the testing methods themselves diff --git a/test/test_fcc_geocoder.rb b/test/test_fcc_geocoder.rb index 1a83d3b6..8a4f83aa 100644 --- a/test/test_fcc_geocoder.rb +++ b/test/test_fcc_geocoder.rb @@ -8,7 +8,7 @@ def setup end def assert_url(expected_url) - assert_equal expected_url, TestHelper.get_last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, '').gsub('%20', '+') + assert_equal expected_url, TestHelper.last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, '').gsub('%20', '+') end def test_fcc_reverse_geocode diff --git a/test/test_free_geo_ip_geocoder.rb b/test/test_free_geo_ip_geocoder.rb index 08b22662..87bfce2c 100644 --- a/test/test_free_geo_ip_geocoder.rb +++ b/test/test_free_geo_ip_geocoder.rb @@ -7,7 +7,7 @@ def setup end def assert_url(expected_url) - assert_equal expected_url, TestHelper.get_last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, '').gsub('%20', '+') + assert_equal expected_url, TestHelper.last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, '').gsub('%20', '+') end def test_free_geo_ip_geocode diff --git a/test/test_geo_plugin_geocoder.rb b/test/test_geo_plugin_geocoder.rb index bdfc94eb..3e0b1e18 100644 --- a/test/test_geo_plugin_geocoder.rb +++ b/test/test_geo_plugin_geocoder.rb @@ -27,7 +27,7 @@ def setup end def assert_url(expected_url) - assert_equal expected_url, TestHelper.get_last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, '').gsub('%20', '+') + assert_equal expected_url, TestHelper.last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, '').gsub('%20', '+') end def test_geo_plugin_geocode diff --git a/test/test_geobytes_geocoder.rb b/test/test_geobytes_geocoder.rb index 7182e9a7..827f4fc9 100644 --- a/test/test_geobytes_geocoder.rb +++ b/test/test_geobytes_geocoder.rb @@ -6,7 +6,7 @@ def setup end def assert_url(expected_url) - assert_equal expected_url, TestHelper.get_last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, '').gsub('%20', '+') + assert_equal expected_url, TestHelper.last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, '').gsub('%20', '+') end def test_geobytes_geocoder diff --git a/test/test_geocodio_geocoder.rb b/test/test_geocodio_geocoder.rb index 233b919c..0978043b 100644 --- a/test/test_geocodio_geocoder.rb +++ b/test/test_geocodio_geocoder.rb @@ -10,7 +10,7 @@ def setup end def assert_url(expected_url) - assert_equal expected_url, TestHelper.get_last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, '').gsub('%20', '+') + assert_equal expected_url, TestHelper.last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, '').gsub('%20', '+') end def test_geocodio_geocode diff --git a/test/test_geonames_geocoder.rb b/test/test_geonames_geocoder.rb index 3c29ac65..6eb57919 100644 --- a/test/test_geonames_geocoder.rb +++ b/test/test_geonames_geocoder.rb @@ -8,7 +8,7 @@ def setup end def assert_url(expected_url) - assert_equal expected_url, TestHelper.get_last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, '').gsub('%20', '+') + assert_equal expected_url, TestHelper.last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, '').gsub('%20', '+') end def test_geonames_missing_key diff --git a/test/test_ripe_geocoder.rb b/test/test_ripe_geocoder.rb index c7af9bb6..7462ff41 100644 --- a/test/test_ripe_geocoder.rb +++ b/test/test_ripe_geocoder.rb @@ -9,7 +9,7 @@ def setup end def assert_url(expected_url) - assert_equal expected_url, TestHelper.get_last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, '').gsub('%20', '+') + assert_equal expected_url, TestHelper.last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, '').gsub('%20', '+') end def test_45 diff --git a/test/test_yahoo_geocoder.rb b/test/test_yahoo_geocoder.rb index 9c14ffd0..544d4bab 100644 --- a/test/test_yahoo_geocoder.rb +++ b/test/test_yahoo_geocoder.rb @@ -15,7 +15,7 @@ def setup end def assert_yahoo_url(expected_url) - assert_equal expected_url, TestHelper.get_last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, '').gsub('%20', '+') + assert_equal expected_url, TestHelper.last_url.gsub(/&oauth_[a-z_]+=[a-zA-Z0-9\-. %]+/, '').gsub('%20', '+') end # the testing methods themselves