Try to make Git play nicer with Aruba

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

diff --git a/features/step_definitions/git.rb b/features/step_definitions/git.rb
index 30d6e7c544efac6c3e897202f931d20dc30a5c49..82cc09faa13de40e8baf88e8458f512c34081fbd 100644 (file)
--- a/features/step_definitions/git.rb
+++ b/features/step_definitions/git.rb
@@ -1,25 +1,45 @@
+#-*- coding: utf-8 -*-
+
 require 'fileutils'
 
 Given /^un clone du Git contenant les adhésions$/ do
   # Create main repository
   create_dir 'main'
   cd 'main'
-  run_simple 'git init'
+  @main_repository_path = current_dir
+  run_simple 'git init --quiet --bare'
+  cd '..'
+
+  # Clone it now
+  run_simple "git clone --quiet --local file://#{current_dir}/main clone"
+  cd 'clone'
   create_dir 'Membres'
-  BASE_SUBSCRIPTIONS.each_pair do |number, data|
-    file = subscription_filename_for_id(number)
-    write_file file, render_subscription_file(data)
+  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}"
   end
   run_simple 'git commit -m "Initial data set from fixtures"'
-  cd '..'
+  run_simple 'git push --quiet origin master'
+end
 
-  # Clone it now
-  run_simple 'git clone main clone'
-  cd 'clone'
+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"
+end
+
+Given /^le « pre-receive hook » configuré sur le dépôt principal$/ do
+  FileUtils.ln_s File.expand_path('../../../bin/pre-receive-hook', __FILE__),
+                 "#{@main_repository_path}/hooks/pre-receive"
+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
 end
 
-When /je fait un `commit` du nouveau fichier$/ do
+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
 end