Merge branch 'master' into francis-profile-photo

Conflicts:
	app/views/user/show.rhtml
	commonlib
	spec/controllers/user_controller_spec.rb

1 files changed, 9 insertions, 1 deletions

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 005ae8174..ddb9ab14b 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -7,7 +7,7 @@ require 'spec/rails'
 Spec::Runner.configure do |config|
   config.use_transactional_fixtures = true
   config.use_instantiated_fixtures  = false
-  config.fixture_path = RAILS_ROOT + '/spec/fixtures'
+  config.fixture_path = RAILS_ROOT + '/spec/fixtures/'
 
   # You can declare fixtures for each behaviour like this:
   #   describe "...." do
@@ -38,10 +38,18 @@ 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}"
 end
 
+def update_xapian_index
+    verbose = false
+    ActsAsXapian.update_index(flush_to_disk=true, verbose) 
+end
+
 # Validate an entire HTML page
 def validate_html(html)
     $tempfilecount = $tempfilecount + 1