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

rename trailer to contributor

Browse Source
This commit is contained in:
Sebastian Sdorra
2020-06-10 11:08:11 +02:00
parent 53fc01b0ba
commit acc3306450
20 changed files with 180 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/GitChangesetConverter.java
View File

@@ -182,7 +182,7 @@ public class GitChangesetConverter implements Closeable
Changeset changeset = new Changeset(id, date, author, message);
if (!committerIdent.equals(authorIndent)) {
changeset.addTrailer(new Trailer("Committed-by", createPersonFor(committerIdent)));
changeset.addContributor(new Contributor("Committed-by", createPersonFor(committerIdent)));
}
if (parentList != null)

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

@@ -25,7 +25,6 @@
package sonia.scm.repository.spi;
import com.google.common.io.Files;
import org.assertj.core.api.Assertions;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
@@ -273,7 +272,7 @@ public class GitLogCommandTest extends AbstractGitCommandTestBase
}
@Test
public void shouldAppendCommitterAsTrailer() {
public void shouldAppendCommitterAsContributor() {
LogCommandRequest request = new LogCommandRequest();
request.setStartChangeset("fcd0ef1831e4002ac43ea539f4094334c79ea9ec");
request.setEndChangeset("fcd0ef1831e4002ac43ea539f4094334c79ea9ec");
@@ -281,8 +280,8 @@ public class GitLogCommandTest extends AbstractGitCommandTestBase
ChangesetPagingResult changesets = createCommand().getChangesets(request);
Changeset changeset = changesets.getChangesets().get(0);
assertThat(changeset.getTrailers()).hasSize(1);
assertThat(changeset.getTrailers().iterator().next().getPerson())
assertThat(changeset.getContributors()).hasSize(1);
assertThat(changeset.getContributors().iterator().next().getPerson())
.isEqualTo(new Person("Sebastian Sdorra", "s.sdorra@ostfalia.de"));
}