Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 07:25:44 +01:00
Code Issues Packages Projects Releases Activity

check if mergeStrategy is supported for mergeCommand

Browse Source
This commit is contained in:
Eduard Heimbuch
2019-11-04 17:34:44 +01:00
parent 4b024c650c
commit 9df12bc35e
6 changed files with 41 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java
View File

@@ -15,7 +15,7 @@ import org.junit.Test;
import sonia.scm.NotFoundException;
import sonia.scm.repository.Person;
import sonia.scm.repository.api.MergeCommandResult;
import sonia.scm.repository.api.ScmMergeStrategy;
import sonia.scm.repository.api.MergeStrategy;
import sonia.scm.repository.util.WorkdirProvider;
import sonia.scm.user.User;
@@ -221,7 +221,7 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase {
request.setBranchToMerge("squash");
request.setTargetBranch("master");
request.setMessageTemplate("this is a squash");
request.setScmMergeStrategy(ScmMergeStrategy.SQUASH);
request.setMergeStrategy(MergeStrategy.SQUASH);
MergeCommandResult mergeCommandResult = command.merge(request);
@@ -244,7 +244,7 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase {
request.setBranchToMerge("squash");
request.setTargetBranch("master");
request.setMessageTemplate("squash three commits");
request.setScmMergeStrategy(ScmMergeStrategy.SQUASH);
request.setMergeStrategy(MergeStrategy.SQUASH);
Repository gitRepository = createContext().open();
MergeCommandResult mergeCommandResult = command.merge(request);