more feedback and fixes

Signed-off-by: Ludvig Liljenberg <[email protected]>
getporter · Aug 7, 2023 · 9d3a9fa · 9d3a9fa
1 parent 0fdd838
commit 9d3a9fa
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/pkg/exec/builder/execute_test.go b/pkg/exec/builder/execute_test.go
@@ -144,10 +144,6 @@ func TestExecuteStep_HasOrderedArguments(t *testing.T) {
 }
 
 func TestExecuteStep_SpecifiesCustomWorkingDirectory(t *testing.T) {
-	//if runtime.GOOS == "windows" {
-	//	t.Skip() // pwd not available on windows (for some reason the only command that works is "help" ?!?)
-	//}
-
 	ctx := context.Background()
 	c := porterruntime.NewTestRuntimeConfig(t)
 	c.TestContext.UseFilesystem()

diff --git a/pkg/porter/cnab_test.go b/pkg/porter/cnab_test.go
@@ -101,12 +101,9 @@ func TestSharedOptions_validateBundleJson(t *testing.T) {
 }
 
 func Test_bundleFileOptions(t *testing.T) {
-	absWantFile, err := filepath.Abs(filepath.FromSlash("/" + config.Name))
-	require.NoError(t, err)
-	absWantCNABFile, err := filepath.Abs(filepath.FromSlash("/" + build.LOCAL_BUNDLE))
-	require.NoError(t, err)
-	absPathToBundle, err := filepath.Abs(filepath.FromSlash("/path/to/bundle"))
-	require.NoError(t, err)
+	absWantFile := absOSFilepath(t, "/"+config.Name)
+	absWantCNABFile := absOSFilepath(t, "/"+build.LOCAL_BUNDLE)
+	absPathToBundle := absOSFilepath(t, "/path/to/bundle")
 
 	testcases := []struct {
 		name         string

diff --git a/pkg/porter/credentials_test.go b/pkg/porter/credentials_test.go
@@ -296,17 +296,19 @@ func TestShowCredential_PreserveCase(t *testing.T) {
 }
 
 func TestCredentialsEdit(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip() // bash and vi not available on windows
-	}
-
 	p := NewTestPorter(t)
 	defer p.Close()
 
 	p.Setenv("SHELL", "bash")
 	p.Setenv("EDITOR", "vi")
 	p.Setenv(test.ExpectedCommandEnv, "bash -c vi "+filepath.Join(os.TempDir(), "porter-kool-kreds.yaml"))
 
+	if runtime.GOOS == "windows" {
+		p.Setenv("SHELL", "cmd")
+		p.Setenv("EDITOR", "notepad")
+		p.Setenv(test.ExpectedCommandEnv, "cmd /C notepad "+filepath.Join(os.TempDir(), "porter-kool-kreds.yaml"))
+	}
+
 	opts := CredentialEditOptions{Namespace: "dev", Name: "kool-kreds"}
 
 	p.TestCredentials.AddTestCredentialsDirectory("testdata/test-creds")
@@ -320,8 +322,10 @@ func TestCredentialsEditEditorPathWithArgument(t *testing.T) {
 
 	p.Setenv("SHELL", "something")
 	p.Setenv("EDITOR", "C:\\Program Files\\Visual Studio Code\\code.exe --wait")
-	p.Setenv(test.ExpectedCommandEnv, "something -c C:\\Program Files\\Visual Studio Code\\code.exe --wait "+filepath.Join(os.TempDir(), "porter-kool-kreds.yaml")+
-		"\nsomething /C C:\\Program Files\\Visual Studio Code\\code.exe --wait "+filepath.Join(os.TempDir(), "porter-kool-kreds.yaml"))
+	p.Setenv(test.ExpectedCommandEnv, fmt.Sprintf("something -c C:\\Program Files\\Visual Studio Code\\code.exe --wait %s", filepath.Join(os.TempDir(), "porter-kool-kreds.yaml")))
+	if runtime.GOOS == "windows" {
+		p.Setenv(test.ExpectedCommandEnv, fmt.Sprintf("something /C C:\\Program Files\\Visual Studio Code\\code.exe --wait %s", filepath.Join(os.TempDir(), "porter-kool-kreds.yaml")))
+	}
 	opts := CredentialEditOptions{Namespace: "dev", Name: "kool-kreds"}
 
 	p.TestCredentials.AddTestCredentialsDirectory("testdata/test-creds")