remove dependency on ROOT_DIRECTORY in tests

georglauterbach · Feb 24, 2024 · e0832d3 · e0832d3
1 parent 11fa65d
commit e0832d3
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 16 deletions.
diff --git a/Justfile b/Justfile
@@ -8,8 +8,6 @@ set dotenv-load       := false
 
 export ROOT_DIRECTORY := justfile_directory()
 
-
-
 # show this help
 @_default:
 	just --list

diff --git a/tests/10-sourcing.bats b/tests/10-sourcing.bats
@@ -6,8 +6,7 @@ load 'bats_assert/load'
 BATS_TEST_NAME_PREFIX='10-sourcing         :: '
 
 function setup_file() {
-  cd "${ROOT_DIRECTORY}" || exit 1
-  LOG_LEVEL='info'
+  export LOG_LEVEL='info'
 }
 
 @test "sourcing succeeds from repository root" {
@@ -17,7 +16,7 @@ function setup_file() {
 
 @test "sourcing succeeds from 'tests/' directory" {
   (
-    cd "${ROOT_DIRECTORY}/tests/"
+    cd "tests/"
     # shellcheck source=load
     run bash -c 'source ../load'
     assert_success
@@ -26,7 +25,7 @@ function setup_file() {
 
 @test "sourcing succeeds from 'modules/' directory" {
   (
-    cd "${ROOT_DIRECTORY}/modules/" || exit 1
+    cd "modules/" || exit 1
     # shellcheck source=load
     run bash -c ' source ../load'
     assert_success
@@ -40,23 +39,23 @@ function setup_file() {
 
 @test "sourcing with parameters succeeds from 'tests/' directory" {
   (
-    cd "${ROOT_DIRECTORY}/tests/" || exit 1
+    cd "tests/" || exit 1
     run source ../load 'log' 'cri'
     assert_success
   )
 }
 
 @test "sourcing with parameters succeeds from 'modules/' directory" {
   (
-    cd "${ROOT_DIRECTORY}/modules/"
+    cd "modules/"
     run source ../load 'log' 'cri'
     assert_success
   )
 }
 
 @test "sourcing with parameters succeeds from '.github/workflows' directory" {
   (
-    cd "${ROOT_DIRECTORY}/.github/workflows/"
+    cd ".github/workflows/"
     run source ../../load 'log' 'cri'
     assert_success
   )

diff --git a/tests/20-log.bats b/tests/20-log.bats
@@ -6,7 +6,6 @@ load 'bats_assert/load'
 BATS_TEST_NAME_PREFIX='20-log              :: '
 
 function setup_file() {
-  cd "${ROOT_DIRECTORY}" || exit 1
   export LOG_LEVEL='trace'
   export TEST_STRING='jfk FJHAE aea728 djKJ  k/('
 }

diff --git a/tests/30-errors.bats b/tests/30-errors.bats
@@ -6,7 +6,6 @@ load 'bats_assert/load'
 BATS_TEST_NAME_PREFIX='30-errors           :: '
 
 function setup_file() {
-  cd "${ROOT_DIRECTORY}" || exit 1
   export LOG_LEVEL='trace'
 }
 

diff --git a/tests/40-utils.bats b/tests/40-utils.bats
@@ -6,7 +6,6 @@ load 'bats_assert/load'
 BATS_TEST_NAME_PREFIX='40-utils            :: '
 
 function setup_file() {
-  cd "${ROOT_DIRECTORY}" || exit 1
   export LOG_LEVEL='trace'
 }
 

diff --git a/tests/90-generic.bats b/tests/90-generic.bats
@@ -5,10 +5,6 @@ load 'bats_assert/load'
 
 BATS_TEST_NAME_PREFIX='90-generic          :: '
 
-function setup_file() {
-  cd "${ROOT_DIRECTORY}" || exit 1
-}
-
 @test "'cri.sh' makes the correct decision" {
   source load 'log' 'cri'