Merge pull request #1619 from technosophos/fix/convert-plugin-format-on-tests

fix(hel): fix plugin format on tests

cmd/helm/plugins_test.go

@@ -77,7 +77,7 @@ func TestLoadPlugins(t *testing.T) {
 
 	envs := strings.Join([]string{
 		"fullenv",
-		"fullenv.yaml",
+		hh.Plugins() + "/fullenv",
 		hh.Plugins(),
 		hh.String(),
 		hh.Repository(),
@@ -102,6 +102,11 @@ func TestLoadPlugins(t *testing.T) {
 	}
 
 	plugins := cmd.Commands()
+
+	if len(plugins) != len(tests) {
+		t.Fatalf("Expected %d plugins, got %d", len(tests), len(plugins))
+	}
+
 	for i := 0; i < len(plugins); i++ {
 		out.Reset()
 		tt := tests[i]

cmd/helm/testdata/helmhome/plugins/args/plugin.yaml

@@ -1,4 +1,4 @@
 name: args
 usage: "echo args"
 description: "This echos args"
-command: "$HELM_HOME/plugins/args.sh"
+command: "$HELM_PLUGIN_DIR/args.sh"

cmd/helm/testdata/helmhome/plugins/fullenv/fullenv.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
-echo $HELM_PLUGIN_SHORTNAME
 echo $HELM_PLUGIN_NAME
+echo $HELM_PLUGIN_DIR
 echo $HELM_PLUGIN
 echo $HELM_HOME
 echo $HELM_PATH_REPOSITORY

cmd/helm/testdata/helmhome/plugins/fullenv/plugin.yaml

@@ -1,4 +1,4 @@
 name: fullenv
 usage: "show env vars"
 description: "show all env vars"
-command: "$HELM_HOME/plugins/fullenv.sh"
+command: "$HELM_PLUGIN_DIR/fullenv.sh"