Mirrors/gitea
0
0 Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-10-03 13:04:08 +02:00
Code Issues 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 authored and Lauris BH committed 2018-12-27 12:27:08 +02:00
1 parent 58bdff53cd
commit 4a685f8b87
14 files changed
+162 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

integrations/pull_merge_test.go
+13
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")