From 6904564e100c13286a69a114a6a891848f5c248a Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 13 Nov 2020 17:14:35 -0500 Subject: [PATCH 1/2] Making PermissionAdderTest run in PCT --- .../jenkinsci/plugins/matrixauth/PermissionAdderTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/jenkinsci/plugins/matrixauth/PermissionAdderTest.java b/src/test/java/org/jenkinsci/plugins/matrixauth/PermissionAdderTest.java index 0bab7bac..eb725e40 100644 --- a/src/test/java/org/jenkinsci/plugins/matrixauth/PermissionAdderTest.java +++ b/src/test/java/org/jenkinsci/plugins/matrixauth/PermissionAdderTest.java @@ -36,9 +36,11 @@ public void evaluate() throws Throwable { signup.enterUsername("alice"); signup.enterPassword("alice"); signup.enterFullName("Alice User"); + signup.enterEmail("alice@nowhere.net"); signup.submit(r.j); - - Assert.assertTrue(r.j.jenkins.getACL().hasPermission(User.get("alice", false, Collections.emptyMap()).impersonate(), Jenkins.ADMINISTER)); + User alice = User.get("alice", false, Collections.emptyMap()); + Assert.assertNotNull(alice); + Assert.assertTrue(r.j.jenkins.getACL().hasPermission(alice.impersonate(), Jenkins.ADMINISTER)); } }); r.addStep(new Statement() { From 209bb33b89e1f7334a23ee59dbd39ba4270cc686 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 16 Nov 2020 09:37:47 -0500 Subject: [PATCH 2/2] Let test pass with or without mailer plugin present --- .../jenkinsci/plugins/matrixauth/PermissionAdderTest.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/jenkinsci/plugins/matrixauth/PermissionAdderTest.java b/src/test/java/org/jenkinsci/plugins/matrixauth/PermissionAdderTest.java index eb725e40..a0a6128f 100644 --- a/src/test/java/org/jenkinsci/plugins/matrixauth/PermissionAdderTest.java +++ b/src/test/java/org/jenkinsci/plugins/matrixauth/PermissionAdderTest.java @@ -8,6 +8,7 @@ import java.util.Collections; +import com.gargoylesoftware.htmlunit.ElementNotFoundException; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; @@ -36,7 +37,11 @@ public void evaluate() throws Throwable { signup.enterUsername("alice"); signup.enterPassword("alice"); signup.enterFullName("Alice User"); - signup.enterEmail("alice@nowhere.net"); + try { + signup.enterEmail("alice@nowhere.net"); + } catch (ElementNotFoundException x) { + // mailer plugin not installed, fine + } signup.submit(r.j); User alice = User.get("alice", false, Collections.emptyMap()); Assert.assertNotNull(alice);