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

Merged in feature/mark_default_branch (pull request #223)

Browse Source 
Feature mark default branch
This commit is contained in:
Rene Pfeuffer
2019-03-29 10:23:56 +00:00
parent 58d2a03498 ada8977175
commit eadad2e830
11 changed files with 205 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchRootResourceTest.java
View File

@@ -125,7 +125,7 @@ public class BranchRootResourceTest extends RepositoryTestBase {
@Test
public void shouldFindExistingBranch() throws Exception {
when(branchesCommandBuilder.getBranches()).thenReturn(new Branches(new Branch("master", "revision")));
when(branchesCommandBuilder.getBranches()).thenReturn(new Branches(Branch.normalBranch("master", "revision")));
MockHttpRequest request = MockHttpRequest.get(BRANCH_URL);
MockHttpResponse response = new MockHttpResponse();
@@ -153,7 +153,7 @@ public class BranchRootResourceTest extends RepositoryTestBase {
when(logCommandBuilder.setBranch(anyString())).thenReturn(logCommandBuilder);
when(logCommandBuilder.getChangesets()).thenReturn(changesetPagingResult);
Branches branches = mock(Branches.class);
List<Branch> branchList = Lists.newArrayList(new Branch("master",id));
List<Branch> branchList = Lists.newArrayList(Branch.normalBranch("master",id));
when(branches.getBranches()).thenReturn(branchList);
when(branchesCommandBuilder.getBranches()).thenReturn(branches);
MockHttpRequest request = MockHttpRequest.get(BRANCH_URL + "/changesets/");

2
scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchToBranchDtoMapperTest.java
View File

@@ -33,7 +33,7 @@ class BranchToBranchDtoMapperTest {
});
mapper.setRegistry(registry);
Branch branch = new Branch("master", "42");
Branch branch = Branch.normalBranch("master", "42");
BranchDto dto = mapper.map(branch, new NamespaceAndName("hitchhiker", "heart-of-gold"));
assertThat(dto.getLinks().getLinkBy("ka").get().getHref()).isEqualTo("http://hitchhiker/heart-of-gold/master");