Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-09 23:15:43 +01:00
Code Issues Packages Projects Releases Activity

Specify not mergeable files in merge result

Browse Source
This commit is contained in:
René Pfeuffer
2018-11-07 13:34:35 +01:00
parent 26d5e6e062
commit 2d04e6c2f0
3 changed files with 41 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,9 +1,11 @@
package sonia.scm.repository.spi;
import org.junit.Assert;
import org.assertj.core.api.Assertions;
import org.junit.Test;
import sonia.scm.repository.api.MergeCommandResult;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
public class GitMergeCommandTest extends AbstractGitCommandTestBase {
@@ -38,9 +40,9 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase {
request.setTargetBranch("master");
request.setBranchToMerge("mergeable");
boolean mergeable = command.merge(request).isSuccess();
MergeCommandResult mergeCommandResult = command.merge(request);
assertThat(mergeable).isTrue();
assertThat(mergeCommandResult.isSuccess()).isTrue();
}
@Test
@@ -50,9 +52,10 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase {
request.setBranchToMerge("test-branch");
request.setTargetBranch("master");
boolean mergeable = command.merge(request).isSuccess();
MergeCommandResult mergeCommandResult = command.merge(request);
assertThat(mergeable).isFalse();
assertThat(mergeCommandResult.isSuccess()).isFalse();
assertThat(mergeCommandResult.getFilesWithConflict()).containsExactly("a.txt");
}
private GitMergeCommand createCommand() {