Try to make Git play nicer with Aruba

diff --git a/features/step_definitions/git.rb b/features/step_definitions/git.rb
index 8c00ff42d013818876b3d7b0463c4d6174c637ea..82cc09faa13de40e8baf88e8458f512c34081fbd 100644 (file)
--- a/features/step_definitions/git.rb
+++ b/features/step_definitions/git.rb
@@ -11,7 +11,7 @@ Given /^un clone du Git contenant les adhésions$/ do
   cd '..'
 
   # Clone it now
   cd '..'
 
   # Clone it now

-  run_simple 'git clone --quiet main clone'
+  run_simple "git clone --quiet --local file://#{current_dir}/main clone"

   cd 'clone'
   create_dir 'Membres'
   BASE_MEMBERS.each_pair do |number, data|
   cd 'clone'
   create_dir 'Membres'
   BASE_MEMBERS.each_pair do |number, data|


@@ -19,7 +19,7 @@ Given /^un clone du Git contenant les adhésions$/ do
     write_file file, render_member_file(data)
     run_simple "git add #{file}"
   end
     write_file file, render_member_file(data)
     run_simple "git add #{file}"
   end

-  run_simple 'git commit --quiet -m "Initial data set from fixtures"'
+  run_simple 'git commit -m "Initial data set from fixtures"'

   run_simple 'git push --quiet origin master'
 end
 
   run_simple 'git push --quiet origin master'
 end
 

diff --git a/features/support/env.rb b/features/support/env.rb
index 210137afeb7da40e81f5b536493cabe4bf7f8ec3..07bb5831220aae28b0ae4ed30e092f5e6132225c 100644 (file)
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -18,6 +18,7 @@ Before do
   @tmpdir = Dir.mktmpdir('gestion-adh')
   @dirs = [@tmpdir]
   @aruba_io_wait_seconds = 0.1
   @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']
   ENV['NOS_OIGNONS_REMINDER_DB'] = File.join(current_dir, 'reminders.yaml')
   @orig_wiki_path = ENV['NOS_OIGNONS_BOARD_WIKI_PATH']
   @orig_reminder_db_path = ENV['NOS_OIGNONS_REMINDER_DB']
   ENV['NOS_OIGNONS_REMINDER_DB'] = File.join(current_dir, 'reminders.yaml')