diff options
author | Louise Crow <louise.crow@gmail.com> | 2012-10-01 11:03:52 +0100 |
---|---|---|
committer | Louise Crow <louise.crow@gmail.com> | 2012-10-01 11:03:52 +0100 |
commit | be96333dafd0fa0623ca4495237c8c6fa5457c14 (patch) | |
tree | 6a0dbc34767db4a49ea9231738fe17dd1df6934a /spec/models/incoming_message_spec.rb | |
parent | 3cfa6c4d1c4ae6ba5e3f22ff8757d1ec9dcd8b68 (diff) | |
parent | 6ee1e8d0a4a8cfe02797c1a853bf27af2610ad27 (diff) |
Merge remote-tracking branch 'openaustralia_github/configuration_refactor' into develop
Conflicts:
config/general.yml-example
Diffstat (limited to 'spec/models/incoming_message_spec.rb')
-rw-r--r-- | spec/models/incoming_message_spec.rb | 3 |
1 files changed, 1 insertions, 2 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 |