domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Add rebase with merge commit merge style (#3844) (#4052)

Browse source 
Signed-off-by: Julian Tölle <julian.toelle97@gmail.com>
This commit is contained in:
Julian 2018-12-27 11:27:08 +01:00 • committed by Lauris BH
parent 58bdff53cd
commit 4a685f8b87
14 changed files with 162 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
integrations/pull_merge_test.go
View file

@ -77,6 +77,19 @@ func TestPullRebase(t *testing.T) {
testPullMerge(t, session, elem[1], elem[2], elem[4], models.MergeStyleRebase)
}
func TestPullRebaseMerge(t *testing.T) {
prepareTestEnv(t)
session := loginUser(t, "user1")
testRepoFork(t, session, "user2", "repo1", "user1", "repo1")
testEditFile(t, session, "user1", "repo1", "master", "README.md", "Hello, World (Edited)\n")
resp := testPullCreate(t, session, "user1", "repo1", "master", "This is a pull title")
elem := strings.Split(test.RedirectURL(resp), "/")
assert.EqualValues(t, "pulls", elem[3])
testPullMerge(t, session, elem[1], elem[2], elem[4], models.MergeStyleRebaseMerge)
}
func TestPullSquash(t *testing.T) {
prepareTestEnv(t)
session := loginUser(t, "user1")