Update to Ruby 2+, RSpec 3 and recent Aruba

[gestion-adh.git] / features / support / fixtures.rb

diff --git a/features/support/fixtures.rb b/features/support/fixtures.rb
index 8280d7967f479a781f10cf368b0b01c115850ab8..42d46ee21a7c33dfbf0df359ca7faf4960f37afd 100644 (file)
--- a/features/support/fixtures.rb
+++ b/features/support/fixtures.rb
@@ -1,4 +1,20 @@
 #-*- coding: utf-8 -*-
 #-*- coding: utf-8 -*-

+#
+# Système de gestion des adhésions de Nos oignons
+# Copyright © 2013-2014 Nos oignons <contact@nos-oignons.net>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 
 require 'erb'
 require 'ostruct'
 
 require 'erb'
 require 'ostruct'


@@ -68,7 +84,7 @@ membership_fee_paid_on: <%= membership_fee_paid_on %>
 END_OF_TEMPLATE
 
 def member_filename_for_id(id)
 END_OF_TEMPLATE
 
 def member_filename_for_id(id)

-  "Membres/%06d.mdwn" % id
+  expand_path("Membres/%06d.mdwn" % id)

 end
 
 def render_member_file(locals)
 end
 
 def render_member_file(locals)


@@ -76,7 +92,7 @@ def render_member_file(locals)
 end
 
 def new_id
 end
 
 def new_id

-  max_id = Dir.glob("#{current_dir}/Membres/*.mdwn").
+  max_id = Dir.glob("#{expand_path('Membres')}/*.mdwn").

     collect { |f| File.basename(f).gsub(/\.mdwn$/, '').to_i }.max || 0
   max_id + 1
 end
     collect { |f| File.basename(f).gsub(/\.mdwn$/, '').to_i }.max || 0
   max_id + 1
 end