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

return null if commit was not merged into requested branch

Browse Source
This commit is contained in:
Sebastian Sdorra
2019-11-04 11:46:27 +01:00
parent d5bd83fafb
commit e4c8783c61
4 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitLogCommandTest.java
View File

@@ -208,8 +208,14 @@ public class GitLogCommandTest extends AbstractGitCommandTestBase
GitLogCommand command = createCommand();
Changeset c = command.getChangeset("435df2f061add3589cb3", request);
Assertions.assertThat(c.getBranches().contains("master")).isTrue();
Assertions.assertThat(c.getBranches().size()).isEqualTo(1);
Assertions.assertThat(c.getBranches()).containsOnly("master");
}
@Test
public void shouldNotReturnCommitFromDifferentBranch() {
when(request.getBranch()).thenReturn("master");
Changeset changeset = createCommand().getChangeset("3f76a12f08a6ba0dc988c68b7f0b2cd190efc3c4", request);
Assertions.assertThat(changeset).isNull();
}
@Test