Fix for tests under bats, fix typos, mention #334 (#342)

* fix test under githooks, fix typos, mention #334 as relevant
sobolevn · Feb 10, 2019 · 5a28744 · 5a28744
1 parent 26ecd39
commit 5a28744
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/tests/test_add.bats b/tests/test_add.bats
@@ -72,7 +72,8 @@ function teardown {
   # https://github.com/sobolevn/git-secret/issues/85 task 1
 
   if [[ "$BATS_RUNNING_FROM_GIT" -eq 1 ]]; then
-    skip "this test is skipped while 'git commmit'"
+    # See #334 for more about this
+    skip "this test is skipped while 'git commit'"
   fi
 
   # Preparations:
@@ -105,7 +106,7 @@ function teardown {
 
 @test "run 'add' for relative path" {
   if [[ "$BATS_RUNNING_FROM_GIT" -eq 1 ]]; then
-    skip "this test is skipped while 'git commmit'"
+    skip "this test is skipped while 'git commit'. See #334"
   fi
 
   # Prepations:
@@ -142,6 +143,11 @@ function teardown {
 
 
 @test "run 'add' for file in subfolder" {
+  if [[ "$BATS_RUNNING_FROM_GIT" -eq 1 ]]; then
+    # See #334 for more about this
+    skip "this test is skipped while 'git commit'"
+  fi
+
   # Preparations:
   local test_file="$TEST_DEFAULT_FILENAME"
   local test_dir='test_dir'

diff --git a/tests/test_init.bats b/tests/test_init.bats
@@ -41,7 +41,7 @@ function teardown {
   # https://github.com/sobolevn/git-secret/issues/83
 
   if [[ "$BATS_RUNNING_FROM_GIT" -eq 1 ]]; then
-    skip "this test is skipped while 'git commmit'"
+    skip "this test is skipped while 'git commit'. See #334"
   fi
 
   # Preparations

diff --git a/tests/test_tell.bats b/tests/test_tell.bats
@@ -156,7 +156,7 @@ function teardown {
 
 @test "run 'tell' in subfolder" {
   if [[ "$BATS_RUNNING_FROM_GIT" -eq 1 ]]; then
-    skip "this test is skipped while 'git commmit'"
+    skip "this test is skipped while 'git commit'. See #334"
   fi
 
   # Preparations

diff --git a/tests/test_whoknows.bats b/tests/test_whoknows.bats
@@ -46,7 +46,7 @@ function teardown {
 
 @test "run 'whoknows' in subfolder" {
   if [[ "$BATS_RUNNING_FROM_GIT" -eq 1 ]]; then
-    skip "this test is skipped while 'git commmit'"
+    skip "this test is skipped while 'git commit'. See #334"
   fi
 
   # Preparations:

diff --git a/utils/hooks/pre-commit.sh b/utils/hooks/pre-commit.sh
@@ -9,7 +9,7 @@ if [[ "$BRANCH_NAME" != '(no branch)' ]]; then
 
   # Set marker, that we running tests from `git commit`,
   # so some tests will be skipped. It is done, because `git rev-parse`
-  # is not working when running from pre-commit hook.
+  # is not working when running from pre-commit hook. See #334
   export BATS_RUNNING_FROM_GIT=1
 
   # Run tests: