diff --git a/src/test/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMSourceTraitsTest.java b/src/test/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMSourceTraitsTest.java index 9c6f9ab25..cf91cf63c 100644 --- a/src/test/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMSourceTraitsTest.java +++ b/src/test/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMSourceTraitsTest.java @@ -69,6 +69,13 @@ public void given__configuredInstance__when__uninstantiating__then__deprecatedFi recreated.setIncludes("i*"); recreated.setExcludes("production"); recreated.setScanCredentialsId("foo"); + String trust; + if (r.jenkins.getPlugin("gitlab-branch-source") != null) { + trust = + "org.jenkinsci.plugins.github_branch_source.ForkPullRequestDiscoveryTrait$TrustPermission"; + } else { + trust = "TrustPermission"; + } assertThat( DescribableModel.uninstantiate2_(recreated).toString(), is( @@ -82,7 +89,9 @@ public void given__configuredInstance__when__uninstantiating__then__deprecatedFi + "@gitHubPullRequestDiscovery$OriginPullRequestDiscoveryTrait(strategyId=1), " + "@gitHubForkDiscovery$ForkPullRequestDiscoveryTrait(" + "strategyId=2," - + "trust=@gitHubTrustPermissions$TrustPermission()), " + + "trust=@gitHubTrustPermissions$" + + trust + + "()), " + "@headWildcardFilter$WildcardSCMHeadFilterTrait(excludes=production,includes=i*)])")); } diff --git a/src/test/resources/org/jenkinsci/plugins/github_branch_source/configuration-as-code.yaml b/src/test/resources/org/jenkinsci/plugins/github_branch_source/configuration-as-code.yaml index 2b57e6d6f..b948292d2 100644 --- a/src/test/resources/org/jenkinsci/plugins/github_branch_source/configuration-as-code.yaml +++ b/src/test/resources/org/jenkinsci/plugins/github_branch_source/configuration-as-code.yaml @@ -17,4 +17,4 @@ unclassified: strategyId: 2 - gitHubForkDiscovery: strategyId: 3 - trust: "trustPermission" + trust: "gitHubTrustPermissions"