Fix test

Author: lunny

integrations/api_helper_for_declarative_test.go

@@ -277,23 +277,6 @@ func doAPIGetPullRequest(ctx APITestContext, owner, repo string, index int64) fu
 	}
 }
 
-func doAPIManuallyMergePullRequest(ctx APITestContext, owner, repo, commitID string, index int64) func(*testing.T) {
-	return func(t *testing.T) {
-		urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/merge",
-			owner, repo, index)
-		req := NewRequestWithJSON(t, http.MethodPost, urlStr, &forms.MergePullRequestForm{
-			Do:            string(models.MergeStyleManuallyMerged),
-			MergeCommitID: commitID,
-		})
-
-		if ctx.ExpectedCode != 0 {
-			ctx.MakeRequest(t, req, ctx.ExpectedCode)
-			return
-		}
-		ctx.MakeRequest(t, req, 200)
-	}
-}
-
 func doAPIMergePullRequest(ctx APITestContext, owner, repo string, index int64) func(*testing.T) {
 	return func(t *testing.T) {
 		urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/merge?token=%s",
@@ -333,18 +316,18 @@ func doAPIMergePullRequest(ctx APITestContext, owner, repo string, index int64)
 
 func doAPIManuallyMergePullRequest(ctx APITestContext, owner, repo, commitID string, index int64) func(*testing.T) {
 	return func(t *testing.T) {
-		urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/merge?token=%s",
-			owner, repo, index, ctx.Token)
+		urlStr := fmt.Sprintf("/api/v1/repos/%s/%s/pulls/%d/merge",
+			owner, repo, index)
 		req := NewRequestWithJSON(t, http.MethodPost, urlStr, &forms.MergePullRequestForm{
 			Do:            string(repo_model.MergeStyleManuallyMerged),
 			MergeCommitID: commitID,
 		})
 
 		if ctx.ExpectedCode != 0 {
-			ctx.Session.MakeRequest(t, req, ctx.ExpectedCode)
+			ctx.MakeRequest(t, req, ctx.ExpectedCode)
 			return
 		}
-		ctx.Session.MakeRequest(t, req, http.StatusOK)
+		ctx.MakeRequest(t, req, http.StatusOK)
 	}
 }
 

integrations/api_ui_helper_for_declarative_test.go

@@ -7,7 +7,6 @@ package integrations
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"net/http"
 	"testing"
 	"time"
@@ -42,43 +41,6 @@ func (ctx TestContext) CreateAPITestContext(t *testing.T) APITestContext {
 	return NewAPITestContext(t, ctx.Username, ctx.Reponame)
 }
 
-func doDeleteRepository(ctx TestContext) func(*testing.T) {
-	return func(t *testing.T) {
-		urlStr := fmt.Sprintf("/api/v1/repos/%s/%s", ctx.Username, ctx.Reponame)
-		apiCtx := ctx.CreateAPITestContext(t)
-		req := NewRequest(t, "DELETE", urlStr)
-		if ctx.ExpectedCode != 0 {
-			apiCtx.MakeRequest(t, req, ctx.ExpectedCode)
-			return
-		}
-		apiCtx.MakeRequest(t, req, http.StatusNoContent)
-	}
-}
-
-func doCreateUserKey(ctx TestContext, keyname, keyFile string, callback ...func(*testing.T, api.PublicKey)) func(*testing.T) {
-	return func(t *testing.T) {
-		urlStr := "/api/v1/user/keys"
-
-		dataPubKey, err := ioutil.ReadFile(keyFile + ".pub")
-		assert.NoError(t, err)
-		req := NewRequestWithJSON(t, "POST", urlStr, &api.CreateKeyOption{
-			Title: keyname,
-			Key:   string(dataPubKey),
-		})
-		apiCtx := ctx.CreateAPITestContext(t)
-		if ctx.ExpectedCode != 0 {
-			apiCtx.MakeRequest(t, req, ctx.ExpectedCode)
-			return
-		}
-		resp := apiCtx.MakeRequest(t, req, http.StatusCreated)
-		var publicKey api.PublicKey
-		DecodeJSON(t, resp, &publicKey)
-		if len(callback) > 0 {
-			callback[0](t, publicKey)
-		}
-	}
-}
-
 func doMergePullRequest(ctx TestContext, owner, repo string, index int64) func(*testing.T) {
 	return func(t *testing.T) {
 		urlStr := fmt.Sprintf("/api/ui/repos/%s/%s/pulls/%d/merge",

integrations/git_test.go

@@ -108,7 +108,7 @@ func testGit(t *testing.T, u *url.URL) {
 
 		// Setup key the user ssh key
 		withKeyFile(t, keyname, func(keyFile string) {
-			t.Run("CreateUserKey", doCreateUserKey(sshContext, "test-key", keyFile))
+			t.Run("CreateUserKey", doAPICreateUserKey(sshContext.CreateAPITestContext(t), "test-key", keyFile))
 
 			// Setup remote link
 			// TODO: get url from api
@@ -506,7 +506,7 @@ func doMergeFork(ctx, baseCtx TestContext, baseBranch, headBranch string) func(t
 		t.Run("EnsureDiffNoChange", doEnsureDiffNoChange(baseCtx, pr, diffHash, diffLength))
 
 		// Delete the head repository & make sure that doesn't break the PR page or change its diff
-		t.Run("DeleteHeadRepository", doDeleteRepository(ctx))
+		t.Run("DeleteHeadRepository", doAPIDeleteRepository(ctx.CreateAPITestContext(t)))
 		t.Run("EnsureCanSeePull", doEnsureCanSeePull(baseCtx, pr))
 		t.Run("EnsureDiffNoChange", doEnsureDiffNoChange(baseCtx, pr, diffHash, diffLength))
 	}