X-Git-Url: https://nos-oignons.net/gitweb/gestion-adh.git/blobdiff_plain/e3849b258d72a17748bd07c931980d382ac88082..b4bb2e3b6dc1c0edc44598e57f5d9b9d69f6ec24:/features/step_definitions/commands.rb?ds=sidebyside

diff --git a/features/step_definitions/commands.rb b/features/step_definitions/commands.rb
index 28e0ab3..e0b5ea4 100644
--- a/features/step_definitions/commands.rb
+++ b/features/step_definitions/commands.rb
@@ -1,4 +1,20 @@
 #-*- 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/>.
 
 When /^j'exécute list\-emails$/ do
   run_simple 'list-emails'
@@ -18,7 +34,7 @@ When /^j'exécute list-emails le (\d+)\-(\d+)\-(\d+)$/ do |year, month, day|$/
 end
 
 When /^j'exécute update-ag-subscribers$/ do
-  run_simple 'update-ag-subscribers'
+  NosOignons.update_ag_subscribers!
 end
 
 When /^(?:que )?j'exécute send-membership-reminders$/ do
@@ -36,26 +52,30 @@ When /^j'exécute send\-member\-emails\-to\-advisors$/ do
 end
 
 When /^j'exécute `(create\-membership\-fee\-receipt.*)`$/ do |cmd|
-  run_simple cmd, false
+  run_simple cmd, :fail_on_error => false
 end
 
 Then /^je ne dois pas avoir eu d'erreur$/ do
-  assert_exit_status(0)
+  expect(last_command_started).to have_exit_status(0)
 end
 
 Then /^je dois voir comme erreur "(.*?)"$/ do |expected|
-  assert_failing_with(expected)
+  expect(last_command_started).to have_output_on_stderr /#{Regexp.escape(expected)}/
 end
 
 Then /^la sortie doit être vide$/ do
-  assert_exact_output('', @stdout || all_stdout)
+  expect(last_command_started).to have_output_on_stdout('')
 end
 
 Then /^la sortie doit être:$/ do |expected|
   # add an extra line feed for nice scenario
-  assert_exact_output(expected + "\n", @stdout || all_stdout)
+  expect(last_command_started).to have_output_on_stdout(expected)
 end
 
 Then /^la sortie doit être "([^"]*)"$/ do |expected|
-  assert_exact_output(expected, (@stdout || all_stdout).rstrip)
+  begin
+    expect(last_command_started).to have_output_on_stdout(expected)
+  rescue Aruba::NoCommandHasBeenStartedError
+    expect(@stdout.rstrip).to eq(expected)
+  end
 end