improve test

models/fixtures/collaboration.yml

@@ -63,3 +63,9 @@
   repo_id: 32
   user_id: 10
   mode: 2 # write
+
+-
+  id: 12
+  repo_id: 10
+  user_id: 13
+  mode: 2 # write

services/pull/pull.go

@@ -49,10 +49,12 @@ func NewPullRequest(ctx context.Context, repo *repo_model.Repository, issue *iss
 	}
 
 	// user should be a collaborator or a member of the organization
-	if canCreate, err := repo_model.IsOwnerMemberCollaborator(ctx, repo, issue.Poster.ID); err != nil {
-		return err
-	} else if !canCreate {
-		return issues_model.ErrMustCollaborator
+	if !issue.Poster.IsAdmin {
+		if canCreate, err := repo_model.IsOwnerMemberCollaborator(ctx, repo, issue.Poster.ID); err != nil {
+			return err
+		} else if !canCreate {
+			return issues_model.ErrMustCollaborator
+		}
 	}
 
 	prCtx, cancel, err := createTemporaryRepoForPR(ctx, pr)

tests/integration/api_pull_test.go

@@ -123,21 +123,32 @@ func TestAPICreatePullSuccess(t *testing.T) {
 		Base:  "master",
 		Title: "create a failure pr",
 	}).AddTokenAuth(token)
-	// user should be a collaborator
+	MakeRequest(t, req, http.StatusCreated)
+	MakeRequest(t, req, http.StatusUnprocessableEntity) // second request should fail
+}
+
+func TestAPICreatePullCollaboratorSuccess(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+	repo10 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{ID: 10})
+	owner10 := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: repo10.OwnerID})
+
+	session := loginUser(t, "user2")
+	opts := &api.CreatePullRequestOption{
+		Head:  "user13:master",
+		Base:  "master",
+		Title: "create a collaborator pr",
+	}
+	token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeWriteRepository)
+	req := NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls", owner10.Name, repo10.Name), opts).AddTokenAuth(token)
 	MakeRequest(t, req, http.StatusForbidden)
 
-	// add owner11 to be a collaborator
+	// add user2 to be a collaborator
 	testCtx := NewAPITestContext(t, repo10.OwnerName, repo10.Name, auth_model.AccessTokenScopeWriteRepository)
-	t.Run("AddOwner11AsCollaborator", doAPIAddCollaborator(testCtx, owner11.Name, perm.AccessModeRead))
+	t.Run("AddUser2AsCollaborator", doAPIAddCollaborator(testCtx, "user2", perm.AccessModeRead))
 
 	// create again
-	req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls", owner10.Name, repo10.Name), &api.CreatePullRequestOption{
-		Head:  fmt.Sprintf("%s:master", owner11.Name),
-		Base:  "master",
-		Title: "create a failure pr",
-	}).AddTokenAuth(token)
+	req = NewRequestWithJSON(t, http.MethodPost, fmt.Sprintf("/api/v1/repos/%s/%s/pulls", owner10.Name, repo10.Name), opts).AddTokenAuth(token)
 	MakeRequest(t, req, http.StatusCreated)
-	MakeRequest(t, req, http.StatusUnprocessableEntity) // second request should fail
 }
 
 func TestAPICreatePullSameRepoSuccess(t *testing.T) {