Skip to content
Permalink
Browse files
[JENKINS-28298] Targets Jenkins-1.625.
  • Loading branch information
ikedam committed Mar 19, 2016
1 parent acf5125 commit fa7ca0de7585a2334f52e72489a3e509f656eef1
Showing with 1 addition and 14 deletions.
  1. +1 −5 pom.xml
  2. +0 −9 src/test/java/org/jenkinsci/plugins/authorizeproject/ProjectQueueItemAuthenticatorTest.java
@@ -3,8 +3,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>1.532</version><!-- QueueItemAuthenticator is since 1.520 -->
<!--<version>1.580.1</version>--><!-- When you test the integration with workflow -->
<version>1.625</version><!-- for JENKINS-28298 -->
</parent>

<groupId>org.jenkins-ci.plugins</groupId>
@@ -44,8 +43,6 @@
</properties>

<dependencies>
<!-- When you test the integration with workflow -->
<!--
<dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId>
<artifactId>workflow-job</artifactId>
@@ -64,7 +61,6 @@
<version>${workflow.version}</version>
<scope>test</scope>
</dependency>
-->
</dependencies>

<build>
@@ -61,8 +61,6 @@
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlTextInput;

/*
// classes for workflowTest
import java.io.IOException;
import jenkins.tasks.SimpleBuildStep;
import hudson.FilePath;
@@ -76,8 +74,6 @@
import org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition;
import org.jenkinsci.plugins.workflow.job.WorkflowJob;
import org.jenkinsci.plugins.workflow.job.WorkflowRun;
import org.kohsuke.stapler.DataBoundConstructor;
*/

/**
*
@@ -511,10 +507,6 @@ public void testOldSignature() throws Exception {
assertEquals("test1", checker.authentication.getName());
}

/*
// A test for workflow plugin (which extends Job, not AbstractProject).
// This is disabled as workflow requires Jenkins >= 1.580.1
// but authorize-project targets Jenkins >= 1.532.
public static class AuthorizationRecordAction extends InvisibleAction {
public final Authentication authentication;

@@ -580,5 +572,4 @@ public void testWorkflow() throws Exception {
assertEquals(User.get("test1").impersonate(), b.getAction(AuthorizationRecordAction.class).authentication);
}
}
*/
}

0 comments on commit fa7ca0d

Please sign in to comment.