diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-08-20 09:51:18 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-08-20 09:51:18 +0100 |
| commit | 3d12cbe6ee7ff49dad9a473efc0792b2a4f4cba6 (patch) | |
| tree | 1c43d3a004293f442f61b0e64847a4ef16cacd2a /spec/controllers/track_controller_spec.rb | |
| parent | c449240a1b1cddebb53e9748b15be43c0f65c463 (diff) | |
| parent | 4b95ccffc468c256d6ba6248303dd2b78bf5896a (diff) | |
Merge branch 'release/0.13' into wdtk
Conflicts:
locale/he_IL/app.po
locale/hr_HR/app.po
locale/nb_NO/app.po
locale/uk/app.po
Diffstat (limited to 'spec/controllers/track_controller_spec.rb')
| -rw-r--r-- | spec/controllers/track_controller_spec.rb | 5 |
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 |