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

Include dry run in merge command

Browse Source
This commit is contained in:
René Pfeuffer
2018-11-07 08:32:27 +01:00
parent 23783d43f6
commit fc3e08d612
12 changed files with 76 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,22 @@
package sonia.scm.repository.spi;
import org.junit.Assert;
import org.junit.Test;
public class GitMergeCommandTest extends AbstractGitCommandTestBase {
@Test
public void shouldDetectNotMergeableBranches() {
GitMergeCommand command = createCommand();
MergeCommandRequest request = new MergeCommandRequest();
request.setBranchToMerge("test-branch");
request.setTargetBranch("master");
boolean mergeable = command.dryRun(request).isMergeable();
Assert.assertFalse(mergeable);
}
private GitMergeCommand createCommand() {
return new GitMergeCommand(createContext(), repository, null);
}
}

23
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeDryRunCommandTest.java
View File

@@ -1,23 +0,0 @@
package sonia.scm.repository.spi;
import org.junit.Assert;
import org.junit.Test;
public class GitMergeDryRunCommandTest extends AbstractGitCommandTestBase {
@Test
public void shouldDetectNotMergeableBranches() {
GitMergeDryRunCommand command = createCommand();
MergeDryRunCommandRequest request = new MergeDryRunCommandRequest();
request.setBranchToMerge("test-branch");
request.setTargetBranch("master");
boolean mergeable = command.isMergeable(request);
Assert.assertFalse(mergeable);
}
private GitMergeDryRunCommand createCommand()
{
return new GitMergeDryRunCommand(createContext(), repository);
}
}