test fixes

Signed-off-by: Ryan Swanson <ryan.swanson@loft.sh>

Author: zerbitx

.github/workflows/unit-tests.yaml

@@ -34,6 +34,10 @@ jobs:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v1
 
+      - name: Uninstall Helm 3.x
+        run: |
+          sudo rm -rf $(which helm) || true
+        
       - name: Test
         shell: bash
         run: |

e2e/tests/render/render.go

@@ -6,36 +6,36 @@ import (
 	"path/filepath"
 	"strings"
 	"sync"
-
+	
 	"github.com/onsi/ginkgo/v2"
-
+	
 	"github.com/loft-sh/devspace/cmd"
 	"github.com/loft-sh/devspace/cmd/flags"
 	"github.com/loft-sh/devspace/e2e/framework"
 	"github.com/loft-sh/devspace/pkg/util/factory"
 )
 
 var _ = DevSpaceDescribe("build", func() {
-
+	
 	initialDir, err := os.Getwd()
 	if err != nil {
 		panic(err)
 	}
-
+	
 	// create a new factory
 	var f factory.Factory
-
+	
 	ginkgo.BeforeEach(func() {
 		f = framework.NewDefaultFactory()
 	})
-
+	
 	// Test cases:
-
+	
 	ginkgo.It("should render helm charts", func() {
 		tempDir, err := framework.CopyToTempDir("tests/render/testdata/helm")
 		framework.ExpectNoError(err)
 		defer framework.CleanupTempDir(initialDir, tempDir)
-
+		
 		stdout := &Buffer{}
 		// create build command
 		renderCmd := &cmd.RunPipelineCmd{
@@ -50,18 +50,18 @@ var _ = DevSpaceDescribe("build", func() {
 		err = renderCmd.RunDefault(f)
 		framework.ExpectNoError(err)
 		content := strings.TrimSpace(stdout.String()) + "\n"
-
+		
 		framework.ExpectLocalFileContentsImmediately(
 			filepath.Join(tempDir, "rendered.txt"),
 			content,
 		)
 	})
-
+	
 	ginkgo.It("should render kubectl deployments", func() {
 		tempDir, err := framework.CopyToTempDir("tests/render/testdata/kubectl")
 		framework.ExpectNoError(err)
 		defer framework.CleanupTempDir(initialDir, tempDir)
-
+		
 		stdout := &Buffer{}
 		// create build command
 		renderCmd := &cmd.RunPipelineCmd{

e2e/tests/render/testdata/helm/rendered.txt

@@ -9,7 +9,7 @@ metadata:
     "app.kubernetes.io/component": "test"
     "app.kubernetes.io/managed-by": "Helm"
   annotations:
-    "helm.sh/chart": "component-chart-0.9.1"
+    "helm.sh/chart": "component-chart-0.9.2"
 spec:
   replicas: 1
   strategy:
@@ -26,7 +26,7 @@ spec:
         "app.kubernetes.io/component": "test"
         "app.kubernetes.io/managed-by": "Helm"
       annotations:
-        "helm.sh/chart": "component-chart-0.9.1"
+        "helm.sh/chart": "component-chart-0.9.2"
     spec:
       imagePullSecrets:
       nodeSelector:
@@ -78,7 +78,6 @@ spec:
           volumeMounts:
       initContainers:
       volumes:
-  volumeClaimTemplates:
 ---
 # Source: component-chart/templates/deployment.yaml
 # Create headless service for StatefulSet

pkg/devspace/deploy/deployer/helm/client.go

@@ -23,7 +23,7 @@ const ComponentChartFolder = "component-chart"
 // DevSpaceChartConfig is the config that holds the devspace chart information
 var DevSpaceChartConfig = &latest.ChartConfig{
 	Name:    "component-chart",
-	Version: "0.9.1",
+	Version: "0.9.2",
 	RepoURL: "https://charts.devspace.sh",
 }
 

pkg/devspace/pipeline/engine/engine_test.go

@@ -3,13 +3,14 @@ package engine
 import (
 	"bytes"
 	"context"
-	"mvdan.cc/sh/v3/expand"
+	"fmt"
 	"os"
 	"path/filepath"
 	"strings"
 	"testing"
-
+	
 	"gotest.tools/assert"
+	"mvdan.cc/sh/v3/expand"
 )
 
 type testCaseShell struct {
@@ -23,11 +24,11 @@ func TestShellCat(t *testing.T) {
 		t.Fatal(err)
 	}
 	defer os.Remove(file.Name())
-
+	
 	if _, err = file.WriteString("Hello DevSpace!"); err != nil {
 		t.Fatalf("Unable to write to temporary file %v", err)
 	}
-
+	
 	testCases := []testCaseShell{
 		{
 			command:        "cat " + filepath.ToSlash(file.Name()),
@@ -38,7 +39,7 @@ func TestShellCat(t *testing.T) {
 			expectedOutput: "123\n",
 		},
 	}
-
+	
 	for _, testCase := range testCases {
 		stdout := &bytes.Buffer{}
 		err := ExecuteSimpleShellCommand(context.Background(), ".", expand.ListEnviron(os.Environ()...), stdout, nil, nil, testCase.command)
@@ -56,7 +57,7 @@ func TestShellCatError(t *testing.T) {
 			expectedOutput: "cat: noFile.txt: No such file or directory\n",
 		},
 	}
-
+	
 	for _, testCase := range testCases {
 		stderr := &bytes.Buffer{}
 		err := ExecuteSimpleShellCommand(context.Background(), ".", expand.ListEnviron(os.Environ()...), stderr, stderr, nil, testCase.command)
@@ -69,7 +70,7 @@ func TestShellCatError(t *testing.T) {
 		} else {
 			t.Fatal("FAIL: TestShellCatError")
 		}
-
+		
 	}
 }
 
@@ -80,11 +81,11 @@ func TestShellCatEnforce(t *testing.T) {
 		t.Fatal(err)
 	}
 	defer os.Remove(file.Name())
-
+	
 	if _, err = file.WriteString("Hello DevSpace!"); err != nil {
 		t.Fatalf("Unable to write to temporary file %v", err)
 	}
-
+	
 	testCases := []testCaseShell{
 		{
 			command:        "cat " + filepath.ToSlash(file.Name()),
@@ -95,7 +96,7 @@ func TestShellCatEnforce(t *testing.T) {
 			expectedOutput: "123\n",
 		},
 	}
-
+	
 	for _, testCase := range testCases {
 		stdout := &bytes.Buffer{}
 		err := ExecuteSimpleShellCommand(context.Background(), ".", expand.ListEnviron(os.Environ()...), stdout, nil, nil, testCase.command)
@@ -132,5 +133,8 @@ func TestHelmDownload(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	
+	fmt.Println("👉:", stdout1.String())
+	
 	assert.Assert(t, strings.Contains(stdout1.String(), `Version:"v4`))
 }