From aa73a07e5fc384a8ee8f409c2d0eb5898bcdb93a Mon Sep 17 00:00:00 2001
From: Miles Gould <miles@assyrian.org.uk>
Date: Fri, 23 Aug 2013 16:37:43 +0100
Subject: [PATCH] Add in_testing config option to Nominatum

Checking against Rails.env.test? fails on Travis.
---
 config/environments/test.rb | 2 ++
 lib/nominatim.rb            | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/config/environments/test.rb b/config/environments/test.rb
index 46bb4b71f..bc2fd4e4b 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -53,6 +53,8 @@ Growstuff::Application.configure do
 
 end
 
+Nominatim.in_testing = true
+
 Nominatim.add_stub(
   "Amundsen-Scott Base, Antarctica", {
     :latitude =>         -90.0,
diff --git a/lib/nominatim.rb b/lib/nominatim.rb
index 33c8a4bef..c54c705b3 100644
--- a/lib/nominatim.rb
+++ b/lib/nominatim.rb
@@ -4,8 +4,13 @@ require 'json'
 
 class Nominatim
 
+  # class-level instance variable, see
+  # http://www.railstips.org/blog/archives/2006/11/18/class-and-instance-variables-in-ruby/
+  class << self; attr_accessor :in_testing end
+  @in_testing = false
+
   def self.geocode(place)
-    if Rails.env.test?
+    if self.in_testing
       return stubs[place]
     end
     json = open(