|
|
@@ -351,6 +351,17 @@ func doBranchProtectPRMerge(baseCtx *APITestContext, dstPath string) func(t *tes |
|
|
|
pr, err = doAPICreatePullRequest(ctx, baseCtx.Username, baseCtx.Reponame, "protected", "unprotected")(t) |
|
|
|
assert.NoError(t, err) |
|
|
|
}) |
|
|
|
t.Run("GenerateCommit", func(t *testing.T) { |
|
|
|
_, err := generateCommitWithNewData(littleSize, dstPath, "user2@example.com", "User Two", "branch-data-file-") |
|
|
|
assert.NoError(t, err) |
|
|
|
}) |
|
|
|
t.Run("PushToUnprotectedBranch", doGitPushTestRepository(dstPath, "origin", "protected:unprotected-2")) |
|
|
|
var pr2 api.PullRequest |
|
|
|
t.Run("CreatePullRequest", func(t *testing.T) { |
|
|
|
pr2, err = doAPICreatePullRequest(ctx, baseCtx.Username, baseCtx.Reponame, "unprotected", "unprotected-2")(t) |
|
|
|
assert.NoError(t, err) |
|
|
|
}) |
|
|
|
t.Run("MergePR2", doAPIMergePullRequest(ctx, baseCtx.Username, baseCtx.Reponame, pr2.Index)) |
|
|
|
t.Run("MergePR", doAPIMergePullRequest(ctx, baseCtx.Username, baseCtx.Reponame, pr.Index)) |
|
|
|
t.Run("PullProtected", doGitPull(dstPath, "origin", "protected")) |
|
|
|
t.Run("ProtectProtectedBranchWhitelist", doProtectBranch(ctx, "protected", baseCtx.Username)) |