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/controllers/user_controller_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/controllers/user_controller_spec.rb')
| -rw-r--r-- | spec/controllers/user_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/user_controller_spec.rb b/spec/controllers/user_controller_spec.rb index 32398c053..386d1b04b 100644 --- a/spec/controllers/user_controller_spec.rb +++ b/spec/controllers/user_controller_spec.rb @@ -337,7 +337,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 #{MySociety::Config.get('SITE_NAME')} to send you the message below") + mail.body.should include("Bob Smith has used #{Configuration::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).name_and_email |