diff options
| author | Henare Degan <henare.degan@gmail.com> | 2013-03-03 14:52:30 +1100 |
|---|---|---|
| committer | Henare Degan <henare.degan@gmail.com> | 2013-03-03 14:52:30 +1100 |
| commit | cbdff06aa95a7987b54c712dc6729e138f608eca (patch) | |
| tree | b101dd575c5cab97675c0ac488e68fa6cbd0c4fd /spec/controllers/user_controller_spec.rb | |
| parent | f02881b5bf5cc4d633983100078be2e64b8e6fcc (diff) | |
Rename Configuration class to avoid conflict with ActiveSupport::Configurable
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 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 |