diff --git a/Formula/bats-assert.rb b/Formula/bats-assert.rb index 4e4c1da..83e36bc 100644 --- a/Formula/bats-assert.rb +++ b/Formula/bats-assert.rb @@ -17,16 +17,19 @@ def install def caveats <<~EOS To load the bats-assert lib in your bats test: - load '#{HOMEBREW_PREFIX}/lib/bats-support/load.bash' - load '#{HOMEBREW_PREFIX}/lib/bats-assert/load.bash' + #Set the bats_lib_path + export BATS_LIB_PATH="${BATS_LIB_PATH}:${HOMEBREW_PREFIX}/lib" + bats_load_library bats-support + bats_load_library bats-assert EOS end test do (testpath/"test.bats").write <<~EOS setup() { - load '#{HOMEBREW_PREFIX}/lib/bats-support/load.bash' - load '#{HOMEBREW_PREFIX}/lib/bats-assert/load.bash' + export BATS_LIB_PATH="${BATS_LIB_PATH}:${HOMEBREW_PREFIX}/lib" + bats_load_library bats-support + bats_load_library bats-assert } @test "assert true" { diff --git a/Formula/bats-detik.rb b/Formula/bats-detik.rb index ac6f261..5c083df 100644 --- a/Formula/bats-detik.rb +++ b/Formula/bats-detik.rb @@ -21,8 +21,9 @@ def caveats <<~EOS To load the bats-detik lib in your bats test: - load '#{HOMEBREW_PREFIX}/lib/bats-detik/utils.bash' - load '#{HOMEBREW_PREFIX}/lib/bats-detik/detik.bash' + #Set the bats_lib_path + export BATS_LIB_PATH="${BATS_LIB_PATH}:${HOMEBREW_PREFIX}/lib" + bats_load_library bats-detik/detik.bash DETIK_CLIENT_NAME="kubectl" EOS @@ -31,8 +32,8 @@ def caveats test do (testpath/"test.bats").write <<~EOS setup() { - load '#{HOMEBREW_PREFIX}/lib/bats-detik/utils.bash' - load '#{HOMEBREW_PREFIX}/lib/bats-detik/detik.bash' + export BATS_LIB_PATH="${BATS_LIB_PATH}:${HOMEBREW_PREFIX}/lib" + bats_load_library bats-detik/detik.bash } DETIK_CLIENT_NAME="mytest" diff --git a/Formula/bats-file.rb b/Formula/bats-file.rb index 8788d03..d32073a 100644 --- a/Formula/bats-file.rb +++ b/Formula/bats-file.rb @@ -19,16 +19,19 @@ def caveats To load the bats-file lib in your bats test: - load '#{HOMEBREW_PREFIX}/lib/bats-support/load.bash' - load '#{HOMEBREW_PREFIX}/lib/bats-file/load.bash' + #Set the bats_lib_path + export BATS_LIB_PATH="${BATS_LIB_PATH}:${HOMEBREW_PREFIX}/lib" + bats_load_library bats-support + bats_load_library bats-file EOS end test do (testpath/"test.bats").write <<~EOS setup() { - load '#{HOMEBREW_PREFIX}/lib/bats-support/load.bash' - load '#{HOMEBREW_PREFIX}/lib/bats-file/load.bash' + export BATS_LIB_PATH="${BATS_LIB_PATH}:${HOMEBREW_PREFIX}/lib" + bats_load_library bats-support + bats_load_library bats-file } @test 'assert_file_exist() : returns 0 if exists' { diff --git a/Formula/bats-support.rb b/Formula/bats-support.rb index 5d8c56b..3022bb0 100644 --- a/Formula/bats-support.rb +++ b/Formula/bats-support.rb @@ -20,7 +20,9 @@ def caveats To load the bats-support lib in your bats test: - load '#{HOMEBREW_PREFIX}/lib/bats-support/load.bash' + #Set the bats_lib_path + export BATS_LIB_PATH="${BATS_LIB_PATH}:${HOMEBREW_PREFIX}/lib" + bats_load_library bats-support EOS end diff --git a/README.md b/README.md index 392cdeb..5dee22a 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,13 @@ Repository for managing bats-core and its dependencies on homebrew OS X users can use Homebrew to install libraries system-wide -``` +```bash $ brew install bats-core ``` + Then install the desired libraries. -``` + +```bash $ brew tap bats-core/bats-core $ brew install bats-support $ brew install bats-assert @@ -22,8 +24,9 @@ For brew installations, load the libraries from $(brew --prefix)/lib/ (the brew ```bash TEST_BREW_PREFIX="$(brew --prefix)" -load "${TEST_BREW_PREFIX}/lib/bats-support/load.bash" -load "${TEST_BREW_PREFIX}/lib/bats-assert/load.bash" -load "${TEST_BREW_PREFIX}/lib/bats-file/load.bash" -load "${TEST_BREW_PREFIX}/lib/bats-detik/load.bash" +export BATS_LIB_PATH="${BATS_LIB_PATH}:${TEST_BREW_PREFIX}/lib" +bats_load_library bats-support +bats_load_library bats-assert +bats_load_library bats-file +bats_load_library bats-detik/detik.bash ```