From 067f851d795b5db889af7060fb894373b699c60a Mon Sep 17 00:00:00 2001
From: Ivan Povalyukhin <ivanpoval@gmail.com>
Date: Sun, 3 May 2015 17:34:23 -0700
Subject: [PATCH 1/3] [tests] added test for plugins base lsgrep()

---
 test/plugins/base.plugin.bats | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/test/plugins/base.plugin.bats b/test/plugins/base.plugin.bats
index 2216040b..70950296 100755
--- a/test/plugins/base.plugin.bats
+++ b/test/plugins/base.plugin.bats
@@ -35,6 +35,14 @@ load ../../plugins/available/base.plugin
   [[ $output == l? ]]
 }
 
+@test 'plugins base: lsgrep()' {
+  for i in 1 2 3; do mkdir -p "${BASH_IT_TEST_DIR}/${i}"; done
+  cd $BASH_IT_TEST_DIR
+  run lsgrep 2
+  assert_success
+  assert_equal 2 $output
+}
+
 @test 'plugins base: buf()' {
   mkdir -p $BASH_IT_ROOT
   declare -r file="${BASH_IT_ROOT}/file"

From f1de827622484d43fb571d209fdefab6fc6bd00e Mon Sep 17 00:00:00 2001
From: Ivan Povalyukhin <ivanpoval@gmail.com>
Date: Sun, 3 May 2015 18:08:12 -0700
Subject: [PATCH 2/3] [tests] added test for base plugin mkcd(); make mkcd()
 safe for directory names starting with a dash

---
 plugins/available/base.plugin.bash | 4 ++--
 test/plugins/base.plugin.bats      | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/available/base.plugin.bash b/plugins/available/base.plugin.bash
index 837d7536..aa35a708 100644
--- a/plugins/available/base.plugin.bash
+++ b/plugins/available/base.plugin.bash
@@ -80,8 +80,8 @@ function mkcd ()
     example '$ mkcd foo'
     example '$ mkcd /tmp/img/photos/large'
     group 'base'
-    mkdir -p "$*"
-    cd "$*"
+    mkdir -p -- "$*"
+    cd -- "$*"
 }
 
 function lsgrep ()
diff --git a/test/plugins/base.plugin.bats b/test/plugins/base.plugin.bats
index 70950296..07b6afc7 100755
--- a/test/plugins/base.plugin.bats
+++ b/test/plugins/base.plugin.bats
@@ -35,6 +35,12 @@ load ../../plugins/available/base.plugin
   [[ $output == l? ]]
 }
 
+@test 'plugins base: mkcd()' {
+  cd "${BASH_IT_ROOT}"
+  run mkcd -dir_with_dash
+  assert_success
+}
+
 @test 'plugins base: lsgrep()' {
   for i in 1 2 3; do mkdir -p "${BASH_IT_TEST_DIR}/${i}"; done
   cd $BASH_IT_TEST_DIR

From 34670ea02114e8827f06eaa55d600e29bbcd45e9 Mon Sep 17 00:00:00 2001
From: Ivan Povalyukhin <ivanpoval@gmail.com>
Date: Sun, 3 May 2015 18:10:15 -0700
Subject: [PATCH 3/3] [tests] make setup function to create test dir per test

---
 test/plugins/base.plugin.bats | 2 --
 test/test_helper.bash         | 6 +++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/plugins/base.plugin.bats b/test/plugins/base.plugin.bats
index 07b6afc7..3b21ca7f 100755
--- a/test/plugins/base.plugin.bats
+++ b/test/plugins/base.plugin.bats
@@ -27,7 +27,6 @@ load ../../plugins/available/base.plugin
 }
 
 @test 'plugins base: pickfrom()' {
-  mkdir -p $BASH_IT_ROOT
   stub_file="${BASH_IT_ROOT}/stub_file"
   printf "l1\nl2\nl3" > $stub_file
   run pickfrom $stub_file
@@ -50,7 +49,6 @@ load ../../plugins/available/base.plugin
 }
 
 @test 'plugins base: buf()' {
-  mkdir -p $BASH_IT_ROOT
   declare -r file="${BASH_IT_ROOT}/file"
   touch $file
   run buf $file
diff --git a/test/test_helper.bash b/test/test_helper.bash
index 850b6161..71b3a16c 100644
--- a/test/test_helper.bash
+++ b/test/test_helper.bash
@@ -13,8 +13,12 @@ if [ "$BASH_IT_ROOT" != "${BASH_IT_TEST_DIR}/root" ]; then
   export BASH_IT=$BASH_IT_TEST_DIR
 fi
 
+setup() {
+  mkdir -p -- "${BASH_IT_ROOT}"
+}
+
 teardown() {
-  rm -rf "$BASH_IT_TEST_DIR"
+  rm -rf "${BASH_IT_TEST_DIR}"
 }
 
 assert() {