aboutsummaryrefslogtreecommitdiffstats
path: root/spec/controllers/track_controller_spec.rb
diff options
context:
space:
mode:
authorSeb Bacon <seb.bacon@gmail.com>2011-09-09 09:07:20 +0100
committerSeb Bacon <seb.bacon@gmail.com>2011-09-09 09:07:20 +0100
commitb0181d36715c4e5258803c735b72a809b0f254a9 (patch)
treef7f496910e93213692b0ac295c08811ec03d1360 /spec/controllers/track_controller_spec.rb
parenta9c7286807dca10872b5c659c216e1e2a754e9c3 (diff)
parente1d38525ae985d268a5d5478ed8122c5a5b19871 (diff)
Merge origin/develop into local develop (including Nick's design changes)
Diffstat (limited to 'spec/controllers/track_controller_spec.rb')
-rw-r--r--spec/controllers/track_controller_spec.rb2
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