diff options
| author | Robin Houston <robin@lenny.robin> | 2011-09-08 00:58:31 +0100 |
|---|---|---|
| committer | Robin Houston <robin@lenny.robin> | 2011-09-08 00:58:31 +0100 |
| commit | 0b35486809a9a5ef8ba371549b05390682427392 (patch) | |
| tree | 019d6dd61f30b6639eb0585b6db9a618f4e1854e /spec/controllers/track_controller_spec.rb | |
| parent | 6e0e5e5bed89ff2093e1cca3fa50310f678565fd (diff) | |
| parent | e35a213a5550382c6aeeeadf29abdd178c87ea32 (diff) | |
Merge branch 'wdtk' into develop
Conflicts:
config/general.yml-example
spec/models/track_mailer_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 8c2e19c58..435d9a0d3 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 :info_requests, :outgoing_messages, :incoming_messages, :raw_emails, :info_request_events, :users, :track_things, :track_things_sent_emails, :public_bodies, :public_body_translations + 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 include LinkToHelper # for main_url before(:each) do |