Skip to content

Commit 96a78bc

Browse files
author
François Chastanet
committed
Assert::dirEmpty better pattern support
1 parent 91372b7 commit 96a78bc

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

src/Assert/dirEmpty.bats

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,16 @@ function Assert::dirEmpty::emptyWithPattern { #@test
5555
assert_line --index 0 --partial "INFO - Checking directory ${BATS_TEST_TMPDIR}/myDir is empty"
5656
}
5757

58+
function Assert::dirEmpty::empty2Patterns { #@test
59+
mkdir "${BATS_TEST_TMPDIR}/myDir"
60+
touch "${BATS_TEST_TMPDIR}/myDir/.gitkeep"
61+
touch "${BATS_TEST_TMPDIR}/myDir/README.md"
62+
run Assert::dirEmpty "${BATS_TEST_TMPDIR}/myDir" ".gitkeep|README.md"
63+
assert_success
64+
assert_lines_count 1
65+
assert_line --index 0 --partial "INFO - Checking directory ${BATS_TEST_TMPDIR}/myDir is empty"
66+
}
67+
5868
function Assert::dirEmpty::emptyWithPatternButFileMatchingPatternNotThere { #@test
5969
mkdir "${BATS_TEST_TMPDIR}/myDir"
6070
run Assert::dirEmpty "${BATS_TEST_TMPDIR}/myDir" ".gitkeep"

src/Assert/dirEmpty.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Assert::dirEmpty() {
1717
local pattern="${2:-}"
1818
local -a filter=(cat)
1919
if [[ -n "${pattern}" ]]; then
20-
filter=(grep -v "${pattern}")
20+
filter=(grep -v -E "${pattern}")
2121
fi
2222
Log::displayInfo "Checking directory ${directory} is empty"
2323
if ${SUDO:-} test -f "${directory}"; then

0 commit comments

Comments
 (0)