3 files changed, 9 insertions, 9 deletions
diff --git a/spec/controllers/general_controller_spec.rb b/spec/controllers/general_controller_spec.rb
index d4aa034a7..9a88dbc3a 100644
--- a/spec/controllers/general_controller_spec.rb
+++ b/spec/controllers/general_controller_spec.rb
@@ -20,13 +20,13 @@ end
 describe GeneralController, 'when getting the blog feed' do
 
     it 'should add a lang param correctly to a url with no querystring' do
-        Configuration.stub!(:blog_feed).and_return("http://blog.example.com")
+        AlaveteliConfiguration.stub!(:blog_feed).and_return("http://blog.example.com")
         get :blog
         assigns[:feed_url].should == "http://blog.example.com?lang=en"
     end
 
     it 'should add a lang param correctly to a url with an existing querystring' do
-        Configuration.stub!(:blog_feed).and_return("http://blog.example.com?alt=rss")
+        AlaveteliConfiguration.stub!(:blog_feed).and_return("http://blog.example.com?alt=rss")
         get :blog
         assigns[:feed_url].should == "http://blog.example.com?alt=rss&lang=en"
     end
@@ -104,11 +104,11 @@ describe GeneralController, "when showing the frontpage" do
             before do
                 @default_lang_home_link = /href=".*\/en\//
                 @other_lang_home_link = /href=".*\/es\//
-                @old_include_default_locale_in_urls = Configuration::include_default_locale_in_urls
+                @old_include_default_locale_in_urls = AlaveteliConfiguration::include_default_locale_in_urls
             end
 
             def set_default_locale_in_urls(value)
-                Configuration.stub!(:include_default_locale_in_urls).and_return(value)
+                AlaveteliConfiguration.stub!(:include_default_locale_in_urls).and_return(value)
                 load Rails.root.join("config/initializers/fast_gettext.rb")
             end
 
diff --git a/spec/controllers/services_controller_spec.rb b/spec/controllers/services_controller_spec.rb
index 796c6b63d..399f48acb 100644
--- a/spec/controllers/services_controller_spec.rb
+++ b/spec/controllers/services_controller_spec.rb
@@ -54,27 +54,27 @@ describe ServicesController, "when returning a message for people in other count
         it "should return the 'another country' message if the service responds OK" do
             config = MySociety::Config.load_default()
             config['ISO_COUNTRY_CODE'] = "DE"
-            Configuration.stub!(:gaze_url).and_return('http://denmark.com')
+            AlaveteliConfiguration.stub!(:gaze_url).and_return('http://denmark.com')
             FakeWeb.register_uri(:get, %r|denmark.com|, :body => "DK")
             get :other_country_message
             response.should be_success
             response.body.should == 'Hello! We have an  <a href="/help/alaveteli?country_name=Deutschland">important message</a> for visitors outside Deutschland <span class="close-button">X</span>'
         end
         it "should default to no message if the country_from_ip domain doesn't exist" do
-            Configuration.stub!(:gaze_url).and_return('http://12123sdf14qsd.com')
+            AlaveteliConfiguration.stub!(:gaze_url).and_return('http://12123sdf14qsd.com')
             get :other_country_message
             response.should be_success
             response.body.should == ''
         end
         it "should default to no message if the country_from_ip service doesn't exist" do
-            Configuration.stub!(:gaze_url).and_return('http://www.google.com')
+            AlaveteliConfiguration.stub!(:gaze_url).and_return('http://www.google.com')
             get :other_country_message
             response.should be_success
             response.body.should == ''
         end
         it "should default to no message if the country_from_ip service returns an error" do
             FakeWeb.register_uri(:get, %r|500.com|, :body => "Error", :status => ["500", "Error"])
-            Configuration.stub!(:gaze_url).and_return('http://500.com')
+            AlaveteliConfiguration.stub!(:gaze_url).and_return('http://500.com')
             get :other_country_message
             response.should be_success
             response.body.should == ''
diff --git a/spec/controllers/user_controller_spec.rb b/spec/controllers/user_controller_spec.rb
index 0825d12bf..6cd1c099f 100644
--- a/spec/controllers/user_controller_spec.rb
+++ b/spec/controllers/user_controller_spec.rb
@@ -332,7 +332,7 @@ describe UserController, "when sending another user a message" do
         deliveries = ActionMailer::Base.deliveries
         deliveries.size.should  == 1
         mail = deliveries[0]
-        mail.body.should include("Bob Smith has used #{Configuration::site_name} to send you the message below")
+        mail.body.should include("Bob Smith has used #{AlaveteliConfiguration::site_name} to send you the message below")
         mail.body.should include("Just a test!")
         #mail.to_addrs.first.to_s.should == users(:silly_name_user).name_and_email # XXX fix some nastiness with quoting name_and_email
         mail.from_addrs.first.to_s.should == users(:bob_smith_user).email