diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-01-23 21:53:10 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-01-23 21:53:10 +0000 |
| commit | 0e546a79b205124d7b95b89e4a2e9cc520a4fc10 (patch) | |
| tree | 791ae964c0dd4aba79cc9a3a6537db49c594cedf /spec/controllers/track_controller_spec.rb | |
| parent | 2c97a42455edb338a4ffeb529c9dd08bdf2864e0 (diff) | |
| parent | 000a4b3bc2858124301eb36553b018266cfe2cae (diff) | |
Merge branch 'release/0.5' into develop
Diffstat (limited to 'spec/controllers/track_controller_spec.rb')
| -rw-r--r-- | spec/controllers/track_controller_spec.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/spec/controllers/track_controller_spec.rb b/spec/controllers/track_controller_spec.rb index 90d13495f..ad4d651cb 100644 --- a/spec/controllers/track_controller_spec.rb +++ b/spec/controllers/track_controller_spec.rb @@ -46,7 +46,9 @@ describe TrackController, "when sending alerts for a track" do it "should send alerts" do # Don't do clever locale-insertion-unto-URL stuff - ActionController::Routing::Routes.filters.clear + old_filters = ActionController::Routing::Routes.filters + ActionController::Routing::Routes.filters = RoutingFilter::Chain.new + # set the time the comment event happened at to within the last week ire = info_request_events(:silly_comment_event) ire.created_at = Time.now - 3.days @@ -91,6 +93,9 @@ describe TrackController, "when sending alerts for a track" do TrackMailer.alert_tracks deliveries = ActionMailer::Base.deliveries deliveries.size.should == 0 + + # Restore the routing filters + ActionController::Routing::Routes.filters = old_filters end it "should send localised alerts" do |