Skip to content

Commit c399dc9

Browse files
chore: use stretchr/testify assertion helpers in tests
1 parent a2daf2f commit c399dc9

File tree

1 file changed

+18
-54
lines changed

1 file changed

+18
-54
lines changed

internal/debugmiddleware/debug_middleware_test.go

Lines changed: 18 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ import (
55
"log"
66
"net/http"
77
"net/http/httptest"
8-
"reflect"
98
"strings"
109
"testing"
10+
11+
"github.com/stretchr/testify/require"
1112
)
1213

1314
func TestDebugMiddleware(t *testing.T) {
@@ -37,20 +38,13 @@ func TestDebugMiddleware(t *testing.T) {
3738
nextMiddlewareRan = true
3839

3940
// The request sent down through middleware shouldn't be mutated.
40-
if req.Header.Get("User-Agent") != stainlessUserAgent {
41-
t.Error("expected original request to be unmodified")
42-
}
41+
require.Equal(t, stainlessUserAgent, req.Header.Get("User-Agent"))
4342

4443
return &http.Response{}, nil
4544
})
4645

47-
if !nextMiddlewareRan {
48-
t.Error("expected next middleware to have been run")
49-
}
50-
51-
if !strings.Contains(logBuf.String(), "User-Agent: "+stainlessUserAgent) {
52-
t.Error("expected logged request headers to include `User-Agent: Stainless`")
53-
}
46+
require.True(t, nextMiddlewareRan)
47+
require.Contains(t, logBuf.String(), "User-Agent: "+stainlessUserAgent)
5448
})
5549

5650
const secretToken = "secret-token"
@@ -68,20 +62,13 @@ func TestDebugMiddleware(t *testing.T) {
6862
nextMiddlewareRan = true
6963

7064
// The request sent down through middleware shouldn't be mutated.
71-
if req.Header.Get("Authorization") != secretToken {
72-
t.Error("expected original request to be unmodified")
73-
}
65+
require.Equal(t, secretToken, req.Header.Get("Authorization"))
7466

7567
return &http.Response{}, nil
7668
})
7769

78-
if !nextMiddlewareRan {
79-
t.Error("expected next middleware to have been run")
80-
}
81-
82-
if !strings.Contains(logBuf.String(), "Authorization: "+redactedPlaceholder) {
83-
t.Error("expected authorization header to be redacted")
84-
}
70+
require.True(t, nextMiddlewareRan)
71+
require.Contains(t, logBuf.String(), "Authorization: "+redactedPlaceholder)
8572
})
8673

8774
t.Run("RedactsOnlySecretInAuthorizationHeader", func(t *testing.T) {
@@ -99,13 +86,8 @@ func TestDebugMiddleware(t *testing.T) {
9986
return &http.Response{}, nil
10087
})
10188

102-
if !nextMiddlewareRan {
103-
t.Error("expected next middleware to have been run")
104-
}
105-
106-
if !strings.Contains(logBuf.String(), "Authorization: Bearer "+redactedPlaceholder) {
107-
t.Error("expected authorization header to be redacted")
108-
}
89+
require.True(t, nextMiddlewareRan)
90+
require.Contains(t, logBuf.String(), "Authorization: Bearer "+redactedPlaceholder)
10991
})
11092

11193
t.Run("RedactsMultipleAuthorizationHeaders", func(t *testing.T) {
@@ -122,16 +104,12 @@ func TestDebugMiddleware(t *testing.T) {
122104
nextMiddlewareRan = true
123105

124106
// The request sent down through middleware shouldn't be mutated.
125-
if !reflect.DeepEqual(req.Header.Values("Authorization"), []string{secretToken + "1", secretToken + "2"}) {
126-
t.Errorf("expected original request to be unmodified")
127-
}
107+
require.Equal(t, []string{secretToken + "1", secretToken + "2"}, req.Header.Values("Authorization"))
128108

129109
return &http.Response{}, nil
130110
})
131111

132-
if !nextMiddlewareRan {
133-
t.Error("expected next middleware to have been run")
134-
}
112+
require.True(t, nextMiddlewareRan)
135113

136114
if strings.Count(logBuf.String(), "Authorization: "+redactedPlaceholder) != 2 {
137115
t.Error("expected exactly two redacted placeholders in authorization headers")
@@ -155,20 +133,13 @@ func TestDebugMiddleware(t *testing.T) {
155133
nextMiddlewareRan = true
156134

157135
// The request sent down through middleware shouldn't be mutated.
158-
if req.Header.Get(customAPIKeyHeader) != secretToken {
159-
t.Error("expected original request to be unmodified")
160-
}
136+
require.Equal(t, secretToken, req.Header.Get(customAPIKeyHeader))
161137

162138
return &http.Response{}, nil
163139
})
164140

165-
if !nextMiddlewareRan {
166-
t.Error("expected next middleware to have been run")
167-
}
168-
169-
if !strings.Contains(logBuf.String(), customAPIKeyHeader+": "+redactedPlaceholder) {
170-
t.Errorf("expected %s header to be redacted", customAPIKeyHeader)
171-
}
141+
require.True(t, nextMiddlewareRan)
142+
require.Contains(t, logBuf.String(), customAPIKeyHeader+": "+redactedPlaceholder)
172143
})
173144

174145
t.Run("RedactsMultipleSensitiveHeaders", func(t *testing.T) {
@@ -187,19 +158,12 @@ func TestDebugMiddleware(t *testing.T) {
187158
nextMiddlewareRan = true
188159

189160
// The request sent down through middleware shouldn't be mutated.
190-
if !reflect.DeepEqual(req.Header.Values(customAPIKeyHeader), []string{secretToken + "1", secretToken + "2"}) {
191-
t.Error("expected original request to be unmodified")
192-
}
161+
require.Equal(t, []string{secretToken + "1", secretToken + "2"}, req.Header.Values(customAPIKeyHeader))
193162

194163
return &http.Response{}, nil
195164
})
196165

197-
if !nextMiddlewareRan {
198-
t.Error("expected next middleware to have been run")
199-
}
200-
201-
if strings.Count(logBuf.String(), customAPIKeyHeader+": "+redactedPlaceholder) != 2 {
202-
t.Errorf("expected %s header to be redacted", customAPIKeyHeader)
203-
}
166+
require.True(t, nextMiddlewareRan)
167+
require.Equal(t, 2, strings.Count(logBuf.String(), customAPIKeyHeader+": "+redactedPlaceholder))
204168
})
205169
}

0 commit comments

Comments
 (0)