Rename Configuration class to avoid conflict with ActiveSupport::Configurable

1 files changed, 5 insertions, 5 deletions

diff --git a/spec/models/mail_server_log_spec.rb b/spec/models/mail_server_log_spec.rb
index d0a1d202f..2b44a4559 100644
--- a/spec/models/mail_server_log_spec.rb
+++ b/spec/models/mail_server_log_spec.rb
@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe MailServerLog do
     describe ".load_file" do
         before :each do
-            Configuration.stub!(:incoming_email_domain).and_return("example.com")
+            AlaveteliConfiguration.stub!(:incoming_email_domain).and_return("example.com")
             File.stub_chain(:stat, :mtime).and_return(DateTime.new(2012, 10, 10))
         end
 
@@ -64,8 +64,8 @@ describe MailServerLog do
 
     describe ".email_addresses_on_line" do
         before :each do
-            Configuration.stub!(:incoming_email_domain).and_return("example.com")
-            Configuration.stub!(:incoming_email_prefix).and_return("foi+")
+            AlaveteliConfiguration.stub!(:incoming_email_domain).and_return("example.com")
+            AlaveteliConfiguration.stub!(:incoming_email_prefix).and_return("foi+")
         end
 
         it "recognises a single incoming email" do
@@ -106,7 +106,7 @@ describe MailServerLog do
             # Postfix logs for a single email go over multiple lines. They are all tied together with the Queue ID.
             # See http://onlamp.com/onlamp/2004/01/22/postfix.html
             it "loads the postfix log and untangles seperate email transactions using the queue ID" do
-                Configuration.stub!(:incoming_email_domain).and_return("example.com")
+                AlaveteliConfiguration.stub!(:incoming_email_domain).and_return("example.com")
                 log.stub!(:rewind)
                 ir1 = info_requests(:fancy_dog_request)
                 ir2 = info_requests(:naughty_chicken_request)
@@ -135,7 +135,7 @@ describe MailServerLog do
 
         describe ".scan_for_postfix_queue_ids" do
             it "returns the queue ids of interest with the connected email addresses" do
-                Configuration.stub!(:incoming_email_domain).and_return("example.com")
+                AlaveteliConfiguration.stub!(:incoming_email_domain).and_return("example.com")
                 MailServerLog.scan_for_postfix_queue_ids(log).should == {
                     "CB55836EE58C" => ["request-14-e0e09f97@example.com"],
                     "9634B16F7F7" => ["request-10-1234@example.com"]