[JENKINS-37778] Fix test after merge

Something unrelated in the shared libraries caused the tests to fail bumping the dependency down one version to fix that. An npe caused bu the credentials folder property to not be correctly initialized also fixed.
jenkinsci · Nov 8, 2016 · bec0c4b · bec0c4b
1 parent b3e12b6
commit bec0c4b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/pipeline-model-definition/pom.xml b/pipeline-model-definition/pom.xml
@@ -148,7 +148,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins.workflow</groupId>
       <artifactId>workflow-cps-global-lib</artifactId>
-      <version>2.4</version>
+      <version>2.3</version>
       <scope>test</scope>
     </dependency>
 

diff --git a/.../java/org/jenkinsci/plugins/pipeline/modeldefinition/steps/CredentialWrapperStepTest.java b/.../java/org/jenkinsci/plugins/pipeline/modeldefinition/steps/CredentialWrapperStepTest.java
@@ -82,6 +82,7 @@ public static void setup() throws Exception {
         store.addCredentials(Domain.global(), mixedEnvCred2);
 
         folder = j.jenkins.createProject(Folder.class, "testFolder");
+        folder.addProperty(new FolderCredentialsProvider.FolderCredentialsProperty(new DomainCredentials[0]));
         j.configRoundtrip(folder);
         CredentialsStore folderStore = folder.getProperties().get(FolderCredentialsProvider.FolderCredentialsProperty.class).getStore();
         StringCredentialsImpl sc = new StringCredentialsImpl(CredentialsScope.GLOBAL, mixedEnvCred1Id, "test", Secret.fromString(mixedEnvInFolderCred1Secret));