From 4a685f8b872a3d4c101c5e8165fa99e696c8fb45 Mon Sep 17 00:00:00 2001 From: Julian Date: Thu, 27 Dec 2018 11:27:08 +0100 Subject: Add rebase with merge commit merge style (#3844) (#4052) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julian Tölle --- integrations/pull_merge_test.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'integrations/pull_merge_test.go') 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") -- cgit v1.2.3