Skip to content

Commit 1685464

Browse files
authored
chore: lint _examples directory (#3042)
1 parent 2bb32fe commit 1685464

File tree

3 files changed

+18
-16
lines changed

3 files changed

+18
-16
lines changed

‎.github/workflows/lint.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ jobs:
2525
uses: golangci/golangci-lint-action@v5.0.0
2626
with:
2727
version: latest
28-
# skip cache because of flaky behaviors
29-
skip-build-cache: true
30-
skip-pkg-cache: true
3128
args: '--timeout 5m'
29+
- name: golangci-lint examples
30+
uses: golangci/golangci-lint-action@v5.0.0
31+
with:
32+
version: latest
33+
args: '--timeout 5m'
34+
working-directory: _examples

‎_examples/fileupload/fileupload_test.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ func TestFileUpload(t *testing.T) {
3939
require.NotNil(t, file)
4040
require.NotNil(t, file.File)
4141
content, err := io.ReadAll(file.File)
42-
require.Nil(t, err)
43-
require.Equal(t, string(content), "test")
42+
require.NoError(t, err)
43+
require.Equal(t, "test", string(content))
4444

4545
return &model.File{
4646
ID: 1,
@@ -63,7 +63,7 @@ func TestFileUpload(t *testing.T) {
6363
}
6464

6565
err := gql.Post(mutation, &result, gqlclient.Var("file", aTxtFile), gqlclient.WithFiles())
66-
require.Nil(t, err)
66+
require.NoError(t, err)
6767
require.Equal(t, 1, result.SingleUpload.ID)
6868
require.Contains(t, result.SingleUpload.Name, "a.txt")
6969
require.Equal(t, "test", result.SingleUpload.Content)
@@ -72,12 +72,12 @@ func TestFileUpload(t *testing.T) {
7272

7373
t.Run("valid single file upload with payload", func(t *testing.T) {
7474
resolver.MutationResolver.SingleUploadWithPayload = func(ctx context.Context, req model.UploadFile) (*model.File, error) {
75-
require.Equal(t, req.ID, 1)
75+
require.Equal(t, 1, req.ID)
7676
require.NotNil(t, req.File)
7777
require.NotNil(t, req.File.File)
7878
content, err := io.ReadAll(req.File.File)
79-
require.Nil(t, err)
80-
require.Equal(t, string(content), "test")
79+
require.NoError(t, err)
80+
require.Equal(t, "test", string(content))
8181

8282
return &model.File{
8383
ID: 1,
@@ -100,7 +100,7 @@ func TestFileUpload(t *testing.T) {
100100
}
101101

102102
err := gql.Post(mutation, &result, gqlclient.Var("req", map[string]interface{}{"id": 1, "file": aTxtFile}), gqlclient.WithFiles())
103-
require.Nil(t, err)
103+
require.NoError(t, err)
104104
require.Equal(t, 1, result.SingleUploadWithPayload.ID)
105105
require.Contains(t, result.SingleUploadWithPayload.Name, "a.txt")
106106
require.Equal(t, "test", result.SingleUploadWithPayload.Content)
@@ -115,7 +115,7 @@ func TestFileUpload(t *testing.T) {
115115
for i := range files {
116116
require.NotNil(t, files[i].File)
117117
content, err := io.ReadAll(files[i].File)
118-
require.Nil(t, err)
118+
require.NoError(t, err)
119119
contents = append(contents, string(content))
120120
resp = append(resp, &model.File{
121121
ID: i + 1,
@@ -141,7 +141,7 @@ func TestFileUpload(t *testing.T) {
141141
}
142142

143143
err := gql.Post(mutation, &result, gqlclient.Var("files", []*os.File{a1TxtFile, b1TxtFile}), gqlclient.WithFiles())
144-
require.Nil(t, err)
144+
require.NoError(t, err)
145145
require.Equal(t, 1, result.MultipleUpload[0].ID)
146146
require.Equal(t, 2, result.MultipleUpload[1].ID)
147147
for _, mu := range result.MultipleUpload {
@@ -165,7 +165,7 @@ func TestFileUpload(t *testing.T) {
165165
require.NotNil(t, req[i].File)
166166
require.NotNil(t, req[i].File.File)
167167
content, err := io.ReadAll(req[i].File.File)
168-
require.Nil(t, err)
168+
require.NoError(t, err)
169169
ids = append(ids, req[i].ID)
170170
contents = append(contents, string(content))
171171
resp = append(resp, &model.File{
@@ -196,7 +196,7 @@ func TestFileUpload(t *testing.T) {
196196
{"id": 1, "file": a1TxtFile},
197197
{"id": 2, "file": b1TxtFile},
198198
}), gqlclient.WithFiles())
199-
require.Nil(t, err)
199+
require.NoError(t, err)
200200
require.Equal(t, 1, result.MultipleUploadWithPayload[0].ID)
201201
require.Equal(t, 2, result.MultipleUploadWithPayload[1].ID)
202202
for _, mu := range result.MultipleUploadWithPayload {
@@ -271,7 +271,7 @@ func TestFileUpload(t *testing.T) {
271271
{"id": 1, "file": a1TxtFile},
272272
{"id": 2, "file": a1TxtFile},
273273
}), gqlclient.WithFiles())
274-
require.Nil(t, err)
274+
require.NoError(t, err)
275275
require.Equal(t, 1, result.MultipleUploadWithPayload[0].ID)
276276
require.Contains(t, result.MultipleUploadWithPayload[0].Name, "a.txt")
277277
require.Equal(t, "test1", result.MultipleUploadWithPayload[0].Content)

‎_examples/starwars/benchmarks_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,5 @@ func BenchmarkSimpleQueryNoArgs(b *testing.B) {
2929
if rec.Body.String() != `{"data":{"search":[{"starships":[{"name":"X-Wing"},{"name":"Imperial shuttle"}]}]}}` {
3030
b.Fatalf("Unexpected response: %s", rec.Body.String())
3131
}
32-
3332
}
3433
}

0 commit comments

Comments
 (0)