Commit 2d69145e authored by t.mucs's avatar t.mucs
Browse files

Add remove_source_branch_after_merge to Project and ProjectApi.updateProject and createProject

parent 4ab9c153
......@@ -1024,6 +1024,7 @@ public class ProjectApi extends AbstractApi implements Constants {
.withParam("build_git_strategy", project.getBuildGitStrategy())
.withParam("build_coverage_regex", project.getBuildCoverageRegex())
.withParam("suggestion_commit_message", project.getSuggestionCommitMessage())
.withParam("remove_source_branch_after_merge", project.getRemoveSourceBranchAfterMerge());
Namespace namespace = project.getNamespace();
if (namespace != null && namespace.getId() != null) {
......
......@@ -788,6 +788,11 @@ public class Project {
this.removeSourceBranchAfterMerge = removeSourceBranchAfterMerge;
}
public Project withRemoveSourceBranchAfterMerge(Boolean removeSourceBranchAfterMerge) {
this.removeSourceBranchAfterMerge = removeSourceBranchAfterMerge;
return this;
}
public Boolean getAutoDevopsEnabled() {
return autoDevopsEnabled;
}
......
......@@ -238,6 +238,7 @@ public class TestProjectApi extends AbstractIntegrationTest {
.withTagList(Arrays.asList("tag1", "tag2"))
.withMergeMethod(Project.MergeMethod.MERGE)
.withSuggestionCommitMessage("SuggestionCommitMessageOriginal")
.withRemoveSourceBranchAfterMerge(false);
Project newProject = gitLabApi.getProjectApi().createProject(project);
assertNotNull(newProject);
......@@ -251,6 +252,7 @@ public class TestProjectApi extends AbstractIntegrationTest {
assertTrue(Visibility.PUBLIC == newProject.getVisibility() || Boolean.TRUE == newProject.getPublic());
assertEquals(Project.MergeMethod.MERGE, newProject.getMergeMethod());
assertEquals(project.getSuggestionCommitMessage(), newProject.getSuggestionCommitMessage());
assertEquals(project.getRemoveSourceBranchAfterMerge(), newProject.getRemoveSourceBranchAfterMerge());
project = new Project()
.withId(newProject.getId())
......@@ -263,6 +265,7 @@ public class TestProjectApi extends AbstractIntegrationTest {
.withVisibility(Visibility.PRIVATE)
.withMergeMethod(Project.MergeMethod.REBASE_MERGE)
.withSuggestionCommitMessage("SuggestionCommitMessageUpdated")
.withRemoveSourceBranchAfterMerge(true);
Project updatedProject = gitLabApi.getProjectApi().updateProject(project);
assertNotNull(updatedProject);
......@@ -275,6 +278,7 @@ public class TestProjectApi extends AbstractIntegrationTest {
assertTrue(Visibility.PRIVATE == updatedProject.getVisibility() || Boolean.FALSE == updatedProject.getPublic());
assertEquals(Project.MergeMethod.REBASE_MERGE, updatedProject.getMergeMethod());
assertEquals(project.getSuggestionCommitMessage(), updatedProject.getSuggestionCommitMessage());
assertEquals(true, updatedProject.getRemoveSourceBranchAfterMerge());
}
@Test
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment