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 50624ffb3644d8d0f94935a4a64fcc63301dd763..82cc09faa13de40e8baf88e8458f512c34081fbd 100644 (file)
--- a/features/step_definitions/git.rb
+++ b/features/step_definitions/git.rb
@@ -1,3 +1,5 @@
+#-*- coding: utf-8 -*-
+
 require 'fileutils'
 
 Given /^un clone du Git contenant les adhésions$/ do
@@ -5,20 +7,20 @@ Given /^un clone du Git contenant les adhésions$/ do
   create_dir 'main'
   cd 'main'
   @main_repository_path = current_dir
-  run_simple 'git init --bare'
+  run_simple 'git init --quiet --bare'
   cd '..'
 
   # Clone it now
-  run_simple 'git clone main clone'
+  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"'
-  run_simple 'git push origin master'
+  run_simple 'git push --quiet origin master'
 end
 
 Given /^le « pre-commit hook » correctement configuré$/ do