diff options
author | Seb Bacon <seb.bacon@gmail.com> | 2011-09-05 12:32:17 +0100 |
---|---|---|
committer | Seb Bacon <seb.bacon@gmail.com> | 2011-09-05 12:32:17 +0100 |
commit | 7f0ae82d44873b53cc87c659b42415ce4866c7b4 (patch) | |
tree | fdce14b0658bb05aef087dd4e09dc25c9a79ea8c /spec/controllers/track_controller_spec.rb | |
parent | 2926ee877bcf8974c529e1271ded42971fe0d632 (diff) | |
parent | 96c4dd912083edcd0c9eda76bd2301bb4a1a6d53 (diff) |
Merge branch 'develop' of github.com:sebbacon/alaveteli into develop, fix conflicts
Diffstat (limited to 'spec/controllers/track_controller_spec.rb')
-rw-r--r-- | spec/controllers/track_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/track_controller_spec.rb b/spec/controllers/track_controller_spec.rb index c3dc98a67..8c2e19c58 100644 --- a/spec/controllers/track_controller_spec.rb +++ b/spec/controllers/track_controller_spec.rb @@ -104,7 +104,7 @@ describe TrackController, "when sending alerts for a track" do TrackMailer.alert_tracks deliveries = ActionMailer::Base.deliveries mail = deliveries[0] - mail.body.should include('el equipo de Alaveteli') + mail.body.should include('el equipo de ') end end |