diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-11-24 10:35:49 +0000 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-11-24 10:35:49 +0000 |
| commit | 8494003ebf71ef437dfccb9374366a51ecb5924c (patch) | |
| tree | 88f105ebb3ebdd84b64b4b5cb5f00db5cacd9e2d /spec/controllers/track_controller_spec.rb | |
| parent | fbfebdbe1c5b13f86f92404c3397d6dcb75766ce (diff) | |
| parent | b7075181100852ff2117d61b02881e84deaafa87 (diff) | |
Merge remote-tracking branch 'jpmckinney/pre1.9' into develop
Conflicts:
spec/controllers/request_controller_spec.rb
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 7fcc81017..90d13495f 100644 --- a/spec/controllers/track_controller_spec.rb +++ b/spec/controllers/track_controller_spec.rb @@ -58,7 +58,7 @@ describe TrackController, "when sending alerts for a track" do deliveries.size.should == 1 mail = deliveries[0] mail.body.should =~ /Alter your subscription/ - mail.to_addrs.to_s.should include(users(:silly_name_user).email) + mail.to_addrs.first.to_s.should include(users(:silly_name_user).email) mail.body =~ /(http:\/\/.*\/c\/(.*))/ mail_url = $1 mail_token = $2 |