résolution conflit

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

diff --git a/features/step_definitions/commands.rb b/features/step_definitions/commands.rb
index e0b5ea4a3737ee5483728b508178a45aa564e017..d4d7ab569a12ac430be80d0d49869e0b38d6c9a4 100644 (file)
--- a/features/step_definitions/commands.rb
+++ b/features/step_definitions/commands.rb
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 When /^j'exécute list\-emails$/ do
-  run_simple 'list-emails'
+  run_command_and_stop 'list-emails'
 end
 
 When /^j'exécute list-emails le (\d+)\-(\d+)\-(\d+)$/ do |year, month, day|$/
@@ -51,8 +51,14 @@ When /^j'exécute send\-member\-emails\-to\-advisors$/ do
   NosOignons.send_member_emails_to_advisors!
 end
 
+When /^j'exécute `create\-membership\-fee\-receipt ([0-9]+) ([0-9,]+)` le ([0-9]{4})-([0-9]{2})-([0-9]{2})$/ do |member, amount, year, month, day|
+  Timecop.travel(Date.new(year.to_i, month.to_i, day.to_i)) do
+    NosOignons.create_membership_fee_receipt!(member, amount)
+  end
+end
+
 When /^j'exécute `(create\-membership\-fee\-receipt.*)`$/ do |cmd|
-  run_simple cmd, :fail_on_error => false
+  run_command_and_stop cmd, :fail_on_error => false
 end
 
 Then /^je ne dois pas avoir eu d'erreur$/ do