From 3c3bdeb999422fad55b69c2de576afdfabd2ffd8 Mon Sep 17 00:00:00 2001 From: Lunar Date: Sun, 2 Jun 2013 22:01:03 +0200 Subject: [PATCH] Try to make Git play nicer with Aruba --- features/step_definitions/git.rb | 4 ++-- features/support/env.rb | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/features/step_definitions/git.rb b/features/step_definitions/git.rb index 8c00ff4..82cc09f 100644 --- 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 - 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| @@ -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 - 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 diff --git a/features/support/env.rb b/features/support/env.rb index 210137a..07bb583 100644 --- 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 + @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') -- 2.39.5