tests: new file test_helper_libs.bash

For testing non-core files, just `load ../test_helper_libs` after `load ../test_helper` instead of trying to guess which libs must be loaded, in which order, for testing to succeed. `_command_exists` spews log messages, so our test log is littered with `_log_debug not found`. This fixes that too.
2021-10-21 02:52:26 -04:00
parent 9dcbeec7ad
commit da6b27166f
15 changed files with 20 additions and 33 deletions
--- a/test/lib/helpers.bats
+++ b/test/lib/helpers.bats
@@ -1,11 +1,7 @@
 #!/usr/bin/env bats

 load ../test_helper
-load ../../lib/log
-load ../../lib/utilities
-load ../../lib/search
-
-load ../../lib/helpers
+load ../test_helper_libs
 load ../../plugins/available/base.plugin

 function local_setup {
--- a/test/lib/search.bats
+++ b/test/lib/search.bats
@@ -1,10 +1,7 @@
 #!/usr/bin/env bats

 load ../test_helper
-load ../../lib/log
-load ../../lib/helpers
-load ../../lib/utilities
-load ../../lib/search
+load ../test_helper_libs

 load ../../plugins/available/base.plugin
 load ../../aliases/available/git.aliases
--- a/test/lib/utilities.bats
+++ b/test/lib/utilities.bats
@@ -1,10 +1,7 @@
 #!/usr/bin/env bats

 load ../test_helper
-load ../../lib/log
-load ../../lib/helpers
-load ../../lib/utilities
-load ../../lib/search
+load ../test_helper_libs

 function local_setup {
  setup_test_fixture
--- a/test/plugins/alias-completion.plugin.bats
+++ b/test/plugins/alias-completion.plugin.bats
@@ -1,8 +1,7 @@
 #!/usr/bin/env bats

 load ../test_helper
-load ../../lib/log
-load ../../lib/helpers
+load ../test_helper_libs

 load ../../completion/available/capistrano.completion

--- a/test/plugins/base.plugin.bats
+++ b/test/plugins/base.plugin.bats
@@ -1,8 +1,7 @@
 #!/usr/bin/env bats

 load ../test_helper
-load ../../lib/log
-load ../../lib/helpers
+load ../test_helper_libs
 load ../../plugins/available/base.plugin

@test 'plugins base: ips()' {
--- a/test/plugins/battery.plugin.bats
+++ b/test/plugins/battery.plugin.bats
@@ -1,8 +1,7 @@
 #!/usr/bin/env bats

 load ../test_helper
-load "${BASH_IT}/lib/log.bash"
-load "${BASH_IT}/lib/helpers.bash"
+load ../test_helper_libs

 load ../../plugins/available/battery.plugin

--- a/test/plugins/cmd-returned-notify.plugin.bats
+++ b/test/plugins/cmd-returned-notify.plugin.bats
@@ -1,7 +1,7 @@
 #!/usr/bin/env bats

 load ../test_helper
-load ../../lib/helpers
+load ../test_helper_libs
 load ../../vendor/init.d/preexec

 load ../../plugins/available/cmd-returned-notify.plugin
--- a/test/plugins/go.plugin.bats
+++ b/test/plugins/go.plugin.bats
@@ -1,7 +1,7 @@
 #!/usr/bin/env bats

 load ../test_helper
-load ../../lib/helpers
+load ../test_helper_libs

 # We test `go version` in each test to account for users with goenv and no system go.

--- a/test/plugins/ruby.plugin.bats
+++ b/test/plugins/ruby.plugin.bats
@@ -1,7 +1,7 @@
 #!/usr/bin/env bats

 load ../test_helper
-load ../../lib/helpers
+load ../test_helper_libs

 function local_setup {
  setup_test_fixture
--- a/test/plugins/xterm.plugin.bats
+++ b/test/plugins/xterm.plugin.bats
@@ -1,8 +1,7 @@
 #!/usr/bin/env bats

 load ../test_helper
-load ../../lib/log
-load ../../lib/helpers
+load ../test_helper_libs

 load ../../plugins/available/xterm.plugin

--- a/test/test_helper_libs.bash
+++ b/test/test_helper_libs.bash
@@ -0,0 +1,6 @@
+# shellcheck shell=bash
+
+load "${BASH_IT}/lib/log.bash"
+load "${BASH_IT}/lib/utilities.bash"
+load "${BASH_IT}/lib/helpers.bash"
+load "${BASH_IT}/lib/search.bash"
--- a/test/themes/base.theme.bats
+++ b/test/themes/base.theme.bats
@@ -1,9 +1,7 @@
 #!/usr/bin/env bats

 load ../test_helper
-load ../../lib/log
-
-load ../../lib/helpers
+load ../test_helper_libs
 load ../../themes/base.theme

@test 'themes base: battery_percentage should not exist' {
--- a/test/themes/base.theme.git.bats
+++ b/test/themes/base.theme.git.bats
@@ -1,9 +1,7 @@
 #!/usr/bin/env bats

 load ../test_helper
-load ../../lib/log
-
-load ../../lib/helpers
+load ../test_helper_libs
 load ../../themes/githelpers.theme
 load ../../themes/base.theme

--- a/test/themes/base.theme.svn.bats
+++ b/test/themes/base.theme.svn.bats
@@ -1,9 +1,7 @@
 #!/usr/bin/env bats

 load ../test_helper
-load ../../lib/log
-
-load ../../lib/helpers
+load ../test_helper_libs

 function local_setup {
  setup_test_fixture