From 2e773f13a32e9ad416b1ff6bfc2869c5130ea114 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Mon, 31 Jul 2017 10:00:12 +0300
Subject: [PATCH] - Corrected setup and teardown functions (didn't read the
documentation correctly, should be a shell function not a test).
---
tests/merge-conflict.bats | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/merge-conflict.bats b/tests/merge-conflict.bats
index 5b603ce..bf17c34 100755
--- a/tests/merge-conflict.bats
+++ b/tests/merge-conflict.bats
@@ -3,7 +3,7 @@
export PATH="$BATS_TEST_DIRNAME/../:$PATH"
export repo="$BATS_TMPDIR/testrepo"
-@test "setup" {
+setup () {
if [ ! -f "$repo/file" ]
then
git init "$repo"
@@ -61,6 +61,6 @@ export repo="$BATS_TMPDIR/testrepo"
! merge-conflict
}
-@test "teardown" {
+teardown () {
rm -rf "$repo"
}
--
GitLab