diff options
| author | Ethan Koenig <ethantkoenig@gmail.com> | 2017-12-03 14:46:01 -0800 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2017-12-04 00:46:01 +0200 |
| commit | e59adcde655aac0e8afd3249407c9a0a2b1b1d6b (patch) | |
| tree | a1b5859eadfe6ffdfc106012b7eab13a16459813 /integrations/pull_merge_test.go | |
| parent | 993b86628bdf62c0565c2a57a73561bb2d535b22 (diff) | |
| download | gitea-e59adcde655aac0e8afd3249407c9a0a2b1b1d6b.tar.gz gitea-e59adcde655aac0e8afd3249407c9a0a2b1b1d6b.zip | |
Use httptest in integration tests (#3080)
Diffstat (limited to 'integrations/pull_merge_test.go')
| -rw-r--r-- | integrations/pull_merge_test.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/integrations/pull_merge_test.go b/integrations/pull_merge_test.go index f3be6f2885..d6413be549 100644 --- a/integrations/pull_merge_test.go +++ b/integrations/pull_merge_test.go @@ -6,6 +6,7 @@ package integrations import ( "net/http" + "net/http/httptest" "path" "strings" "testing" @@ -13,7 +14,7 @@ import ( "github.com/stretchr/testify/assert" ) -func testPullMerge(t *testing.T, session *TestSession, user, repo, pullnum string) *TestResponse { +func testPullMerge(t *testing.T, session *TestSession, user, repo, pullnum string) *httptest.ResponseRecorder { req := NewRequest(t, "GET", path.Join(user, repo, "pulls", pullnum)) resp := session.MakeRequest(t, req, http.StatusOK) @@ -29,7 +30,7 @@ func testPullMerge(t *testing.T, session *TestSession, user, repo, pullnum strin return resp } -func testPullCleanUp(t *testing.T, session *TestSession, user, repo, pullnum string) *TestResponse { +func testPullCleanUp(t *testing.T, session *TestSession, user, repo, pullnum string) *httptest.ResponseRecorder { req := NewRequest(t, "GET", path.Join(user, repo, "pulls", pullnum)) resp := session.MakeRequest(t, req, http.StatusOK) |