Skip to content

Commit 1c38bb5

Browse files
committed
test: fix failing tests
1 parent 0e360bb commit 1c38bb5

File tree

6 files changed

+26
-10
lines changed

6 files changed

+26
-10
lines changed

go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,3 +95,5 @@ require (
9595
golang.org/x/text v0.26.0 // indirect
9696
golang.org/x/tools v0.33.0 // indirect
9797
)
98+
99+
replace github.com/jahvon/tuikit => ../tuikit

internal/io/vault/view.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func (vc *vaultCollection) Plural() string {
8282
}
8383

8484
func (vc *vaultCollection) Items() []*types.EntityInfo {
85-
items := make([]*types.EntityInfo, 0, len(vc.Vaults))
85+
items := make([]*types.EntityInfo, len(vc.Vaults))
8686
for i, v := range vc.Vaults {
8787
items[i] = &types.EntityInfo{
8888
Header: v.Name,

internal/services/run/run_test.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ var _ = Describe("Run", func() {
5252
logger.EXPECT().LogMode().DoAndReturn(func() tuikitIO.LogMode {
5353
return tuikitIO.Text
5454
}).AnyTimes()
55-
logger.EXPECT().Println("foo").Times(1)
55+
logger.EXPECT().Print("foo").Times(1)
56+
logger.EXPECT().Print("\n").Times(1)
5657
err := run.RunCmd("echo \"foo\"", "", nil, tuikitIO.Text, logger, os.Stdin, nil)
5758
Expect(err).NotTo(HaveOccurred())
5859
})
@@ -126,7 +127,8 @@ var _ = Describe("Run", func() {
126127
logger.EXPECT().LogMode().DoAndReturn(func() tuikitIO.LogMode {
127128
return tuikitIO.Text
128129
}).AnyTimes()
129-
logger.EXPECT().Println("foo").Times(1)
130+
logger.EXPECT().Print("foo").Times(1)
131+
logger.EXPECT().Print("\n").Times(1)
130132
filename := filepath.Base(testfile.Name())
131133
filedir := filepath.Dir(testfile.Name())
132134
err := run.RunFile(filename, filedir, nil, tuikitIO.Logfmt, logger, os.Stdin, nil)

internal/utils/utils.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,3 +164,11 @@ func IsZeroValue(v interface{}) bool {
164164
}
165165
return reflect.DeepEqual(v, reflect.Zero(reflect.TypeOf(v)).Interface())
166166
}
167+
168+
const ansi = "[\u001B\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[a-zA-Z\\d]*)*)?\u0007)|(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PRZcf-ntqry=><~]))"
169+
170+
var re = regexp.MustCompile(ansi)
171+
172+
func StripAnsi(str string) string {
173+
return re.ReplaceAllString(str, "")
174+
}

tests/secret_cmds_e2e_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
. "github.com/onsi/ginkgo/v2"
1111
. "github.com/onsi/gomega"
1212

13+
internalUtils "github.com/jahvon/flow/internal/utils"
1314
"github.com/jahvon/flow/tests/utils"
1415
)
1516

@@ -44,7 +45,7 @@ var _ = Describe("vault/secrets e2e", Ordered, func() {
4445
Expect(lines).ToNot(BeEmpty())
4546
parts := strings.Split(strings.TrimSpace(lines[0]), ":")
4647
Expect(parts).To(HaveLen(2))
47-
encryptionKey := strings.TrimSpace(parts[1])
48+
encryptionKey := strings.TrimSpace(internalUtils.StripAnsi(parts[1]))
4849
Expect(os.Setenv(keyEnv, encryptionKey)).To(Succeed())
4950
})
5051

tests/utils/context.go

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package utils
22

33
import (
44
stdCtx "context"
5+
"fmt"
56
"os"
67
"path/filepath"
78
"runtime"
@@ -49,12 +50,13 @@ func NewContext(ctx stdCtx.Context, t ginkgo.FullGinkgoTInterface) *Context {
4950
tuikitIO.WithOutput(stdOut),
5051
tuikitIO.WithTheme(io.Theme("")),
5152
tuikitIO.WithMode(tuikitIO.Text),
52-
tuikitIO.WithExitFunc(func() {
53+
tuikitIO.WithExitFunc(func(msg string, args ...any) {
54+
msg = fmt.Sprintf(msg, args...)
5355
_, file, line, ok := runtime.Caller(3)
5456
if ok {
55-
t.Fatalf("logger exit called from %s:%d", file, line)
57+
t.Fatalf("logger exit called from %s:%d - %s", file, line, msg)
5658
} else {
57-
t.Fatalf("logger exit called")
59+
t.Fatalf("logger exit called - %s", msg)
5860
}
5961
}),
6062
)
@@ -123,12 +125,13 @@ func ResetTestContext(ctx *Context, t ginkgo.FullGinkgoTInterface) {
123125
tuikitIO.WithOutput(stdOut),
124126
tuikitIO.WithTheme(io.Theme("")),
125127
tuikitIO.WithMode(tuikitIO.Text),
126-
tuikitIO.WithExitFunc(func() {
128+
tuikitIO.WithExitFunc(func(msg string, args ...any) {
129+
msg = fmt.Sprintf(msg, args...)
127130
_, file, line, ok := runtime.Caller(3)
128131
if ok {
129-
t.Fatalf("logger exit called from %s:%d", file, line)
132+
t.Fatalf("logger exit called from %s:%d - %s", file, line, msg)
130133
} else {
131-
t.Fatalf("logger exit called")
134+
t.Fatalf("logger exit called - %s", msg)
132135
}
133136
}),
134137
)

0 commit comments

Comments
 (0)