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

diff --git a/features/step_definitions/members.rb b/features/step_definitions/members.rb
index 880f67e..0ec5ae1 100644
--- a/features/step_definitions/members.rb
+++ b/features/step_definitions/members.rb
@@ -17,9 +17,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 def init_db
-  @member_db_path = File.join(current_dir, NosOignons::MEMBERS_DB_DIR)
-  ENV['NOS_OIGNONS_BOARD_WIKI_PATH'] = current_dir
-  create_dir @member_db_path
+  create_directory NosOignons::MEMBERS_DB_DIR
+  @member_db_path = expand_path(NosOignons::MEMBERS_DB_DIR)
+  ENV['NOS_OIGNONS_BOARD_WIKI_PATH'] = expand_path('.')
 end
 
 def create_new_member(name, joined_on, paid_on)
@@ -31,7 +31,7 @@ def create_new_member(name, joined_on, paid_on)
          }
   init_db unless @member_db_path
   file = member_filename_for_id(new_id)
-  write_file file, render_member_file(@last_member)
+  File.write file, render_member_file(@last_member)
 end
 
 Given /une base de membres vide$/ do
@@ -57,21 +57,21 @@ end
 
 Given /^une base avec (\w+), membre (\w+), ayant cotisé le ([0-9-]+)$/ do |name, member_id, paid_on|
   create_new_member(name, paid_on, paid_on)
-  expect(File.read(File.join(current_dir, member_filename_for_id(member_id)))).to include(name)
+  expect(File.read(member_filename_for_id(member_id))).to include(name)
 end
 
 Given /^une base avec (\w+), membre (\w+), n'ayant jamais cotisé$/ do |name, member_id|
   joined_on = (Time.now - 3600*24*30).strftime('%Y-%m-%d')
   create_new_member(name, joined_on, nil)
-  expect(File.read(File.join(current_dir, member_filename_for_id(member_id)))).to include(name)
+  expect(File.read(member_filename_for_id(member_id))).to include(name)
 end
 
 Given /^une base avec uniquement (\w+), membre (\w+)$/ do |name, member_id|
   paid_on = (Time.now - 3600*24*30).strftime('%Y-%m-%d')
   create_new_member(name, paid_on, paid_on)
-  member_path = File.join(current_dir, member_filename_for_id(member_id))
+  member_path = File.join(member_filename_for_id(member_id))
   expect(File.read(member_path)).to include(name)
-  expect(Dir.glob("#{@member_db_path}/[0-9]*")).to have(1).member
+  expect(Dir.glob("#{@member_db_path}/[0-9]*").size).to eq(1)
 end
 
 
@@ -107,24 +107,24 @@ end
 
 When /^j'ajoute une fiche correcte pour une nouvelle adhésion$/ do
   @file = member_filename_for_id(new_id)
-  write_file @file, render_member_file(EXTRA_MEMBER)
+  File.write @file, render_member_file(EXTRA_MEMBER)
 end
 
 When /^j'ajoute une fiche vide$/ do
   @file = member_filename_for_id(new_id)
-  write_file @file, ''
+  File.write @file, ''
 end
 
 When /^j'ajoute une fiche sans YAML$/ do
   @file = member_filename_for_id(new_id)
-  write_file @file, <<-EOF.gsub(/^    /, '')
+  File.write @file, <<-EOF.gsub(/^    /, '')
     Ceci est une fiche sans YAML.
   EOF
 end
 
 When /^j'ajoute une fiche avec du mauvais YAML$/ do
   @file = member_filename_for_id(new_id)
-  write_file @file, <<-EOF.gsub(/^    /, '')
+  File.write @file, <<-EOF.gsub(/^    /, '')
     ---
     [This is missing a closing bracket
     ---
@@ -133,7 +133,7 @@ end
 
 When /^j'ajoute une fiche sans email$/ do
   @file = member_filename_for_id(new_id)
-  write_file @file, <<-EOF.gsub(/^    /, '')
+  File.write @file, <<-EOF.gsub(/^    /, '')
     ---
     name: J. Example
     address: |
@@ -147,7 +147,7 @@ end
 
 When /^j'ajoute une fiche sans nom$/ do
   @file = member_filename_for_id(new_id)
-  write_file @file, <<-EOF.gsub(/^    /, '')
+  File.write @file, <<-EOF.gsub(/^    /, '')
     ---
     email: joe@example.org
     address: |
@@ -161,7 +161,7 @@ end
 
 When /^j'ajoute une fiche avec comme date d'adhésion "([^"]*)"$/ do |date|
   @file = member_filename_for_id(new_id)
-  write_file @file, <<-EOF.gsub(/^    /, '')
+  File.write @file, <<-EOF.gsub(/^    /, '')
     ---
     name: J. Example
     email: joe@example.org
@@ -176,7 +176,7 @@ end
 
 When /^j'ajoute une fiche avec comme date de cotisation "([^"]*)"$/ do |date|
   @file = member_filename_for_id(new_id)
-  write_file @file, <<-EOF.gsub(/^    /, '')
+  File.write @file, <<-EOF.gsub(/^    /, '')
     ---
     name: J. Example
     email: joe@example.org
@@ -195,6 +195,6 @@ When /^je supprime le nom sur une fiche existante$/ do
 end
 
 When /^j'ajoute un fichier hors de la base des adhérents$/ do
-  @file = 'test'
-  write_file @file, 'Test content.'
+  @file = expand_path('test')
+  File.write @file, 'Test content.'
 end