Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-18 03:01:05 +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

4
scm-test/src/main/java/sonia/scm/util/MockUtil.java
View File

@@ -212,8 +212,8 @@ public final class MockUtil
{
SCMContextProvider provider = mock(SCMContextProvider.class);
when(provider.getBaseDirectory()).thenReturn(directory);
when(provider.resolve(any(Path.class))).then(ic -> {
lenient().when(provider.getBaseDirectory()).thenReturn(directory);
lenient().when(provider.resolve(any(Path.class))).then(ic -> {
Path p = ic.getArgument(0);
return directory.toPath().resolve(p);
});