Update to Ruby 2+, RSpec 3 and recent Aruba

[gestion-adh.git] / features / support / env.rb

diff --git a/features/support/env.rb b/features/support/env.rb
index 7779bab6c5ade2538a7b6954344fbffb017e2961..ae8c5c3a1fe9a49ae58437715edf06db6631f5b2 100644 (file)
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -28,21 +28,22 @@ require 'mail'
 
 SafeYAML::OPTIONS[:default_mode] = :safe
 
+Aruba.configure do |config|
+  config.io_wait_timeout = 0.1
+  config.exit_timeout = 20
+end
+
 require 'nos_oignons'
 
 Before do
   ENV['GIT_COMMITTER_NAME'] = ENV['GIT_AUTHOR_NAME'] = 'J. Test'
   ENV['GIT_COMMITTER_EMAIL'] = ENV['GIT_AUTHOR_EMAIL'] = 'test@example.org'
-  @tmpdir = Dir.mktmpdir('gestion-adh')
-  @dirs = [@tmpdir]
-  @aruba_io_wait_seconds = 0.1
-  @aruba_timeout_seconds = 20
   @orig_wiki_path = ENV['NOS_OIGNONS_BOARD_WIKI_PATH']
   @orig_reminder_db_path = ENV['NOS_OIGNONS_REMINDER_DB']
   @orig_receipts_dir = ENV['NOS_OIGNONS_RECEIPTS_DIR']
-  ENV['NOS_OIGNONS_REMINDER_DB'] = File.join(current_dir, 'reminders.yaml')
+  ENV['NOS_OIGNONS_REMINDER_DB'] = expand_path('reminders.yaml')
   NosOignons::ReminderDb.instance.reload!
-  ENV['NOS_OIGNONS_RECEIPTS_DIR'] = File.join(current_dir, 'receipts')
+  ENV['NOS_OIGNONS_RECEIPTS_DIR'] = expand_path('receipts')
   FileUtils.mkdir(ENV['NOS_OIGNONS_RECEIPTS_DIR'])
   Mail.defaults do
     delivery_method :test
@@ -54,5 +55,4 @@ After do
   ENV['NOS_OIGNONS_REMINDER_DB'] = @orig_reminder_db_path
   ENV['NOS_OIGNONS_BOARD_WIKI_PATH'] = @orig_wiki_path
   ENV['NOS_OIGNONS_RECEIPTS_DIR'] = @orig_receipts_dir
-  FileUtils.remove_entry_secure @tmpdir
 end