Merge remote-tracking branch 'openaustralia_github/configuration_refactor' into develop

Conflicts:
  config/general.yml-example

2 files changed, 5 insertions, 6 deletions

diff --git a/spec/models/incoming_message_spec.rb b/spec/models/incoming_message_spec.rb
index bc73ef071..03a3c8dc3 100644
--- a/spec/models/incoming_message_spec.rb
+++ b/spec/models/incoming_message_spec.rb
@@ -312,8 +312,7 @@ describe IncomingMessage, " when censoring data" do
     end
 
     it "should apply hard-coded privacy rules to HTML files" do
-        domain = MySociety::Config.get('DOMAIN')
-        data = "http://#{domain}/c/cheese"
+        data = "http://#{Configuration::domain}/c/cheese"
         @im.html_mask_stuff!(data)
         data.should == "[WDTK login link]"
     end
diff --git a/spec/models/request_mailer_spec.rb b/spec/models/request_mailer_spec.rb
index eec362ad3..84804d4ca 100644
--- a/spec/models/request_mailer_spec.rb
+++ b/spec/models/request_mailer_spec.rb
@@ -33,7 +33,7 @@ describe RequestMailer, " when receiving incoming mail" do
         deliveries = ActionMailer::Base.deliveries
         deliveries.size.should == 1
         mail = deliveries[0]
-        mail.to.should == [ MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost') ]
+        mail.to.should == [ Configuration::contact_email ]
         deliveries.clear
     end
 
@@ -53,7 +53,7 @@ describe RequestMailer, " when receiving incoming mail" do
         deliveries = ActionMailer::Base.deliveries
         deliveries.size.should == 1
         mail = deliveries[0]
-        mail.to.should == [ MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost') ]
+        mail.to.should == [ Configuration::contact_email ]
         deliveries.clear
     end
 
@@ -73,7 +73,7 @@ describe RequestMailer, " when receiving incoming mail" do
         deliveries = ActionMailer::Base.deliveries
         deliveries.size.should == 1
         mail = deliveries[0]
-        mail.to.should == [ MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost') ]
+        mail.to.should == [ Configuration::contact_email ]
         deliveries.clear
     end
 
@@ -159,7 +159,7 @@ describe RequestMailer, " when receiving incoming mail" do
         deliveries = ActionMailer::Base.deliveries
         deliveries.size.should == 1
         mail = deliveries[0]
-        mail.to.should == [ MySociety::Config.get("CONTACT_EMAIL", 'contact@localhost') ]
+        mail.to.should == [ Configuration::contact_email ]
         deliveries.clear
     end