diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-12-21 16:46:29 +0000 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-12-21 16:46:29 +0000 |
| commit | 7ed887f0989425d9e412890800df05637b08c025 (patch) | |
| tree | 6f1d3fb4d215f069995634907f2bb32e9220ac22 /spec/controllers/track_controller_spec.rb | |
| parent | 21f1855560daa7992b058403938655ad229e0f71 (diff) | |
| parent | 37b2fb482d31f77865bb889c049450d72876df92 (diff) | |
Merge branch 'cache-foi-attachments-seb'
Diffstat (limited to 'spec/controllers/track_controller_spec.rb')
| -rw-r--r-- | spec/controllers/track_controller_spec.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/controllers/track_controller_spec.rb b/spec/controllers/track_controller_spec.rb index 435d9a0d3..90d13495f 100644 --- a/spec/controllers/track_controller_spec.rb +++ b/spec/controllers/track_controller_spec.rb @@ -36,7 +36,7 @@ end describe TrackController, "when sending alerts for a track" do integrate_views - fixtures :comments, :info_requests, :outgoing_messages, :incoming_messages, :raw_emails, :info_request_events, :users, :track_things, :track_things_sent_emails, :public_bodies, :public_body_translations + fixtures :public_bodies, :public_body_translations, :public_body_versions, :users, :info_requests, :raw_emails, :incoming_messages, :outgoing_messages, :comments, :info_request_events, :track_things, :track_things_sent_emails include LinkToHelper # for main_url before(:each) do @@ -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 @@ -110,7 +110,7 @@ end describe TrackController, "when viewing RSS feed for a track" do integrate_views - fixtures :info_requests, :outgoing_messages, :incoming_messages, :raw_emails, :info_request_events, :users, :track_things, :comments, :public_bodies, :public_body_translations + fixtures :public_bodies, :public_body_translations, :public_body_versions, :users, :info_requests, :raw_emails, :incoming_messages, :outgoing_messages, :comments, :info_request_events, :track_things before(:each) do load_raw_emails_data(raw_emails) @@ -136,7 +136,7 @@ end describe TrackController, "when viewing JSON version of a track feed" do integrate_views - fixtures :info_requests, :outgoing_messages, :incoming_messages, :raw_emails, :info_request_events, :users, :track_things, :comments, :public_bodies, :public_body_translations + fixtures :public_bodies, :public_body_translations, :public_body_versions, :users, :info_requests, :raw_emails, :incoming_messages, :outgoing_messages, :comments, :info_request_events, :track_things before(:each) do load_raw_emails_data(raw_emails) |