diff options
| -rw-r--r-- | spec/spec_helper.rb.rails2 | 20 | ||||
| -rw-r--r-- | spec/support/xapian_index.rb | 21 |
2 files changed, 21 insertions, 20 deletions
diff --git a/spec/spec_helper.rb.rails2 b/spec/spec_helper.rb.rails2 index 3be11c0c7..4f1d125b3 100644 --- a/spec/spec_helper.rb.rails2 +++ b/spec/spec_helper.rb.rails2 @@ -95,26 +95,6 @@ Spec::Runner.configure do |config| end # XXX No idea what namespace/class/module to put this in -# Create a clean xapian index based on the fixture files and the raw_email data. -def create_fixtures_xapian_index - load_raw_emails_data - rebuild_xapian_index -end - -# Copy the xapian index created in create_fixtures_xapian_index to a temporary -# copy at the same level and point xapian at the copy -def get_fixtures_xapian_index() - # Create a base index for the fixtures if not already created - $existing_xapian_db ||= create_fixtures_xapian_index - # Store whatever the xapian db path is originally - $original_xapian_path ||= ActsAsXapian.db_path - path_array = $original_xapian_path.split(File::Separator) - path_array.pop - temp_path = File.join(path_array, 'test.temp') - FileUtils.remove_entry_secure(temp_path, force=true) - FileUtils.cp_r($original_xapian_path, temp_path) - ActsAsXapian.db_path = temp_path -end def basic_auth_login(request, username = nil, password = nil) username = Configuration::admin_username if username.nil? diff --git a/spec/support/xapian_index.rb b/spec/support/xapian_index.rb index 21f6192ef..344c28ebb 100644 --- a/spec/support/xapian_index.rb +++ b/spec/support/xapian_index.rb @@ -19,3 +19,24 @@ end def update_xapian_index ActsAsXapian.update_index(flush_to_disk=false, verbose=false) end + +# Copy the xapian index created in create_fixtures_xapian_index to a temporary +# copy at the same level and point xapian at the copy +def get_fixtures_xapian_index() + # Create a base index for the fixtures if not already created + $existing_xapian_db ||= create_fixtures_xapian_index + # Store whatever the xapian db path is originally + $original_xapian_path ||= ActsAsXapian.db_path + path_array = $original_xapian_path.split(File::Separator) + path_array.pop + temp_path = File.join(path_array, 'test.temp') + FileUtils.remove_entry_secure(temp_path, force=true) + FileUtils.cp_r($original_xapian_path, temp_path) + ActsAsXapian.db_path = temp_path +end + +# Create a clean xapian index based on the fixture files and the raw_email data. +def create_fixtures_xapian_index + load_raw_emails_data + rebuild_xapian_index +end |