Remove .Then()

bryphe-coder · bryphe-coder · commit 0e8d4b67c747 · 2022-02-14T18:54:35.000Z
diff --git a/expect/expect.go b/expect/expect.go
@@ -34,12 +34,6 @@ func (c *Console) ExpectString(s string) (string, error) {
 	return c.Expect(String(s))
 }
 
-// ExpectEOF reads from Console's tty until EOF or an error occurs, and returns
-// the buffer read by Console.  We also treat the PTSClosed error as an EOF.
-func (c *Console) ExpectEOF() (string, error) {
-	return c.Expect(EOF, PTSClosed)
-}
-
 // Expect reads from Console's tty until a condition specified from opts is
 // encountered or an error occurs, and returns the buffer read by console.
 // No extra bytes are read once a condition is met, so if a program isn't
diff --git a/expect/expect_opt.go b/expect/expect_opt.go
@@ -32,26 +32,6 @@ type Opt func(*Opts) error
 // the chained matcher.
 type ConsoleCallback func(buf *bytes.Buffer) error
 
-// Then returns an Expect condition to execute a callback if a match is found
-// for the chained matcher.
-func (eo Opt) Then(consoleCallback ConsoleCallback) Opt {
-	return func(opts *Opts) error {
-		var options Opts
-		err := eo(&options)
-		if err != nil {
-			return err
-		}
-
-		for _, matcher := range options.Matchers {
-			opts.Matchers = append(opts.Matchers, &callbackMatcher{
-				f:       consoleCallback,
-				matcher: matcher,
-			})
-		}
-		return nil
-	}
-}
-
 // Opts provides additional options on Expect.
 type Opts struct {
 	Matchers    []Matcher
diff --git a/expect/expect_opt_test.go b/expect/expect_opt_test.go
@@ -21,7 +21,6 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"golang.org/x/xerrors"
 
 	. "github.com/coder/coder/expect"
 )
@@ -254,94 +253,6 @@ func TestExpectOptError(t *testing.T) {
 	}
 }
 
-func TestExpectOptThen(t *testing.T) {
-	t.Parallel()
-
-	var (
-		errFirst  = xerrors.New("first")
-		errSecond = xerrors.New("second")
-	)
-
-	tests := []struct {
-		title    string
-		opt      Opt
-		data     string
-		match    bool
-		expected error
-	}{
-		{
-			"Noop",
-			String("Hello").Then(func(buf *bytes.Buffer) error {
-				return nil
-			}),
-			"Hello world",
-			true,
-			nil,
-		},
-		{
-			"Short circuit",
-			String("Hello").Then(func(buf *bytes.Buffer) error {
-				return errFirst
-			}).Then(func(buf *bytes.Buffer) error {
-				return errSecond
-			}),
-			"Hello world",
-			true,
-			errFirst,
-		},
-		{
-			"Chain",
-			String("Hello").Then(func(buf *bytes.Buffer) error {
-				return nil
-			}).Then(func(buf *bytes.Buffer) error {
-				return errSecond
-			}),
-			"Hello world",
-			true,
-			errSecond,
-		},
-		{
-			"No matches",
-			String("other").Then(func(buf *bytes.Buffer) error {
-				return errFirst
-			}),
-			"Hello world",
-			false,
-			nil,
-		},
-	}
-
-	for _, test := range tests {
-		test := test
-		t.Run(test.title, func(t *testing.T) {
-			t.Parallel()
-
-			var options Opts
-			err := test.opt(&options)
-			require.Nil(t, err)
-
-			buf := new(bytes.Buffer)
-			_, err = buf.WriteString(test.data)
-			require.Nil(t, err)
-
-			matcher := options.Match(buf)
-			if test.match {
-				require.NotNil(t, matcher)
-
-				cb, ok := matcher.(CallbackMatcher)
-				if ok {
-					require.True(t, ok)
-
-					err = cb.Callback(nil)
-					require.Equal(t, test.expected, err)
-				}
-			} else {
-				require.Nil(t, matcher)
-			}
-		})
-	}
-}
-
 func TestExpectOptAll(t *testing.T) {
 	t.Parallel()
 
