diff options
| author | Julian <julian.toelle97@gmail.com> | 2018-12-27 11:27:08 +0100 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2018-12-27 12:27:08 +0200 |
| commit | 4a685f8b872a3d4c101c5e8165fa99e696c8fb45 (patch) | |
| tree | 7ad36ee9bf87cec61ee0967a50037d9331d2ab58 /integrations/pull_merge_test.go | |
| parent | 58bdff53cd98e33791f91584d02887864aabc5c4 (diff) | |
| download | gitea-4a685f8b872a3d4c101c5e8165fa99e696c8fb45.tar.gz gitea-4a685f8b872a3d4c101c5e8165fa99e696c8fb45.zip | |
Add rebase with merge commit merge style (#3844) (#4052)
Signed-off-by: Julian Tölle <julian.toelle97@gmail.com>
Diffstat (limited to 'integrations/pull_merge_test.go')
| -rw-r--r-- | integrations/pull_merge_test.go | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/integrations/pull_merge_test.go b/integrations/pull_merge_test.go index b375a55f53..f466515eb4 100644 --- a/integrations/pull_merge_test.go +++ b/integrations/pull_merge_test.go @@ -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") |