X-Git-Url: https://nos-oignons.net/gitweb/gestion-adh.git/blobdiff_plain/6f0407b6532f52cb0726b2b7fe0070e1709dd5dc..HEAD:/features/step_definitions/git.rb

diff --git a/features/step_definitions/git.rb b/features/step_definitions/git.rb
index abd3e76..eef206e 100644
--- a/features/step_definitions/git.rb
+++ b/features/step_definitions/git.rb
@@ -20,28 +20,28 @@ require 'fileutils'
 
 Given /^un clone du Git contenant les adhésions$/ do
   # Create main repository
-  create_dir 'main'
+  @main_repository_path = expand_path('main')
+  create_directory 'main'
   cd 'main'
-  @main_repository_path = current_dir
-  run_simple 'git init --quiet --bare'
+  run_command_and_stop 'git init --quiet --bare'
   cd '..'
 
   # Clone it now
-  run_simple "git clone --quiet --local file://#{current_dir}/main clone"
+  run_command_and_stop "git clone --quiet --local file://#{expand_path('.')}/main clone"
   cd 'clone'
-  create_dir 'Membres'
+  create_directory 'Membres'
   BASE_MEMBERS.each_pair do |number, data|
     file = member_filename_for_id(number)
-    write_file file, render_member_file(data)
-    run_simple "git add #{file}"
+    File.write file, render_member_file(data)
+    run_command_and_stop "git add #{file}"
   end
-  run_simple 'git commit -m "Initial data set from fixtures"'
-  run_simple 'git push --quiet origin master'
+  run_command_and_stop 'git commit -m "Initial data set from fixtures"'
+  run_command_and_stop 'git push --quiet origin master'
 end
 
 Given /^le « pre-commit hook » correctement configuré$/ do
   FileUtils.ln_s File.expand_path('../../../bin/pre-commit-hook', __FILE__),
-                 "#{current_dir}/.git/hooks/pre-commit"
+                 "#{expand_path('.')}/.git/hooks/pre-commit"
 end
 
 Given /^le « pre-receive hook » configuré sur le dépôt principal$/ do
@@ -50,12 +50,12 @@ Given /^le « pre-receive hook » configuré sur le dépôt principal$/ do
 end
 
 When /je fais un `commit` du nouveau fichier$/ do
-  run_simple "git add #{@file}"
-  run_simple "git commit #{@file} -m 'new file'", false # do not fail on error
+  run_command_and_stop "git add #{@file}"
+  run_command_and_stop "git commit #{@file} -m 'new file'", :fail_on_error => false # do not fail on error
 end
 
-When /^que je pousse la modification$/ do
-  run_simple "git add #{@file}"
-  run_simple "git commit #{@file} -m 'new file'"
-  run_simple 'git push origin master', false # do not fail on error
+When /je pousse la modification$/ do
+  run_command_and_stop "git add #{@file}"
+  run_command_and_stop "git commit #{@file} -m 'new file'"
+  run_command_and_stop 'git push origin master', :fail_on_error => false # do not fail on error
 end