Merge branch 'release/0.13'0.13

Conflicts:
    locale/bg/app.po
    locale/es/app.po
    locale/fi/app.po
    locale/fr/app.po
    locale/fr_CA/app.po
    locale/he_IL/app.po
    locale/hr/app.po
    locale/nb_NO/app.po
    locale/nl/app.po
    locale/pt_BR/app.po
    locale/ro_RO/app.po
    locale/sl/app.po
    locale/vi/app.po
    script/rails-post-deploy

1 files changed, 5 insertions, 0 deletions

diff --git a/spec/models/xapian_spec.rb b/spec/models/xapian_spec.rb
index c40334142..7aab9cdc6 100644
--- a/spec/models/xapian_spec.rb
+++ b/spec/models/xapian_spec.rb
@@ -373,6 +373,11 @@ end
 # I would expect ActsAsXapian to have some tests under vendor/plugins/acts_as_xapian, but
 # it looks like this is not the case. Putting a test here instead.
 describe ActsAsXapian::Search, "#words_to_highlight" do
+    before(:each) do
+         load_raw_emails_data
+         get_fixtures_xapian_index
+     end
+
     it "should return a list of words used in the search" do
         s = ActsAsXapian::Search.new([PublicBody], "albatross words", :limit => 100)
         s.words_to_highlight.should == ["albatross", "words"]