Merge branch 'release/0.6.8' into develop

Conflicts:
  lib/world_foi_websites.rb

1 files changed, 11 insertions, 11 deletions

diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index a7e505376..18341ae6f 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -2,41 +2,41 @@ 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'
+        Configuration.stub!(:gaze_url).and_return('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'
+        Configuration.stub!(:gaze_url).and_return('http://12123sdf14qsd.com')
         country = self.controller.send :country_from_ip
-        country.should == config['ISO_COUNTRY_CODE']
+        country.should == Configuration.iso_country_code
     end
     it "should fail silently if the country_from_ip service doesn't exist" do
-        config = MySociety::Config.load_default()
-        config['GAZE_URL'] = 'http://www.google.com'
+        Configuration.stub!(:gaze_url).and_return('http://www.google.com')
         country = self.controller.send :country_from_ip
-        country.should == config['ISO_COUNTRY_CODE']
+        country.should == Configuration.iso_country_code
     end
     it "should fail silently if the country_from_ip service returns an error" do
         FakeWeb.register_uri(:get, %r|500.com|, :body => "Error", :status => ["500", "Error"])
-        config = MySociety::Config.load_default()
-        config['GAZE_URL'] = 'http://500.com'
+        Configuration.stub!(:gaze_url).and_return('http://500.com')
         country = self.controller.send :country_from_ip
-        country.should == config['ISO_COUNTRY_CODE']
+        country.should == Configuration.iso_country_code
     end
 end
 
 describe ApplicationController, "when caching fragments" do
+
     it "should not fail with long filenames" do
         long_name = "blahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblah.txt"
         params = { :only_path => true,