diff --git a/test/bash_it/bash_it.bats b/test/bash_it/bash_it.bats index bd3995b6..1fef3033 100644 --- a/test/bash_it/bash_it.bats +++ b/test/bash_it/bash_it.bats @@ -37,8 +37,8 @@ function local_teardown { } @test "bash-it: verify that the test fixture is available" { - assert [ -e "$BASH_IT/aliases/available/a.aliases.bash" ] - assert [ -e "$BASH_IT/aliases/available/b.aliases.bash" ] + assert_file_exist "$BASH_IT/aliases/available/a.aliases.bash" + assert_file_exist "$BASH_IT/aliases/available/b.aliases.bash" } @test "bash-it: load aliases in order" { diff --git a/test/install/install.bats b/test/install/install.bats index 4fb3d0a9..23684137 100644 --- a/test/install/install.bats +++ b/test/install/install.bats @@ -42,7 +42,7 @@ function local_teardown { } @test "install: verify that the install script exists" { - assert [ -e "$BASH_IT/install.sh" ] + assert_file_exist "$BASH_IT/install.sh" } @test "install: run the install script silently" { @@ -50,7 +50,7 @@ function local_teardown { ./install.sh --silent - assert [ -e "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE" ] + assert_file_exist "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE" assert [ -L "$BASH_IT/enabled/150---general.aliases.bash" ] assert [ -L "$BASH_IT/enabled/250---base.plugin.bash" ] @@ -68,8 +68,8 @@ function local_teardown { ./install.sh --silent - assert [ -e "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE" ] - assert [ -e "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE.bak" ] + assert_file_exist "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE" + assert_file_exist "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE.bak" local md5_bak=$(md5sum "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE.bak" | awk '{print $1}') diff --git a/test/install/uninstall.bats b/test/install/uninstall.bats index 45af20bc..d71ac06a 100644 --- a/test/install/uninstall.bats +++ b/test/install/uninstall.bats @@ -42,7 +42,7 @@ function local_teardown { } @test "uninstall: verify that the uninstall script exists" { - assert [ -e "$BASH_IT/uninstall.sh" ] + assert_file_exist "$BASH_IT/uninstall.sh" } @test "uninstall: run the uninstall script with an existing backup file" { @@ -56,9 +56,9 @@ function local_teardown { assert_success - assert [ ! -e "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE.uninstall" ] - assert [ ! -e "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE.bak" ] - assert [ -e "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE" ] + assert_file_not_exist "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE.uninstall" + assert_file_not_exist "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE.bak" + assert_file_exist "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE" local md5_conf=$(md5sum "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE" | awk '{print $1}') @@ -75,9 +75,9 @@ function local_teardown { assert_success - assert [ -e "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE.uninstall" ] - assert [ ! -e "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE.bak" ] - assert [ ! -e "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE" ] + assert_file_exist "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE.uninstall" + assert_file_not_exist "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE.bak" + assert_file_not_exist "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE" local md5_uninstall=$(md5sum "$BASH_IT_TEST_HOME/$BASH_IT_CONFIG_FILE.uninstall" | awk '{print $1}') diff --git a/test/plugins/base.plugin.bats b/test/plugins/base.plugin.bats index a27a4ae7..d5b6ef4e 100755 --- a/test/plugins/base.plugin.bats +++ b/test/plugins/base.plugin.bats @@ -52,5 +52,5 @@ load ../../plugins/available/base.plugin declare -r file="${BASH_IT_ROOT}/file" touch $file run buf $file - assert [ -e ${file}_$(date +%Y%m%d_%H%M%S) ] + assert_file_exist ${file}_$(date +%Y%m%d_%H%M%S) } diff --git a/test/test_helper.bash b/test/test_helper.bash index fa9ed2e8..9155b434 100644 --- a/test/test_helper.bash +++ b/test/test_helper.bash @@ -18,6 +18,7 @@ export TEST_DEPS_DIR="${TEST_DEPS_DIR-${TEST_MAIN_DIR}/../test_lib}" load "${TEST_DEPS_DIR}/bats-support/load.bash" load "${TEST_DEPS_DIR}/bats-assert/load.bash" +load "${TEST_DEPS_DIR}/bats-file/load.bash" local_setup() { true