Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[FIXED JENKINS-9160] get user from user id instead of full name.
  • Loading branch information
ssogabe committed Sep 5, 2011
1 parent 369a0e2 commit 431bf01
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 3 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>1.399</version>
<version>1.428</version>
</parent>

<artifactId>email-ext</artifactId>
Expand Down
Expand Up @@ -344,9 +344,9 @@ private MimeMessage createMail(EmailType type, AbstractBuild<?, ?> build, BuildL
cur = p.getBuildByNumber(upc.getUpstreamBuild());
upc = cur.getCause(Cause.UpstreamCause.class);
}
Cause.UserCause uc = cur.getCause(Cause.UserCause.class);
Cause.UserIdCause uc = cur.getCause(Cause.UserIdCause.class);
if (uc != null) {
User user = User.get(uc.getUserName());
User user = User.get(uc.getUserId(), false);
if (user != null) {
String adrs = user.getProperty(Mailer.UserProperty.class).getAddress();
if (adrs != null) {
Expand Down
@@ -1,14 +1,17 @@
package hudson.plugins.emailext;

import hudson.model.Cause.UserIdCause;
import hudson.model.FreeStyleBuild;
import hudson.model.FreeStyleProject;
import hudson.model.Result;
import hudson.model.User;
import hudson.plugins.emailext.plugins.EmailTrigger;
import hudson.plugins.emailext.plugins.trigger.FailureTrigger;
import hudson.plugins.emailext.plugins.trigger.FixedTrigger;
import hudson.plugins.emailext.plugins.trigger.PreBuildTrigger;
import hudson.plugins.emailext.plugins.trigger.StillFailingTrigger;
import hudson.plugins.emailext.plugins.trigger.SuccessTrigger;
import hudson.tasks.Mailer;
import net.sf.json.JSONObject;
import org.jvnet.hudson.test.FailureBuilder;
import org.jvnet.hudson.test.HudsonTestCase;
Expand All @@ -24,6 +27,7 @@
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import static org.junit.matchers.JUnitMatchers.*;
import static org.mockito.Mockito.*;

public class ExtendedEmailPublisherTest
extends HudsonTestCase
Expand Down Expand Up @@ -262,6 +266,40 @@ public void testShouldSendEmailUsingUtf8ByDefault()
containsString( "charset=UTF-8" ) );
}
}

public void testsSendToRequester()
throws Exception
{
SuccessTrigger successTrigger = new SuccessTrigger();
successTrigger.setEmail(new EmailType(){{
setSendToRequester(true);
}});
publisher.getConfiguredTriggers().add( successTrigger );

User u = User.get("ssogabe");
Mailer.UserProperty prop = new Mailer.UserProperty("ssogabe@xxx.com");
u.addProperty(prop);

UserIdCause cause = new MockUserIdCause("ssogabe");

FreeStyleBuild build = project.scheduleBuild2( 0, cause ).get();
assertBuildStatusSuccess( build );

assertEquals( 1, Mailbox.get( "ssogabe@xxx.com" ).size() );
}

private static class MockUserIdCause extends UserIdCause {
private String userId;

public MockUserIdCause(String userId) {
this.userId = userId;
}

@Override
public String getUserId() {
return userId;
}
}

public void testNewInstance_shouldGetBasicInformation()
throws Exception
Expand Down

0 comments on commit 431bf01

Please sign in to comment.