Skip to content

Commit b3dc42f

Browse files
committed
fix test
1 parent 177845d commit b3dc42f

File tree

1 file changed

+29
-19
lines changed

1 file changed

+29
-19
lines changed

modules/web/route_test.go

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"bytes"
88
"net/http"
99
"net/http/httptest"
10+
"strconv"
1011
"testing"
1112

1213
chi "github.com/go-chi/chi/v5"
@@ -39,7 +40,7 @@ func TestRoute2(t *testing.T) {
3940
recorder := httptest.NewRecorder()
4041
recorder.Body = buff
4142

42-
var route int
43+
hit := -1
4344

4445
r := NewRoute()
4546
r.Group("/{username}/{reponame}", func() {
@@ -51,7 +52,7 @@ func TestRoute2(t *testing.T) {
5152
assert.EqualValues(t, "gitea", reponame)
5253
tp := chi.URLParam(req, "type")
5354
assert.EqualValues(t, "issues", tp)
54-
route = 0
55+
hit = 0
5556
})
5657

5758
r.Get("/{type:issues|pulls}/{index}", func(resp http.ResponseWriter, req *http.Request) {
@@ -63,10 +64,13 @@ func TestRoute2(t *testing.T) {
6364
assert.EqualValues(t, "issues", tp)
6465
index := chi.URLParam(req, "index")
6566
assert.EqualValues(t, "1", index)
66-
route = 1
67+
hit = 1
6768
})
6869
}, func(resp http.ResponseWriter, req *http.Request) {
69-
resp.WriteHeader(http.StatusOK)
70+
if stop, err := strconv.Atoi(req.FormValue("stop")); err == nil {
71+
hit = stop
72+
resp.WriteHeader(http.StatusOK)
73+
}
7074
})
7175

7276
r.Group("/issues/{index}", func() {
@@ -77,7 +81,7 @@ func TestRoute2(t *testing.T) {
7781
assert.EqualValues(t, "gitea", reponame)
7882
index := chi.URLParam(req, "index")
7983
assert.EqualValues(t, "1", index)
80-
route = 2
84+
hit = 2
8185
})
8286
})
8387
})
@@ -86,27 +90,33 @@ func TestRoute2(t *testing.T) {
8690
assert.NoError(t, err)
8791
r.ServeHTTP(recorder, req)
8892
assert.EqualValues(t, http.StatusOK, recorder.Code)
89-
assert.EqualValues(t, 0, route)
93+
assert.EqualValues(t, 0, hit)
9094

9195
req, err = http.NewRequest("GET", "http://localhost:8000/gitea/gitea/issues/1", nil)
9296
assert.NoError(t, err)
9397
r.ServeHTTP(recorder, req)
9498
assert.EqualValues(t, http.StatusOK, recorder.Code)
95-
assert.EqualValues(t, 1, route)
99+
assert.EqualValues(t, 1, hit)
100+
101+
req, err = http.NewRequest("GET", "http://localhost:8000/gitea/gitea/issues/1?stop=100", nil)
102+
assert.NoError(t, err)
103+
r.ServeHTTP(recorder, req)
104+
assert.EqualValues(t, http.StatusOK, recorder.Code)
105+
assert.EqualValues(t, 100, hit)
96106

97107
req, err = http.NewRequest("GET", "http://localhost:8000/gitea/gitea/issues/1/view", nil)
98108
assert.NoError(t, err)
99109
r.ServeHTTP(recorder, req)
100110
assert.EqualValues(t, http.StatusOK, recorder.Code)
101-
assert.EqualValues(t, 2, route)
111+
assert.EqualValues(t, 2, hit)
102112
}
103113

104114
func TestRoute3(t *testing.T) {
105115
buff := bytes.NewBufferString("")
106116
recorder := httptest.NewRecorder()
107117
recorder.Body = buff
108118

109-
var route int
119+
hit := -1
110120

111121
m := NewRoute()
112122
r := NewRoute()
@@ -116,20 +126,20 @@ func TestRoute3(t *testing.T) {
116126
m.Group("/{username}/{reponame}", func() {
117127
m.Group("/branch_protections", func() {
118128
m.Get("", func(resp http.ResponseWriter, req *http.Request) {
119-
route = 0
129+
hit = 0
120130
})
121131
m.Post("", func(resp http.ResponseWriter, req *http.Request) {
122-
route = 1
132+
hit = 1
123133
})
124134
m.Group("/{name}", func() {
125135
m.Get("", func(resp http.ResponseWriter, req *http.Request) {
126-
route = 2
136+
hit = 2
127137
})
128138
m.Patch("", func(resp http.ResponseWriter, req *http.Request) {
129-
route = 3
139+
hit = 3
130140
})
131141
m.Delete("", func(resp http.ResponseWriter, req *http.Request) {
132-
route = 4
142+
hit = 4
133143
})
134144
})
135145
})
@@ -140,29 +150,29 @@ func TestRoute3(t *testing.T) {
140150
assert.NoError(t, err)
141151
r.ServeHTTP(recorder, req)
142152
assert.EqualValues(t, http.StatusOK, recorder.Code)
143-
assert.EqualValues(t, 0, route)
153+
assert.EqualValues(t, 0, hit)
144154

145155
req, err = http.NewRequest("POST", "http://localhost:8000/api/v1/repos/gitea/gitea/branch_protections", nil)
146156
assert.NoError(t, err)
147157
r.ServeHTTP(recorder, req)
148158
assert.EqualValues(t, http.StatusOK, recorder.Code, http.StatusOK)
149-
assert.EqualValues(t, 1, route)
159+
assert.EqualValues(t, 1, hit)
150160

151161
req, err = http.NewRequest("GET", "http://localhost:8000/api/v1/repos/gitea/gitea/branch_protections/master", nil)
152162
assert.NoError(t, err)
153163
r.ServeHTTP(recorder, req)
154164
assert.EqualValues(t, http.StatusOK, recorder.Code)
155-
assert.EqualValues(t, 2, route)
165+
assert.EqualValues(t, 2, hit)
156166

157167
req, err = http.NewRequest("PATCH", "http://localhost:8000/api/v1/repos/gitea/gitea/branch_protections/master", nil)
158168
assert.NoError(t, err)
159169
r.ServeHTTP(recorder, req)
160170
assert.EqualValues(t, http.StatusOK, recorder.Code)
161-
assert.EqualValues(t, 3, route)
171+
assert.EqualValues(t, 3, hit)
162172

163173
req, err = http.NewRequest("DELETE", "http://localhost:8000/api/v1/repos/gitea/gitea/branch_protections/master", nil)
164174
assert.NoError(t, err)
165175
r.ServeHTTP(recorder, req)
166176
assert.EqualValues(t, http.StatusOK, recorder.Code)
167-
assert.EqualValues(t, 4, route)
177+
assert.EqualValues(t, 4, hit)
168178
}

0 commit comments

Comments
 (0)