Merge branch 'fixing-xapian-reindexing' into release/0.5

2 files changed, 5 insertions, 4 deletions

diff --git a/spec/controllers/user_controller_spec.rb b/spec/controllers/user_controller_spec.rb
index cf50bcc7a..c13d7c9fc 100644
--- a/spec/controllers/user_controller_spec.rb
+++ b/spec/controllers/user_controller_spec.rb
@@ -32,10 +32,10 @@ describe UserController, "when showing a user" do
         session[:user_id] = users(:bob_smith_user).id
         get :show, :url_name => "bob_smith", :view => 'requests'
         response.body.should_not include("Change your password")
-        response.body.should include("Freedom of Information requests")
+        response.body.should match(/Your [0-9]+ Freedom of Information requests/)
         get :show, :url_name => "bob_smith", :view => 'profile'
         response.body.should include("Change your password")
-        response.body.should_not include("Freedom of Information requests")
+        response.body.should_not match(/Your [0-9]+ Freedom of Information requests/)
     end
 
     it "should assign the user" do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 5c5cd9a7f..29ce6bca5 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -78,7 +78,6 @@ def load_file_fixture(file_name)
 end
 
 def rebuild_xapian_index(terms = true, values = true, texts = true, dropfirst = true)
-    parse_all_incoming_messages
     if dropfirst
         begin
             ActsAsXapian.readable_init
@@ -86,7 +85,9 @@ def rebuild_xapian_index(terms = true, values = true, texts = true, dropfirst =
         rescue RuntimeError
         end
         ActsAsXapian.writable_init
+        ActsAsXapian.writable_db.close
     end
+    parse_all_incoming_messages
     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.
@@ -96,7 +97,7 @@ end
 
 def update_xapian_index
     verbose = false
-    ActsAsXapian.update_index(flush_to_disk=true, verbose) 
+    ActsAsXapian.update_index(flush_to_disk=false, verbose) 
 end
 
 # Validate an entire HTML page