diff options
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/models/xapian_spec.rb | 1 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/spec/models/xapian_spec.rb b/spec/models/xapian_spec.rb index c23ff6e27..932966dfb 100644 --- a/spec/models/xapian_spec.rb +++ b/spec/models/xapian_spec.rb @@ -14,7 +14,6 @@ describe User, " when indexing users with Xapian" do it "should search by 'about me' text" do user = users(:bob_smith_user) - rebuild_xapian_index # def InfoRequest.full_search(models, query, order, ascending, collapse, per_page, page) xapian_object = InfoRequest.full_search([User], "stuff", 'created_at', true, nil, 100, 1) xapian_object.results.size.should == 1 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 20e630a26..ecb67a3b4 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -78,11 +78,11 @@ def load_file_fixture(file_name) end def rebuild_xapian_index - # XXX could for speed call ActsAsXapian.rebuild_index directly, but would - # need model name list, and would need to fix acts_as_xapian so can call writes - # and reads mixed up (it asserts where it thinks it can't do this) - rebuild_name = File.dirname(__FILE__) + '/../script/rebuild-xapian-index' - Kernel.system(rebuild_name) or raise "failed to launch #{rebuild_name}, error bitcode #{$?}, exit status: #{$?.exitstatus}" + verbose = false + # safe_rebuild=true, which involves forking to avoid memory leaks, doesn't work well with rspec. + # unsafe is significantly faster, and we can afford possible memory leaks while testing. + safe_rebuild = false + ActsAsXapian.rebuild_index(["PublicBody", "User", "InfoRequestEvent"].map{|m| m.constantize}, verbose, safe_rebuild) end def update_xapian_index |