Skip to content

Commit 6fe4d1c

Browse files
wxiaoguangwxiaoguang
authored
Remove duplicate "ResponseWriter.Status" method (#33346)
1 parent abe743d commit 6fe4d1c

File tree

10 files changed

+42
-53
lines changed

10 files changed

+42
-53
lines changed

‎routers/api/v1/repo/hook_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func TestTestHook(t *testing.T) {
2323
contexttest.LoadRepoCommit(t, ctx)
2424
contexttest.LoadUser(t, ctx, 2)
2525
TestHook(ctx)
26-
assert.EqualValues(t, http.StatusNoContent, ctx.Resp.Status())
26+
assert.EqualValues(t, http.StatusNoContent, ctx.Resp.WrittenStatus())
2727

2828
unittest.AssertExistsAndLoadBean(t, &webhook.HookTask{
2929
HookID: 1,

‎routers/api/v1/repo/repo_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func TestRepoEdit(t *testing.T) {
5858
web.SetForm(ctx, &opts)
5959
Edit(ctx)
6060

61-
assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
61+
assert.EqualValues(t, http.StatusOK, ctx.Resp.WrittenStatus())
6262
unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{
6363
ID: 1,
6464
}, unittest.Cond("name = ? AND is_archived = 1", *opts.Name))
@@ -78,7 +78,7 @@ func TestRepoEditNameChange(t *testing.T) {
7878

7979
web.SetForm(ctx, &opts)
8080
Edit(ctx)
81-
assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
81+
assert.EqualValues(t, http.StatusOK, ctx.Resp.WrittenStatus())
8282

8383
unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{
8484
ID: 1,

‎routers/web/repo/issue_label_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func TestInitializeLabels(t *testing.T) {
3838
contexttest.LoadRepo(t, ctx, 2)
3939
web.SetForm(ctx, &forms.InitializeLabelsForm{TemplateName: "Default"})
4040
InitializeLabels(ctx)
41-
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
41+
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.WrittenStatus())
4242
unittest.AssertExistsAndLoadBean(t, &issues_model.Label{
4343
RepoID: 2,
4444
Name: "enhancement",
@@ -84,7 +84,7 @@ func TestNewLabel(t *testing.T) {
8484
Color: "#abcdef",
8585
})
8686
NewLabel(ctx)
87-
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
87+
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.WrittenStatus())
8888
unittest.AssertExistsAndLoadBean(t, &issues_model.Label{
8989
Name: "newlabel",
9090
Color: "#abcdef",
@@ -104,7 +104,7 @@ func TestUpdateLabel(t *testing.T) {
104104
IsArchived: true,
105105
})
106106
UpdateLabel(ctx)
107-
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
107+
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.WrittenStatus())
108108
unittest.AssertExistsAndLoadBean(t, &issues_model.Label{
109109
ID: 2,
110110
Name: "newnameforlabel",
@@ -120,7 +120,7 @@ func TestDeleteLabel(t *testing.T) {
120120
contexttest.LoadRepo(t, ctx, 1)
121121
ctx.Req.Form.Set("id", "2")
122122
DeleteLabel(ctx)
123-
assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
123+
assert.EqualValues(t, http.StatusOK, ctx.Resp.WrittenStatus())
124124
unittest.AssertNotExistsBean(t, &issues_model.Label{ID: 2})
125125
unittest.AssertNotExistsBean(t, &issues_model.IssueLabel{LabelID: 2})
126126
assert.EqualValues(t, ctx.Tr("repo.issues.label_deletion_success"), ctx.Flash.SuccessMsg)
@@ -134,7 +134,7 @@ func TestUpdateIssueLabel_Clear(t *testing.T) {
134134
ctx.Req.Form.Set("issue_ids", "1,3")
135135
ctx.Req.Form.Set("action", "clear")
136136
UpdateIssueLabel(ctx)
137-
assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
137+
assert.EqualValues(t, http.StatusOK, ctx.Resp.WrittenStatus())
138138
unittest.AssertNotExistsBean(t, &issues_model.IssueLabel{IssueID: 1})
139139
unittest.AssertNotExistsBean(t, &issues_model.IssueLabel{IssueID: 3})
140140
unittest.CheckConsistencyFor(t, &issues_model.Label{})
@@ -160,7 +160,7 @@ func TestUpdateIssueLabel_Toggle(t *testing.T) {
160160
ctx.Req.Form.Set("action", testCase.Action)
161161
ctx.Req.Form.Set("id", strconv.Itoa(int(testCase.LabelID)))
162162
UpdateIssueLabel(ctx)
163-
assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
163+
assert.EqualValues(t, http.StatusOK, ctx.Resp.WrittenStatus())
164164
for _, issueID := range testCase.IssueIDs {
165165
if testCase.ExpectedAdd {
166166
unittest.AssertExistsAndLoadBean(t, &issues_model.IssueLabel{IssueID: issueID, LabelID: testCase.LabelID})

‎routers/web/repo/setting/settings_test.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func TestAddReadOnlyDeployKey(t *testing.T) {
5454
}
5555
web.SetForm(ctx, &addKeyForm)
5656
DeployKeysPost(ctx)
57-
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
57+
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.WrittenStatus())
5858

5959
unittest.AssertExistsAndLoadBean(t, &asymkey_model.DeployKey{
6060
Name: addKeyForm.Title,
@@ -84,7 +84,7 @@ func TestAddReadWriteOnlyDeployKey(t *testing.T) {
8484
}
8585
web.SetForm(ctx, &addKeyForm)
8686
DeployKeysPost(ctx)
87-
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
87+
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.WrittenStatus())
8888

8989
unittest.AssertExistsAndLoadBean(t, &asymkey_model.DeployKey{
9090
Name: addKeyForm.Title,
@@ -121,7 +121,7 @@ func TestCollaborationPost(t *testing.T) {
121121

122122
CollaborationPost(ctx)
123123

124-
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
124+
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.WrittenStatus())
125125

126126
exists, err := repo_model.IsCollaborator(ctx, re.ID, 4)
127127
assert.NoError(t, err)
@@ -147,7 +147,7 @@ func TestCollaborationPost_InactiveUser(t *testing.T) {
147147

148148
CollaborationPost(ctx)
149149

150-
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
150+
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.WrittenStatus())
151151
assert.NotEmpty(t, ctx.Flash.ErrorMsg)
152152
}
153153

@@ -179,7 +179,7 @@ func TestCollaborationPost_AddCollaboratorTwice(t *testing.T) {
179179

180180
CollaborationPost(ctx)
181181

182-
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
182+
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.WrittenStatus())
183183

184184
exists, err := repo_model.IsCollaborator(ctx, re.ID, 4)
185185
assert.NoError(t, err)
@@ -188,7 +188,7 @@ func TestCollaborationPost_AddCollaboratorTwice(t *testing.T) {
188188
// Try adding the same collaborator again
189189
CollaborationPost(ctx)
190190

191-
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
191+
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.WrittenStatus())
192192
assert.NotEmpty(t, ctx.Flash.ErrorMsg)
193193
}
194194

@@ -210,7 +210,7 @@ func TestCollaborationPost_NonExistentUser(t *testing.T) {
210210

211211
CollaborationPost(ctx)
212212

213-
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
213+
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.WrittenStatus())
214214
assert.NotEmpty(t, ctx.Flash.ErrorMsg)
215215
}
216216

@@ -250,7 +250,7 @@ func TestAddTeamPost(t *testing.T) {
250250
AddTeamPost(ctx)
251251

252252
assert.True(t, repo_service.HasRepository(db.DefaultContext, team, re.ID))
253-
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
253+
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.WrittenStatus())
254254
assert.Empty(t, ctx.Flash.ErrorMsg)
255255
}
256256

@@ -290,7 +290,7 @@ func TestAddTeamPost_NotAllowed(t *testing.T) {
290290
AddTeamPost(ctx)
291291

292292
assert.False(t, repo_service.HasRepository(db.DefaultContext, team, re.ID))
293-
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
293+
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.WrittenStatus())
294294
assert.NotEmpty(t, ctx.Flash.ErrorMsg)
295295
}
296296

@@ -331,7 +331,7 @@ func TestAddTeamPost_AddTeamTwice(t *testing.T) {
331331

332332
AddTeamPost(ctx)
333333
assert.True(t, repo_service.HasRepository(db.DefaultContext, team, re.ID))
334-
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
334+
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.WrittenStatus())
335335
assert.NotEmpty(t, ctx.Flash.ErrorMsg)
336336
}
337337

@@ -364,7 +364,7 @@ func TestAddTeamPost_NonExistentTeam(t *testing.T) {
364364
ctx.Repo = repo
365365

366366
AddTeamPost(ctx)
367-
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
367+
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.WrittenStatus())
368368
assert.NotEmpty(t, ctx.Flash.ErrorMsg)
369369
}
370370

‎routers/web/repo/wiki_test.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -82,15 +82,15 @@ func TestWiki(t *testing.T) {
8282
ctx.SetPathParam("*", "Home")
8383
contexttest.LoadRepo(t, ctx, 1)
8484
Wiki(ctx)
85-
assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
85+
assert.EqualValues(t, http.StatusOK, ctx.Resp.WrittenStatus())
8686
assert.EqualValues(t, "Home", ctx.Data["Title"])
8787
assertPagesMetas(t, []string{"Home", "Page With Image", "Page With Spaced Name", "Unescaped File"}, ctx.Data["Pages"])
8888

8989
ctx, _ = contexttest.MockContext(t, "user2/repo1/jpeg.jpg")
9090
ctx.SetPathParam("*", "jpeg.jpg")
9191
contexttest.LoadRepo(t, ctx, 1)
9292
Wiki(ctx)
93-
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
93+
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.WrittenStatus())
9494
assert.Equal(t, "/user2/repo1/wiki/raw/jpeg.jpg", ctx.Resp.Header().Get("Location"))
9595
}
9696

@@ -100,7 +100,7 @@ func TestWikiPages(t *testing.T) {
100100
ctx, _ := contexttest.MockContext(t, "user2/repo1/wiki/?action=_pages")
101101
contexttest.LoadRepo(t, ctx, 1)
102102
WikiPages(ctx)
103-
assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
103+
assert.EqualValues(t, http.StatusOK, ctx.Resp.WrittenStatus())
104104
assertPagesMetas(t, []string{"Home", "Page With Image", "Page With Spaced Name", "Unescaped File"}, ctx.Data["Pages"])
105105
}
106106

@@ -111,7 +111,7 @@ func TestNewWiki(t *testing.T) {
111111
contexttest.LoadUser(t, ctx, 2)
112112
contexttest.LoadRepo(t, ctx, 1)
113113
NewWiki(ctx)
114-
assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
114+
assert.EqualValues(t, http.StatusOK, ctx.Resp.WrittenStatus())
115115
assert.EqualValues(t, ctx.Tr("repo.wiki.new_page"), ctx.Data["Title"])
116116
}
117117

@@ -131,7 +131,7 @@ func TestNewWikiPost(t *testing.T) {
131131
Message: message,
132132
})
133133
NewWikiPost(ctx)
134-
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
134+
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.WrittenStatus())
135135
assertWikiExists(t, ctx.Repo.Repository, wiki_service.UserTitleToWebPath("", title))
136136
assert.Equal(t, content, wikiContent(t, ctx.Repo.Repository, wiki_service.UserTitleToWebPath("", title)))
137137
}
@@ -149,7 +149,7 @@ func TestNewWikiPost_ReservedName(t *testing.T) {
149149
Message: message,
150150
})
151151
NewWikiPost(ctx)
152-
assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
152+
assert.EqualValues(t, http.StatusOK, ctx.Resp.WrittenStatus())
153153
assert.EqualValues(t, ctx.Tr("repo.wiki.reserved_page", "_edit"), ctx.Flash.ErrorMsg)
154154
assertWikiNotExists(t, ctx.Repo.Repository, "_edit")
155155
}
@@ -162,7 +162,7 @@ func TestEditWiki(t *testing.T) {
162162
contexttest.LoadUser(t, ctx, 2)
163163
contexttest.LoadRepo(t, ctx, 1)
164164
EditWiki(ctx)
165-
assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
165+
assert.EqualValues(t, http.StatusOK, ctx.Resp.WrittenStatus())
166166
assert.EqualValues(t, "Home", ctx.Data["Title"])
167167
assert.Equal(t, wikiContent(t, ctx.Repo.Repository, "Home"), ctx.Data["content"])
168168

@@ -171,7 +171,7 @@ func TestEditWiki(t *testing.T) {
171171
contexttest.LoadUser(t, ctx, 2)
172172
contexttest.LoadRepo(t, ctx, 1)
173173
EditWiki(ctx)
174-
assert.EqualValues(t, http.StatusForbidden, ctx.Resp.Status())
174+
assert.EqualValues(t, http.StatusForbidden, ctx.Resp.WrittenStatus())
175175
}
176176

177177
func TestEditWikiPost(t *testing.T) {
@@ -190,7 +190,7 @@ func TestEditWikiPost(t *testing.T) {
190190
Message: message,
191191
})
192192
EditWikiPost(ctx)
193-
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
193+
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.WrittenStatus())
194194
assertWikiExists(t, ctx.Repo.Repository, wiki_service.UserTitleToWebPath("", title))
195195
assert.Equal(t, content, wikiContent(t, ctx.Repo.Repository, wiki_service.UserTitleToWebPath("", title)))
196196
if title != "Home" {
@@ -206,7 +206,7 @@ func TestDeleteWikiPagePost(t *testing.T) {
206206
contexttest.LoadUser(t, ctx, 2)
207207
contexttest.LoadRepo(t, ctx, 1)
208208
DeleteWikiPagePost(ctx)
209-
assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
209+
assert.EqualValues(t, http.StatusOK, ctx.Resp.WrittenStatus())
210210
assertWikiNotExists(t, ctx.Repo.Repository, "Home")
211211
}
212212

@@ -228,9 +228,9 @@ func TestWikiRaw(t *testing.T) {
228228
contexttest.LoadRepo(t, ctx, 1)
229229
WikiRaw(ctx)
230230
if filetype == "" {
231-
assert.EqualValues(t, http.StatusNotFound, ctx.Resp.Status(), "filepath: %s", filepath)
231+
assert.EqualValues(t, http.StatusNotFound, ctx.Resp.WrittenStatus(), "filepath: %s", filepath)
232232
} else {
233-
assert.EqualValues(t, http.StatusOK, ctx.Resp.Status(), "filepath: %s", filepath)
233+
assert.EqualValues(t, http.StatusOK, ctx.Resp.WrittenStatus(), "filepath: %s", filepath)
234234
assert.EqualValues(t, filetype, ctx.Resp.Header().Get("Content-Type"), "filepath: %s", filepath)
235235
}
236236
}

‎routers/web/user/home_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func TestArchivedIssues(t *testing.T) {
4545
Issues(ctx)
4646

4747
// Assert: One Issue (ID 30) from one Repo (ID 50) is retrieved, while nothing from archived Repo 51 is retrieved
48-
assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
48+
assert.EqualValues(t, http.StatusOK, ctx.Resp.WrittenStatus())
4949

5050
assert.Len(t, ctx.Data["Issues"], 1)
5151
}
@@ -58,7 +58,7 @@ func TestIssues(t *testing.T) {
5858
contexttest.LoadUser(t, ctx, 2)
5959
ctx.Req.Form.Set("state", "closed")
6060
Issues(ctx)
61-
assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
61+
assert.EqualValues(t, http.StatusOK, ctx.Resp.WrittenStatus())
6262

6363
assert.EqualValues(t, true, ctx.Data["IsShowClosed"])
6464
assert.Len(t, ctx.Data["Issues"], 1)
@@ -72,7 +72,7 @@ func TestPulls(t *testing.T) {
7272
contexttest.LoadUser(t, ctx, 2)
7373
ctx.Req.Form.Set("state", "open")
7474
Pulls(ctx)
75-
assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
75+
assert.EqualValues(t, http.StatusOK, ctx.Resp.WrittenStatus())
7676

7777
assert.Len(t, ctx.Data["Issues"], 5)
7878
}
@@ -87,7 +87,7 @@ func TestMilestones(t *testing.T) {
8787
ctx.Req.Form.Set("state", "closed")
8888
ctx.Req.Form.Set("sort", "furthestduedate")
8989
Milestones(ctx)
90-
assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
90+
assert.EqualValues(t, http.StatusOK, ctx.Resp.WrittenStatus())
9191
assert.EqualValues(t, map[int64]int64{1: 1}, ctx.Data["Counts"])
9292
assert.EqualValues(t, true, ctx.Data["IsShowClosed"])
9393
assert.EqualValues(t, "furthestduedate", ctx.Data["SortType"])
@@ -107,7 +107,7 @@ func TestMilestonesForSpecificRepo(t *testing.T) {
107107
ctx.Req.Form.Set("state", "closed")
108108
ctx.Req.Form.Set("sort", "furthestduedate")
109109
Milestones(ctx)
110-
assert.EqualValues(t, http.StatusOK, ctx.Resp.Status())
110+
assert.EqualValues(t, http.StatusOK, ctx.Resp.WrittenStatus())
111111
assert.EqualValues(t, map[int64]int64{1: 1}, ctx.Data["Counts"])
112112
assert.EqualValues(t, true, ctx.Data["IsShowClosed"])
113113
assert.EqualValues(t, "furthestduedate", ctx.Data["SortType"])

‎routers/web/user/setting/account_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ func TestChangePassword(t *testing.T) {
9595
AccountPost(ctx)
9696

9797
assert.Contains(t, ctx.Flash.ErrorMsg, req.Message)
98-
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.Status())
98+
assert.EqualValues(t, http.StatusSeeOther, ctx.Resp.WrittenStatus())
9999
})
100100
}
101101
}

‎services/context/access_log.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func (lr *accessLogRecorder) record(start time.Time, respWriter ResponseWriter,
8585
},
8686
RequestID: &requestID,
8787
}
88-
tmplData.ResponseWriter.Status = respWriter.Status()
88+
tmplData.ResponseWriter.Status = respWriter.WrittenStatus()
8989
tmplData.ResponseWriter.Size = respWriter.WrittenSize()
9090
err = lr.logTemplate.Execute(buf, tmplData)
9191
if err != nil {

‎services/context/access_log_test.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ func (t testAccessLoggerResponseWriterMock) WrittenStatus() int {
4848
return http.StatusOK
4949
}
5050

51-
func (t testAccessLoggerResponseWriterMock) Status() int {
52-
return t.WrittenStatus()
53-
}
54-
5551
func (t testAccessLoggerResponseWriterMock) WrittenSize() int {
5652
return 123123
5753
}

‎services/context/response.go‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,11 @@ import (
1111

1212
// ResponseWriter represents a response writer for HTTP
1313
type ResponseWriter interface {
14-
http.ResponseWriter
15-
http.Flusher
16-
web_types.ResponseStatusProvider
14+
http.ResponseWriter // provides Header/Write/WriteHeader
15+
http.Flusher // provides Flush
16+
web_types.ResponseStatusProvider // provides WrittenStatus
1717

1818
Before(fn func(ResponseWriter))
19-
Status() int
2019
WrittenSize() int
2120
}
2221

@@ -75,12 +74,6 @@ func (r *Response) Flush() {
7574
}
7675
}
7776

78-
// Status returns status code written
79-
// TODO: use WrittenStatus instead
80-
func (r *Response) Status() int {
81-
return r.status
82-
}
83-
8477
// WrittenStatus returned status code written
8578
func (r *Response) WrittenStatus() int {
8679
return r.status

0 commit comments

Comments
 (0)