aboutsummaryrefslogtreecommitdiffstats
path: root/spec/controllers/track_controller_spec.rb
diff options
context:
space:
mode:
authorMatthew Landauer <matthew@openaustralia.org>2013-01-25 11:23:43 +1100
committerMatthew Landauer <matthew@openaustralia.org>2013-01-25 11:23:43 +1100
commit8ab884f0da68b17f33577a197ebd0e7d412a28ed (patch)
tree64a88790faf5a8712b0ba87f9c6c0cc127975d82 /spec/controllers/track_controller_spec.rb
parent3a2d3598fffb6ce5b2ab78d3d3685bf42326cb7a (diff)
Disable routing filter in tests by using RoutingFilter.active rather than writing to ActionController::Routing::Routes.filters
Diffstat (limited to 'spec/controllers/track_controller_spec.rb')
-rw-r--r--spec/controllers/track_controller_spec.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/spec/controllers/track_controller_spec.rb b/spec/controllers/track_controller_spec.rb
index cd7932e90..009ef2f4a 100644
--- a/spec/controllers/track_controller_spec.rb
+++ b/spec/controllers/track_controller_spec.rb
@@ -66,8 +66,7 @@ describe TrackController, "when sending alerts for a track" do
it "should send alerts" do
# Don't do clever locale-insertion-unto-URL stuff
- old_filters = ActionController::Routing::Routes.filters
- ActionController::Routing::Routes.filters = RoutingFilter::Chain.new
+ RoutingFilter.active = false
# set the time the comment event happened at to within the last week
ire = info_request_events(:silly_comment_event)
@@ -115,7 +114,7 @@ describe TrackController, "when sending alerts for a track" do
deliveries.size.should == 0
# Restore the routing filters
- ActionController::Routing::Routes.filters = old_filters
+ RoutingFilter.active = true
end
it "should send localised alerts" do