aboutsummaryrefslogtreecommitdiffstats
path: root/spec/controllers/track_controller_spec.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-07-29 16:32:51 +0100
committerLouise Crow <louise.crow@gmail.com>2013-07-29 16:32:51 +0100
commit6b6ada3571d9d05d8b2c6a59b5134e634775f617 (patch)
treeb81a5421bb40de9b603c5a386b5b44a02b1e931b /spec/controllers/track_controller_spec.rb
parentb17910d494ae1a459c83b43e4b668ca4e80fc680 (diff)
parenta73ffdc2a6801961ce2b5c9719651231dd484021 (diff)
Merge branch 'feature/localisation-fixes' into rails-3-develop
Diffstat (limited to 'spec/controllers/track_controller_spec.rb')
-rw-r--r--spec/controllers/track_controller_spec.rb5
1 files changed, 0 insertions, 5 deletions
diff --git a/spec/controllers/track_controller_spec.rb b/spec/controllers/track_controller_spec.rb
index 1575bc84e..a16024828 100644
--- a/spec/controllers/track_controller_spec.rb
+++ b/spec/controllers/track_controller_spec.rb
@@ -64,8 +64,6 @@ describe TrackController, "when sending alerts for a track" do
end
it "should send alerts" do
- # Don't do clever locale-insertion-unto-URL stuff
- RoutingFilter.active = false
# set the time the comment event happened at to within the last week
ire = info_request_events(:silly_comment_event)
@@ -111,9 +109,6 @@ describe TrackController, "when sending alerts for a track" do
TrackMailer.alert_tracks
deliveries = ActionMailer::Base.deliveries
deliveries.size.should == 0
-
- # Restore the routing filters
- RoutingFilter.active = true
end
it "should send localised alerts" do