tests: test_helper already loads `composure.sh`

...and `cite()`s metadata
2021-10-19 11:28:48 -04:00 · 2021-10-19 11:28:48 -04:00 · 9dcbeec7ad
parent b2279b7237
commit 9dcbeec7ad
19 changed files with 5 additions and 40 deletions
--- a/test/bash_it/bash_it.bats
+++ b/test/bash_it/bash_it.bats
@ -1,7 +1,6 @@
 #!/usr/bin/env bats

 load ../test_helper
-load "${BASH_IT}/vendor/github.com/erichs/composure/composure.sh"

 function local_setup {
  setup_test_fixture
--- a/test/completion/bash-it.completion.bats
+++ b/test/completion/bash-it.completion.bats
@ -1,7 +1,6 @@
 #!/usr/bin/env bats

 load ../test_helper
-load "${BASH_IT}/vendor/github.com/erichs/composure/composure.sh"
 load ../../completion/available/bash-it.completion

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

 load ../test_helper
-load "${BASH_IT}/vendor/github.com/erichs/composure/composure.sh"

 # Determine which config file to use based on OS.
 case $OSTYPE in
--- a/test/install/uninstall.bats
+++ b/test/install/uninstall.bats
@ -1,7 +1,6 @@
 #!/usr/bin/env bats

 load ../test_helper
-load "${BASH_IT}/vendor/github.com/erichs/composure/composure.sh"

 # Determine which config file to use based on OS.
 case $OSTYPE in
--- a/test/lib/composure.bats
+++ b/test/lib/composure.bats
@ -1,7 +1,6 @@
 #!/usr/bin/env bats

 load ../test_helper
-load "${BASH_IT}/vendor/github.com/erichs/composure/composure.sh"

@test "lib composure: _composure_keywords()" {
  run _composure_keywords
--- a/test/lib/helpers.bats
+++ b/test/lib/helpers.bats
@ -1,13 +1,10 @@
 #!/usr/bin/env bats

 load ../test_helper
-load "${BASH_IT}/vendor/github.com/erichs/composure/composure.sh"
 load ../../lib/log
 load ../../lib/utilities
 load ../../lib/search

-cite _about _param _example _group _author _version
-
 load ../../lib/helpers
 load ../../plugins/available/base.plugin

--- a/test/lib/log.bats
+++ b/test/lib/log.bats
@ -1,10 +1,8 @@
 #!/usr/bin/env bats

 load ../test_helper
-load "${BASH_IT}/vendor/github.com/erichs/composure/composure.sh"
-load ../../lib/appearance
+load ../../themes/colors.theme

-cite _about _param _example _group _author _version
 load ../../lib/log
 load ../../lib/helpers
 load ../../plugins/available/base.plugin
--- a/test/lib/search.bats
+++ b/test/lib/search.bats
@ -1,14 +1,11 @@
 #!/usr/bin/env bats

 load ../test_helper
-load "${BASH_IT}/vendor/github.com/erichs/composure/composure.sh"
 load ../../lib/log
 load ../../lib/helpers
 load ../../lib/utilities
 load ../../lib/search

-cite _about _param _example _group _author _version
-
 load ../../plugins/available/base.plugin
 load ../../aliases/available/git.aliases
 load ../../plugins/available/ruby.plugin
--- a/test/lib/utilities.bats
+++ b/test/lib/utilities.bats
@ -1,13 +1,11 @@
 #!/usr/bin/env bats

 load ../test_helper
-load "${BASH_IT}/vendor/github.com/erichs/composure/composure.sh"
+load ../../lib/log
 load ../../lib/helpers
 load ../../lib/utilities
 load ../../lib/search

-cite _about _param _example _group _author _version
-
 function local_setup {
  setup_test_fixture
 }
--- a/test/plugins/alias-completion.plugin.bats
+++ b/test/plugins/alias-completion.plugin.bats
@ -1,12 +1,9 @@
 #!/usr/bin/env bats

 load ../test_helper
-load "${BASH_IT}/vendor/github.com/erichs/composure/composure.sh"
 load ../../lib/log
 load ../../lib/helpers

-cite _about _param _example _group _author _version
-
 load ../../completion/available/capistrano.completion

@test "alias-completion: See that aliases with double quotes and brackets do not break the plugin" {
--- a/test/plugins/base.plugin.bats
+++ b/test/plugins/base.plugin.bats
@ -1,7 +1,6 @@
 #!/usr/bin/env bats

 load ../test_helper
-load "${BASH_IT}/vendor/github.com/erichs/composure/composure.sh"
 load ../../lib/log
 load ../../lib/helpers
 load ../../plugins/available/base.plugin
--- a/test/plugins/battery.plugin.bats
+++ b/test/plugins/battery.plugin.bats
@ -1,12 +1,9 @@
 #!/usr/bin/env bats

 load ../test_helper
-load "${BASH_IT}/vendor/github.com/erichs/composure/composure.sh"
 load "${BASH_IT}/lib/log.bash"
 load "${BASH_IT}/lib/helpers.bash"

-cite _about _param _example _group _author _version
-
 load ../../plugins/available/battery.plugin

 # Sets up the `_command_exists` function so that it only responds `true` if called with
--- a/test/plugins/cmd-returned-notify.plugin.bats
+++ b/test/plugins/cmd-returned-notify.plugin.bats
@ -2,7 +2,7 @@

 load ../test_helper
 load ../../lib/helpers
-load "${BASH_IT}/vendor/github.com/erichs/composure/composure.sh"
+load ../../vendor/init.d/preexec

 load ../../plugins/available/cmd-returned-notify.plugin

--- a/test/plugins/go.plugin.bats
+++ b/test/plugins/go.plugin.bats
@ -2,7 +2,6 @@

 load ../test_helper
 load ../../lib/helpers
-load "${BASH_IT}/vendor/github.com/erichs/composure/composure.sh"

 # 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
@ -2,14 +2,14 @@

 load ../test_helper
 load ../../lib/helpers
-load "${BASH_IT}/vendor/github.com/erichs/composure/composure.sh"
-load ../../plugins/available/ruby.plugin

 function local_setup {
  setup_test_fixture

  export OLD_PATH="$PATH"
  export PATH="/usr/bin:/bin:/usr/sbin"
+
+  load ../../plugins/available/ruby.plugin
 }

 function local_teardown {
@ -27,8 +27,6 @@ function local_teardown {
    skip 'ruby not installed'
  fi

-  load ../../plugins/available/ruby.plugin
-
  local last_path_entry=$(echo $PATH | tr ":" "\n" | tail -1)
  [[ "${last_path_entry}" == "${HOME}"/.gem/ruby/*/bin ]]
 }
--- a/test/plugins/xterm.plugin.bats
+++ b/test/plugins/xterm.plugin.bats
@ -3,7 +3,6 @@
 load ../test_helper
 load ../../lib/log
 load ../../lib/helpers
-load "${BASH_IT}/vendor/github.com/erichs/composure/composure.sh"

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

--- a/test/themes/base.theme.bats
+++ b/test/themes/base.theme.bats
@ -1,11 +1,8 @@
 #!/usr/bin/env bats

 load ../test_helper
-load "${BASH_IT}/vendor/github.com/erichs/composure/composure.sh"
 load ../../lib/log

-cite _about _param _example _group _author _version
-
 load ../../lib/helpers
 load ../../themes/base.theme

--- a/test/themes/base.theme.git.bats
+++ b/test/themes/base.theme.git.bats
@ -1,11 +1,8 @@
 #!/usr/bin/env bats

 load ../test_helper
-load "${BASH_IT}/vendor/github.com/erichs/composure/composure.sh"
 load ../../lib/log

-cite _about _param _example _group _author _version
-
 load ../../lib/helpers
 load ../../themes/githelpers.theme
 load ../../themes/base.theme
--- a/test/themes/base.theme.svn.bats
+++ b/test/themes/base.theme.svn.bats
@ -1,11 +1,8 @@
 #!/usr/bin/env bats

 load ../test_helper
-load "${BASH_IT}/vendor/github.com/erichs/composure/composure.sh"
 load ../../lib/log

-cite _about _param _example _group _author _version
-
 load ../../lib/helpers

 function local_setup {