Skip to content

Commit da3479c

Browse files
andrasbacsaiandrasbacsai
committed
test: replace assert.NoError with require.NoError across test files
Aligns remaining test files with the pattern established in 6e80c95. Using require halts the test immediately on fatal errors instead of continuing with invalid state.
1 parent 6e80c95 commit da3479c

7 files changed

Lines changed: 21 additions & 17 deletions

File tree

‎cmd/firewall/allow_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ func TestEmitAllowRevoke_CarriesNonDefaultNamespace(t *testing.T) {
130130
rootCmdFor(inner)
131131

132132
err := emitAllowRevoke(context.Background(), inner, parent, local, fr, false)
133-
assert.NoError(t, err)
133+
require.NoError(t, err)
134134
var post string
135135
for _, c := range fr.calls {
136136
if strings.Contains(c, "-X POST") {
@@ -214,7 +214,7 @@ func TestEmitAllowRevoke_FetchesTokenPerHostWhenOverrideAbsent(t *testing.T) {
214214
rootCmdFor(inner)
215215

216216
err := emitAllowRevoke(context.Background(), inner, parent, local, fr, false)
217-
assert.NoError(t, err)
217+
require.NoError(t, err)
218218
var post string
219219
for _, c := range fr.calls {
220220
if strings.Contains(c, "-X POST") && strings.Contains(c, "/api/v1/firewall/allow") {

‎cmd/firewall/containers_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func TestEmitContainers_RunsAndFormatsTable(t *testing.T) {
2525
rootCmdFor(inner)
2626

2727
err := emitContainers(context.Background(), inner, parent, fr)
28-
assert.NoError(t, err)
28+
require.NoError(t, err)
2929
// Discovery command was issued, targeting the default-namespace bridge.
3030
assert.Len(t, fr.calls, 1)
3131
assert.Contains(t, fr.calls[0], "podman ps")
@@ -44,7 +44,7 @@ func TestEmitContainers_EmptyOutput(t *testing.T) {
4444
rootCmdFor(inner)
4545

4646
err := emitContainers(context.Background(), inner, parent, fr)
47-
assert.NoError(t, err)
47+
require.NoError(t, err)
4848
}
4949

5050
// TestEmitContainers_AllNamespaces_FansOutAcrossNetworks verifies that with

‎cmd/firewall/list_test.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77

88
"github.com/spf13/cobra"
99
"github.com/stretchr/testify/assert"
10+
"github.com/stretchr/testify/require"
1011
)
1112

1213
func TestEmitList_CallsCooldGet(t *testing.T) {
@@ -18,7 +19,7 @@ func TestEmitList_CallsCooldGet(t *testing.T) {
1819
rootCmdFor(inner)
1920

2021
err := emitList(context.Background(), inner, parent, fr)
21-
assert.NoError(t, err)
22+
require.NoError(t, err)
2223
assert.Len(t, fr.calls, 1)
2324
assert.Contains(t, fr.calls[0], "curl")
2425
assert.Contains(t, fr.calls[0], "/api/v1/firewall/allow")
@@ -32,7 +33,7 @@ func TestEmitList_EmptyCoold(t *testing.T) {
3233
rootCmdFor(inner)
3334

3435
err := emitList(context.Background(), inner, parent, fr)
35-
assert.NoError(t, err)
36+
require.NoError(t, err)
3637
}
3738

3839
func TestEmitList_FetchesPerHostTokenWhenOverrideAbsent(t *testing.T) {
@@ -49,7 +50,7 @@ func TestEmitList_FetchesPerHostTokenWhenOverrideAbsent(t *testing.T) {
4950
rootCmdFor(inner)
5051

5152
err := emitList(context.Background(), inner, parent, fr)
52-
assert.NoError(t, err)
53+
require.NoError(t, err)
5354
var ranTokenFetch, ranGet bool
5455
for _, c := range fr.calls {
5556
if strings.Contains(c, "cat /etc/coolify/api-token") {

‎cmd/firewall/resolve_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func TestResolveEndpoint_ByRawIP(t *testing.T) {
5252

5353
func TestResolveEndpoint_UnknownRawIP_Synthetic(t *testing.T) {
5454
c, err := resolveEndpoint("10.99.99.99", cs())
55-
assert.NoError(t, err)
55+
require.NoError(t, err)
5656
assert.Empty(t, c.Host)
5757
assert.Equal(t, "10.99.99.99", c.IP.String())
5858
}

‎cmd/init/plan_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"testing"
55

66
"github.com/stretchr/testify/assert"
7+
"github.com/stretchr/testify/require"
78

89
"github.com/coollabsio/coolify-cli/cmd/common"
910
)
@@ -36,7 +37,7 @@ func TestValidatePlanFlags(t *testing.T) {
3637
Namespaces: []string{common.DefaultNamespace},
3738
},
3839
})
39-
assert.NoError(t, err)
40+
require.NoError(t, err)
4041
})
4142

4243
t.Run("invalid namespace", func(t *testing.T) {

‎internal/firewall/coold_client_test.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"testing"
99

1010
"github.com/stretchr/testify/assert"
11+
"github.com/stretchr/testify/require"
1112

1213
"github.com/coollabsio/coolify-cli/internal/ssh"
1314
)
@@ -84,7 +85,7 @@ func TestCooldApply_SendsJSONPayload(t *testing.T) {
8485
Proto: "tcp", Port: 80,
8586
}
8687
err := CooldApply(context.Background(), fr, "h1", "root", 22, 8443, "wg0", "t", r)
87-
assert.NoError(t, err)
88+
require.NoError(t, err)
8889
assert.Len(t, fr.calls, 1)
8990
assert.Contains(t, fr.calls[0], `"src":"10.0.0.1"`)
9091
assert.Contains(t, fr.calls[0], `"dst":"10.0.0.2"`)
@@ -98,7 +99,7 @@ func TestCooldApply_OmitsProtoWhenEmpty(t *testing.T) {
9899
Src: net.ParseIP("10.0.0.1"), Dst: net.ParseIP("10.0.0.2"),
99100
}
100101
err := CooldApply(context.Background(), fr, "h1", "root", 22, 8443, "wg0", "t", r)
101-
assert.NoError(t, err)
102+
require.NoError(t, err)
102103
// omitempty drops zero port and empty proto — avoids tripping coold's
103104
// "port requires proto" validation.
104105
assert.NotContains(t, fr.calls[0], `"proto"`)
@@ -120,7 +121,7 @@ func TestCooldList_ParsesJSON(t *testing.T) {
120121
]`,
121122
}}
122123
rules, err := CooldList(context.Background(), fr, "h1", "root", 22, 8443, "wg0", "t", "")
123-
assert.NoError(t, err)
124+
require.NoError(t, err)
124125
assert.Len(t, rules, 2)
125126
assert.Equal(t, "h1", rules[0].Host)
126127
assert.Equal(t, "cid:abc123def456", rules[0].Comment)
@@ -135,7 +136,7 @@ func TestCooldList_ParsesJSON(t *testing.T) {
135136
func TestCooldList_EmptyBody(t *testing.T) {
136137
fr := &fakeCooldRunner{}
137138
rules, err := CooldList(context.Background(), fr, "h1", "root", 22, 8443, "wg0", "t", "")
138-
assert.NoError(t, err)
139+
require.NoError(t, err)
139140
assert.Empty(t, rules)
140141
}
141142

@@ -159,7 +160,7 @@ func TestFetchCooldToken_ReadsFile(t *testing.T) {
159160
"/etc/coolify/api-token": "deadbeefcafe\n",
160161
}}
161162
tok, err := FetchCooldToken(context.Background(), fr, "h1", "root", 22)
162-
assert.NoError(t, err)
163+
require.NoError(t, err)
163164
assert.Equal(t, "deadbeefcafe", tok)
164165
}
165166

‎internal/firewall/discover_test.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"testing"
88

99
"github.com/stretchr/testify/assert"
10+
"github.com/stretchr/testify/require"
1011
)
1112

1213
func TestParseDiscoverLine(t *testing.T) {
@@ -66,7 +67,7 @@ func TestDiscoverContainers(t *testing.T) {
6667
}}
6768
got, err := DiscoverContainers(context.Background(), r, "h1", "root", 22,
6869
"default", "coolify-default-mesh")
69-
assert.NoError(t, err)
70+
require.NoError(t, err)
7071
assert.Len(t, got, 2)
7172
assert.Equal(t, "api", got[0].Name) // sorted by name
7273
assert.Equal(t, "web", got[1].Name)
@@ -79,7 +80,7 @@ func TestDiscoverContainers_EmptyOutput(t *testing.T) {
7980
r := &fakeRunner{responses: map[string]string{}}
8081
got, err := DiscoverContainers(context.Background(), r, "h1", "root", 22,
8182
"default", "coolify-default-mesh")
82-
assert.NoError(t, err)
83+
require.NoError(t, err)
8384
assert.Empty(t, got)
8485
}
8586

@@ -89,7 +90,7 @@ func TestDiscoverContainers_BadLinesSkipped(t *testing.T) {
8990
}}
9091
got, err := DiscoverContainers(context.Background(), r, "h1", "root", 22,
9192
"default", "coolify-default-mesh")
92-
assert.NoError(t, err)
93+
require.NoError(t, err)
9394
assert.Len(t, got, 1)
9495
assert.Equal(t, "web", got[0].Name)
9596
}

0 commit comments

Comments
 (0)