diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2011-03-25 15:20:59 +0000 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2011-03-25 15:20:59 +0000 |
| commit | 2bb79f893805e972f6efe5cb7cfe90dd0efa4107 (patch) | |
| tree | 47084acc8d48126b9e891bb50c217be43be27641 /spec/controllers/track_controller_spec.rb | |
| parent | 22c25e42847d41924d43d31f3ef67be1ae4a155e (diff) | |
| parent | 1fb57d66c22000d4164c033ffd9353aa9030255b (diff) | |
resolve merge conflicts
Diffstat (limited to 'spec/controllers/track_controller_spec.rb')
| -rw-r--r-- | spec/controllers/track_controller_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/track_controller_spec.rb b/spec/controllers/track_controller_spec.rb index c31491375..a37b1ea01 100644 --- a/spec/controllers/track_controller_spec.rb +++ b/spec/controllers/track_controller_spec.rb @@ -37,11 +37,11 @@ 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 include LinkToHelper # for main_url - + before do rebuild_xapian_index end - + it "should send alerts" do # set the time the comment event happened at to within the last week ire = info_request_events(:silly_comment_event) |