Add integration test for pull-request merge (#1912)

This commit is contained in:
Mura Li 2017-06-15 19:20:39 +08:00 committed by Lunny Xiao
parent 13f0e1255a
commit 01322af2e8
4 changed files with 62 additions and 3 deletions

View file

@ -101,7 +101,7 @@ func TestCreateFileOnProtectedBranch(t *testing.T) {
assert.Contains(t, string(resp.Body), "Can not commit to protected branch 'master'.")
}
func testEditFile(t *testing.T, session *TestSession, user, repo, branch, filePath string) {
func testEditFile(t *testing.T, session *TestSession, user, repo, branch, filePath string) *TestResponse {
newContent := "Hello, World (Edited)\n"
@ -134,6 +134,8 @@ func testEditFile(t *testing.T, session *TestSession, user, repo, branch, filePa
resp = session.MakeRequest(t, req)
assert.EqualValues(t, http.StatusOK, resp.HeaderCode)
assert.EqualValues(t, newContent, string(resp.Body))
return resp
}
func TestEditFile(t *testing.T) {