JavaScriptExpert
diff --git a/‎lib/commands/which.sh‎
Lines changed: 3 additions & 13 deletions b/‎lib/commands/which.sh‎
Lines changed: 3 additions & 13 deletions
diff --git a/‎test/which_command.bats‎
Lines changed: 12 additions & 3 deletions b/‎test/which_command.bats‎
Lines changed: 12 additions & 3 deletions
@@ -1,4 +1,4 @@
-current_version() {
+which_command() {
   local plugin_name=$1
 
   check_if_plugin_exists "$plugin_name"
@@ -9,28 +9,18 @@ current_version() {
   version_and_path=$(find_version "$plugin_name" "$search_path")
   local version
   version=$(cut -d '|' -f 1 <<< "$version_and_path");
+  local install_type="version"
 
   check_if_version_exists "$plugin_name" "$version"
   check_for_deprecated_plugin "$plugin_name"
 
   if [ -z "$version" ]; then
     display_no_version_set "$plugin_name"
     exit 1
-  else
-    echo "$version"
-    exit 0
   fi
-}
-
-which_command() {
-  local plugin_name=$1
-  local plugin_path
-  plugin_path=$(get_plugin_path "$plugin_name")
-  check_if_plugin_exists "$plugin_name"
-  local install_type="version"
 
   local install_path
-  install_path=$(get_install_path "$plugin_name" "$install_type" "$(current_version "$plugin_name")")
+  install_path=$(get_install_path "$plugin_name" "$install_type" "$version")
 
   if [ -d "$install_path" ]; then
     echo "$install_path/bin/$plugin_name"
 
@@ -8,6 +8,7 @@ load test_helpers
 setup() {
   setup_asdf_dir
   install_dummy_plugin
+  install_mock_plugin "bazbat"
   run install_command dummy 1.0
 
   PROJECT_DIR=$HOME/project
@@ -23,14 +24,22 @@ teardown() {
 
   echo 'dummy 1.0' >> $PROJECT_DIR/.tool-versions
 
-  run current_version "dummy"
-  [ "$output" = "1.0" ]
-
   run which_command "dummy"
   [ "$status" -eq 0 ]
   [ "$output" = "$ASDF_DIR/installs/dummy/1.0/bin/dummy" ]
 }
 
+@test "which should inform when no version is set" {
+  cd $PROJECT_DIR
+
+  local expected
+  expected="No version set for bazbat; please run \`asdf <global | local> bazbat <version>\`"
+
+  run which_command "bazbat"
+  [ "$status" -eq 1 ]
+  [ "$output" = "$expected" ]
+}
+
 @test "which should error when the plugin doesn't exist" {
   run which_command "foobar"
   [ "$status" -eq 1 ]