Skip to content

Commit 93e8dfd

Browse files
committed
Fix test
1 parent fd7c953 commit 93e8dfd

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

tests/integration/pull_merge_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -586,6 +586,8 @@ func TestPullDontRetargetChildOnWrongRepo(t *testing.T) {
586586
elemChildPR := strings.Split(test.RedirectURL(respChildPR), "/")
587587
assert.EqualValues(t, "pulls", elemChildPR[3])
588588

589+
defer test.MockVariableValue(&setting.Repository.PullRequest.RetargetChildrenOnMerge, false)()
590+
589591
testPullMerge(t, session, elemBasePR[1], elemBasePR[2], elemBasePR[4], repo_model.MergeStyleMerge, true)
590592

591593
repo1 := unittest.AssertExistsAndLoadBean(t, &repo_model.Repository{OwnerName: "user1", Name: "repo1"})

0 commit comments

Comments
 (0)