Mise à jour des dépendences et correction des tests

[gestion-adh.git] / features / step_definitions / git.rb

diff --git a/features/step_definitions/git.rb b/features/step_definitions/git.rb
index abd3e765615288000ab436d436cde368f4d02b88..3c0e145c593177bfdac62ceba4c546e467e1e4ad 100644 (file)
--- a/features/step_definitions/git.rb
+++ b/features/step_definitions/git.rb
@@ -20,19 +20,19 @@ require 'fileutils'
 
 Given /^un clone du Git contenant les adhésions$/ do
   # Create main repository
 
 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'
   cd 'main'

-  @main_repository_path = current_dir

   run_simple 'git init --quiet --bare'
   cd '..'
 
   # Clone it now
   run_simple 'git init --quiet --bare'
   cd '..'
 
   # Clone it now

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

   cd 'clone'
   cd 'clone'

-  create_dir 'Membres'
+  create_directory 'Membres'

   BASE_MEMBERS.each_pair do |number, data|
     file = member_filename_for_id(number)
   BASE_MEMBERS.each_pair do |number, data|
     file = member_filename_for_id(number)

-    write_file file, render_member_file(data)
+    File.write file, render_member_file(data)

     run_simple "git add #{file}"
   end
   run_simple 'git commit -m "Initial data set from fixtures"'
     run_simple "git add #{file}"
   end
   run_simple 'git commit -m "Initial data set from fixtures"'


@@ -41,7 +41,7 @@ end
 
 Given /^le « pre-commit hook » correctement configuré$/ do
   FileUtils.ln_s File.expand_path('../../../bin/pre-commit-hook', __FILE__),
 
 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
 end
 
 Given /^le « pre-receive hook » configuré sur le dépôt principal$/ do


@@ -54,7 +54,7 @@ When /je fais un `commit` du nouveau fichier$/ do
   run_simple "git commit #{@file} -m 'new file'", false # do not fail on error
 end
 
   run_simple "git commit #{@file} -m 'new file'", false # do not fail on error
 end
 

-When /^que je pousse la modification$/ do
+When /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
   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