Merge pull request #6 from devbuddy/better-tests

Table driven test

Author: pior

.github/workflows/tests.yml

@@ -2,7 +2,6 @@ name: tests
 
 on:
   push:
-  pull_request:
 
 jobs:
   linters:

dev.yml

@@ -5,7 +5,7 @@ up:
   - homebrew:
     - golangci/tap/golangci-lint
   - go:
-      version: 1.16.4
+      version: 1.17.7
       modules: true
 
 commands:

shell_test.go

@@ -1,54 +1,63 @@
 package expect
 
 import (
+	"os/exec"
 	"testing"
 
 	"github.com/stretchr/testify/require"
 )
 
 const DockerImage = "docker-test-image"
 
-func Test_ShellExpect_Bash(t *testing.T) {
-	env := []string{
-		"PS1=##\n",
-		"TESTVAR=foobar",
+func Test_ShellExpect(t *testing.T) {
+	tests := []struct {
+		shell     string
+		shellArgs []string
+		env       []string
+	}{
+		{
+			shell:     "zsh",
+			shellArgs: []string{"--no-globalrcs", "--no-rcs", "--no-zle", "--no-promptcr"},
+			env: []string{
+				"PROMPT=##\n",
+				"TESTVAR=foobar",
+			},
+		},
+		{
+			shell:     "bash",
+			shellArgs: []string{"--noprofile", "--norc"},
+			env: []string{
+				"PS1=##\n",
+				"TESTVAR=foobar",
+			},
+		},
 	}
 
-	ep := NewExpectWithEnv("bash", []string{"--noprofile", "--norc"}, env)
-	err := ep.Start()
-	require.NoError(t, err)
-
-	shell := NewShellExpect(ep, "##\n")
-
-	err = shell.Init()
-	require.NoError(t, err)
-
-	output, err := shell.Run("echo $TESTVAR")
-	require.NoError(t, err)
-	require.Equal(t, []string{"foobar"}, output)
-}
-
-func Test_ShellExpect_Zsh(t *testing.T) {
-	t.SkipNow()
-
-	env := []string{
-		"PROMPT=##\n",
-		"TESTVAR=foobar",
+	for _, tt := range tests {
+		t.Run(tt.shell, func(t *testing.T) {
+			shellPath, err := exec.LookPath(tt.shell)
+			if err != nil {
+				t.Skipf("shell executable not found for %s (%s)", tt.shell, err)
+			}
+
+			ep := NewExpectWithEnv(shellPath, tt.shellArgs, tt.env)
+			err = ep.Start()
+			require.NoError(t, err)
+
+			shell := NewShellExpect(ep, "##\n")
+
+			t.Run("init", func(t *testing.T) {
+				err = shell.Init()
+				require.NoError(t, err)
+			})
+
+			t.Run("echo", func(t *testing.T) {
+				output, err := shell.Run("echo $TESTVAR")
+				require.NoError(t, err)
+				require.Equal(t, []string{"foobar"}, output)
+			})
+		})
 	}
-
-	ep := NewExpectWithEnv("zsh", []string{"--no-globalrcs", "--no-rcs", "--no-zle", "--no-promptcr"}, env)
-	err := ep.Start()
-	require.NoError(t, err)
-	ep.Debug = true
-
-	shell := NewShellExpect(ep, "##\n")
-
-	err = shell.Init()
-	require.NoError(t, err)
-
-	output, err := shell.Run("echo $TESTVAR")
-	require.NoError(t, err)
-	require.Equal(t, []string{"foobar"}, output)
 }
 
 func Test_ShellExpect_Docker_Bash(t *testing.T) {