Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Exclude HTMLUnit failing assertion in Jenkins 2.400 and later #72

Closed
wants to merge 3 commits into from
Closed

Exclude HTMLUnit failing assertion in Jenkins 2.400 and later #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
073f9dd
Exclude HTMLUnit failing assertion in Jenkins 2.400 and later
MarkEWaite Apr 14, 2023
4f8399a
Test Java 17 with Jenkins 2.400
MarkEWaite Apr 14, 2023
e6a8dcb
Merge branch 'master' into fix-library-step-test-configRoundTrip
MarkEWaite Apr 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
buildPlugin(
useContainerAgent: true,
configurations: [
[platform: 'linux', jdk: 17],
[platform: 'linux', jdk: 17, jenkins: '2.400'],
[platform: 'windows', jdk: 11],
])
6 changes: 5 additions & 1 deletion src/test/java/org/jenkinsci/plugins/workflow/libs/LibraryStepTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import hudson.plugins.git.SubmoduleConfig;
import hudson.plugins.git.UserRemoteConfig;
import hudson.plugins.git.extensions.GitSCMExtension;
import hudson.util.VersionNumber;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
Expand Down Expand Up @@ -77,7 +78,10 @@ public class LibraryStepTest {
scmSource.setCredentialsId(""); // TODO the setter ought to use fixEmpty
s.setRetriever(new SCMSourceRetriever(scmSource));
s.setChangelog(true);
r.assertEqualDataBoundBeans(s, stepTester.configRoundTrip(s));
// TODO Assertion fails with 2.400 and later due to outdated JavaScript support in HTMLUnit
if (r.jenkins.get().getVersion().isOlderThan(new VersionNumber("2.400"))) {
r.assertEqualDataBoundBeans(s, stepTester.configRoundTrip(s));
}
// TODO uninstantiate works but SnippetizerTester.assertRoundTrip fails due to differing SCMSource.id values
assertEquals("library identifier: 'foo@master', retriever: modernSCM([$class: 'GitSCMSource', credentialsId: '', remote: 'https://nowhere.net/', traits: [gitBranchDiscovery()]])", Snippetizer.object2Groovy(s));
s.setRetriever(new SCMRetriever(new GitSCM(Collections.singletonList(new UserRemoteConfig("https://nowhere.net/", null, null, null)),
Expand Down