From 9a3b8c26fbaad2026126c498e8704a5061d7a93d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Wed, 5 Dec 2018 16:01:34 +0100 Subject: [PATCH] Fix unit test --- .../sonia/scm/repository/spi/GitMergeCommandTest.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java index 1fca7814ed..2923d445ac 100644 --- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java +++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitMergeCommandTest.java @@ -19,7 +19,7 @@ import java.io.IOException; import static org.assertj.core.api.Assertions.assertThat; -@SubjectAware(configuration = "classpath:sonia/scm/configuration/shiro.ini") +@SubjectAware(configuration = "classpath:sonia/scm/configuration/shiro.ini", username = "admin", password = "secret") public class GitMergeCommandTest extends AbstractGitCommandTestBase { private static final String REALM = "AdminRealm"; @@ -111,11 +111,14 @@ public class GitMergeCommandTest extends AbstractGitCommandTestBase { } @Test - @SubjectAware(username = "admin", password = "secret") public void shouldTakeAuthorFromSubjectIfNotSet() throws IOException, GitAPIException { + SimplePrincipalCollection principals = new SimplePrincipalCollection(); + principals.add("admin", REALM); + principals.add( new User("dirk", "Dirk Gently", "dirk@holistic.det"), REALM); shiro.setSubject( new Subject.Builder() - .principals(new SimplePrincipalCollection(new User("dirk", "Dirk Gently", "dirk@holistic.det"), REALM)) + .principals(principals) + .authenticated(true) .buildSubject()); GitMergeCommand command = createCommand(); MergeCommandRequest request = new MergeCommandRequest();