Merge branch 'release/0.12'0.12

Conflicts:
    locale/he_IL/app.po
    locale/hr_HR/app.po
    locale/nb_NO/app.po
    locale/uk/app.po

1 files changed, 6 insertions, 2 deletions

diff --git a/spec/mailers/track_mailer_spec.rb b/spec/mailers/track_mailer_spec.rb
index 32012ca42..e8094b692 100644
--- a/spec/mailers/track_mailer_spec.rb
+++ b/spec/mailers/track_mailer_spec.rb
@@ -69,11 +69,15 @@ describe TrackMailer do
                     @xapian_search = mock('xapian search', :results => [])
                     @found_event = mock_model(InfoRequestEvent, :described_at => @track_thing.created_at + 1.day)
                     @search_result = {:model => @found_event}
-                    InfoRequest.stub!(:full_search).and_return(@xapian_search)
+                    ActsAsXapian::Search.stub!(:new).and_return(@xapian_search)
                 end
 
                 it 'should ask for the events returned by the tracking query' do
-                    InfoRequest.should_receive(:full_search).with([InfoRequestEvent], 'test query', 'described_at', true, nil, 100, 1).and_return(@xapian_search)
+                    ActsAsXapian::Search.should_receive(:new).with([InfoRequestEvent], 'test query',
+                        :sort_by_prefix => 'described_at',
+                        :sort_by_ascending => true,
+                        :collapse_by_prefix => nil,
+                        :limit => 100).and_return(@xapian_search)
                     TrackMailer.alert_tracks
                 end