From bf632e19fc5d49117b5f349e70eb7a84db648780 Mon Sep 17 00:00:00 2001 From: Nils Winkler Date: Tue, 16 May 2017 07:47:38 +0200 Subject: [PATCH] Refactored tests to use helper assert functions --- test/lib/helpers.bats | 75 +++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 39 deletions(-) diff --git a/test/lib/helpers.bats b/test/lib/helpers.bats index ed79df48..28b0f1b0 100644 --- a/test/lib/helpers.bats +++ b/test/lib/helpers.bats @@ -17,104 +17,101 @@ function local_setup { @test "bash-it: enable the node plugin" { run _enable-plugin "node" - [ "${lines[0]}" == 'node enabled with priority 250.' ] - [ -L "$BASH_IT/plugins/enabled/250---node.plugin.bash" ] + assert_line "0" 'node enabled with priority 250.' + assert [ -L "$BASH_IT/plugins/enabled/250---node.plugin.bash" ] } @test "bash-it: enable the nvm plugin" { run _enable-plugin "nvm" - [ "${lines[0]}" == 'nvm enabled with priority 225.' ] - [ -L "$BASH_IT/plugins/enabled/225---nvm.plugin.bash" ] + assert_line "0" 'nvm enabled with priority 225.' + assert [ -L "$BASH_IT/plugins/enabled/225---nvm.plugin.bash" ] } @test "bash-it: enable an unknown plugin" { run _enable-plugin "unknown-foo" - [ "${lines[0]}" == 'sorry, unknown-foo does not appear to be an available plugin.' ] - [ ! -L "$BASH_IT/plugins/enabled/250---unknown-foo.plugin.bash" ] - [ ! -L "$BASH_IT/plugins/enabled/unknown-foo.plugin.bash" ] + assert_line "0" 'sorry, unknown-foo does not appear to be an available plugin.' + assert [ ! -L "$BASH_IT/plugins/enabled/250---unknown-foo.plugin.bash" ] + assert [ ! -L "$BASH_IT/plugins/enabled/unknown-foo.plugin.bash" ] } @test "bash-it: disable a plugin that is not enabled" { run _disable-plugin "sdkman" - [ "${lines[0]}" == 'sorry, sdkman does not appear to be an enabled plugin.' ] + assert_line "0" 'sorry, sdkman does not appear to be an enabled plugin.' } @test "bash-it: enable and disable the nvm plugin" { run _enable-plugin "nvm" - [ "${lines[0]}" == 'nvm enabled with priority 225.' ] - [ -L "$BASH_IT/plugins/enabled/225---nvm.plugin.bash" ] + assert_line "0" 'nvm enabled with priority 225.' + assert [ -L "$BASH_IT/plugins/enabled/225---nvm.plugin.bash" ] run _disable-plugin "nvm" - [ "${lines[0]}" == 'nvm disabled.' ] - [ ! -L "$BASH_IT/plugins/enabled/225---nvm.plugin.bash" ] + assert_line "0" 'nvm disabled.' + assert [ ! -L "$BASH_IT/plugins/enabled/225---nvm.plugin.bash" ] } @test "bash-it: disable the nvm plugin if it was enabled without a priority" { ln -s $BASH_IT/plugins/available/nvm.plugin.bash $BASH_IT/plugins/enabled/nvm.plugin.bash - [ -L "$BASH_IT/plugins/enabled/nvm.plugin.bash" ] + assert [ -L "$BASH_IT/plugins/enabled/nvm.plugin.bash" ] run _disable-plugin "nvm" - [ "${lines[0]}" == 'nvm disabled.' ] - [ ! -L "$BASH_IT/plugins/enabled/nvm.plugin.bash" ] + assert_line "0" 'nvm disabled.' + assert [ ! -L "$BASH_IT/plugins/enabled/nvm.plugin.bash" ] } @test "bash-it: enable the nvm plugin if it was enabled without a priority" { ln -s $BASH_IT/plugins/available/nvm.plugin.bash $BASH_IT/plugins/enabled/nvm.plugin.bash - [ -L "$BASH_IT/plugins/enabled/nvm.plugin.bash" ] + assert [ -L "$BASH_IT/plugins/enabled/nvm.plugin.bash" ] run _enable-plugin "nvm" - [ "${lines[0]}" == 'nvm is already enabled.' ] - [ -L "$BASH_IT/plugins/enabled/nvm.plugin.bash" ] - [ ! -L "$BASH_IT/plugins/enabled/225---nvm.plugin.bash" ] + assert_line "0" 'nvm is already enabled.' + assert [ -L "$BASH_IT/plugins/enabled/nvm.plugin.bash" ] + assert [ ! -L "$BASH_IT/plugins/enabled/225---nvm.plugin.bash" ] } @test "bash-it: enable the nvm plugin twice" { run _enable-plugin "nvm" - [ "${lines[0]}" == 'nvm enabled with priority 225.' ] - [ -L "$BASH_IT/plugins/enabled/225---nvm.plugin.bash" ] + assert_line "0" 'nvm enabled with priority 225.' + assert [ -L "$BASH_IT/plugins/enabled/225---nvm.plugin.bash" ] run _enable-plugin "nvm" - [ "${lines[0]}" == 'nvm is already enabled.' ] - [ -L "$BASH_IT/plugins/enabled/225---nvm.plugin.bash" ] + assert_line "0" 'nvm is already enabled.' + assert [ -L "$BASH_IT/plugins/enabled/225---nvm.plugin.bash" ] } @test "bash-it: migrate enabled plugins that don't use the new priority-based configuration" { ln -s $BASH_IT/plugins/available/nvm.plugin.bash $BASH_IT/plugins/enabled/nvm.plugin.bash - [ -L "$BASH_IT/plugins/enabled/nvm.plugin.bash" ] + assert [ -L "$BASH_IT/plugins/enabled/nvm.plugin.bash" ] ln -s $BASH_IT/plugins/available/node.plugin.bash $BASH_IT/plugins/enabled/node.plugin.bash - [ -L "$BASH_IT/plugins/enabled/node.plugin.bash" ] + assert [ -L "$BASH_IT/plugins/enabled/node.plugin.bash" ] run _enable-plugin "ssh" - [ -L "$BASH_IT/plugins/enabled/250---ssh.plugin.bash" ] + assert [ -L "$BASH_IT/plugins/enabled/250---ssh.plugin.bash" ] run _bash-it-migrate - [ -L "$BASH_IT/plugins/enabled/225---nvm.plugin.bash" ] - [ -L "$BASH_IT/plugins/enabled/250---node.plugin.bash" ] - [ -L "$BASH_IT/plugins/enabled/250---ssh.plugin.bash" ] - [ ! -L "$BASH_IT/plugins/enabled/node.plugin.bash" ] - [ ! -L "$BASH_IT/plugins/enabled/nvm.plugin.bash" ] + assert [ -L "$BASH_IT/plugins/enabled/225---nvm.plugin.bash" ] + assert [ -L "$BASH_IT/plugins/enabled/250---node.plugin.bash" ] + assert [ -L "$BASH_IT/plugins/enabled/250---ssh.plugin.bash" ] + assert [ ! -L "$BASH_IT/plugins/enabled/node.plugin.bash" ] + assert [ ! -L "$BASH_IT/plugins/enabled/nvm.plugin.bash" ] } @test "bash-it: enable all plugins" { run _enable-plugin "all" local available=$(find $BASH_IT/plugins/available -name *.plugin.bash | wc -l) local enabled=$(find $BASH_IT/plugins/enabled -name 2*.plugin.bash | wc -l) - echo "Available: $available, Enabled: $enabled" - [ "$available" == "$enabled" ] + assert_equal "$available" "$enabled" } @test "bash-it: disable all plugins" { run _enable-plugin "all" local available=$(find $BASH_IT/plugins/available -name *.plugin.bash | wc -l) local enabled=$(find $BASH_IT/plugins/enabled -name 2*.plugin.bash | wc -l) - echo "Available: $available, Enabled: $enabled" - [ "$available" == "$enabled" ] + assert_equal "$available" "$enabled" run _disable-plugin "all" local enabled2=$(find $BASH_IT/plugins/enabled -name *.plugin.bash | wc -l) - echo "Enabled: $enabled2" - [ "$enabled2" -eq 0 ] + assert_equal "$enabled2" "0" } @test "bash-it: describe the nvm plugin without enabling it" { @@ -123,8 +120,8 @@ function local_setup { @test "bash-it: describe the nvm plugin after enabling it" { run _enable-plugin "nvm" - [ "${lines[0]}" == 'nvm enabled with priority 225.' ] - [ -L "$BASH_IT/plugins/enabled/225---nvm.plugin.bash" ] + assert_line "0" 'nvm enabled with priority 225.' + assert [ -L "$BASH_IT/plugins/enabled/225---nvm.plugin.bash" ] _bash-it-plugins | grep "nvm" | grep "\[x\]" }