From 9cd8da11c4884f375e0e28ddb6efdf165b93b883 Mon Sep 17 00:00:00 2001
From: Alex Reisner <alex@alexreisner.com>
Date: Mon, 12 Sep 2011 10:22:23 -0400
Subject: [PATCH] Include FreeGeoIP in no-results test.
---
test/fixtures/freegeoip_no_results.json | 1 +
test/lookup_test.rb | 2 +-
test/test_helper.rb | 6 +++++-
3 files changed, 7 insertions(+), 2 deletions(-)
create mode 100644 test/fixtures/freegeoip_no_results.json
diff --git a/test/fixtures/freegeoip_no_results.json b/test/fixtures/freegeoip_no_results.json
new file mode 100644
index 00000000..2ac0915d
--- /dev/null
+++ b/test/fixtures/freegeoip_no_results.json
@@ -0,0 +1 @@
+<html><title>404: Not Found</title><body>404: Not Found</body></html>
diff --git a/test/lookup_test.rb b/test/lookup_test.rb
index 38b7cea9..3c72d05b 100644
--- a/test/lookup_test.rb
+++ b/test/lookup_test.rb
@@ -4,7 +4,7 @@ require 'test_helper'
class LookupTest < Test::Unit::TestCase
def test_search_returns_empty_array_when_no_results
- street_lookups.each do |l|
+ all_lookups.each do |l|
lookup = Geocoder.send(:get_lookup, l)
assert_equal [], lookup.send(:results, "no results"),
"Lookup #{l} does not return empty array when no results."
diff --git a/test/test_helper.rb b/test/test_helper.rb
index f491504a..5a417d53 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -122,7 +122,11 @@ module Geocoder
def fetch_raw_data(query, reverse = false)
raise TimeoutError if query == "timeout"
raise SocketError if query == "socket_error"
- read_fixture "freegeoip_74_200_247_59.json"
+ file = case query
+ when "no results"; :no_results
+ else "74_200_247_59"
+ end
+ read_fixture "freegeoip_#{file}.json"
end
end
--
GitLab