Merge branch 'wdtk' of github.com:sebbacon/alaveteli into wdtk

1 files changed, 14 insertions, 1 deletions

diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index 0a1d57f0c..f16cee312 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -2,6 +2,19 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 require 'fakeweb'
 
 describe ApplicationController, "when accessing third party services" do
+    before (:each) do
+        FakeWeb.clean_registry
+    end
+    after (:each) do
+        FakeWeb.clean_registry
+    end
+    it "should succeed if the service responds OK" do
+        config = MySociety::Config.load_default()
+        config['GAZE_URL'] = 'http://denmark.com'
+        FakeWeb.register_uri(:get, %r|denmark.com|, :body => "DK")
+        country = self.controller.send :country_from_ip
+        country.should == "DK"
+    end
     it "should fail silently if the country_from_ip domain doesn't exist" do
         config = MySociety::Config.load_default()
         config['GAZE_URL'] = 'http://12123sdf14qsd.com'
@@ -15,7 +28,7 @@ describe ApplicationController, "when accessing third party services" do
         country.should == config['ISO_COUNTRY_CODE']
     end
     it "should fail silently if the country_from_ip service returns an error" do
-        FakeWeb.register_uri(:get, %r|.*|, :body => "Error", :status => ["500", "Error"])
+        FakeWeb.register_uri(:get, %r|500.com|, :body => "Error", :status => ["500", "Error"])
         config = MySociety::Config.load_default()
         config['GAZE_URL'] = 'http://500.com'
         country = self.controller.send :country_from_ip