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

Upgrade HtmlUnit from 2.x to 3.x #340

Open
wants to merge 4 commits into
base: feature/update-tools-bom
Choose a base branch
from
Open

Upgrade HtmlUnit from 2.x to 3.x #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
becc9d9
chore(deps): bump bom-2.289.x
dependabot[bot] Jul 20, 2022
449bc68
feat(Jenkins): Use latest LTS version and update Tools BOM
hypery2k Nov 12, 2022
4a19ae5
Upgrade HtmlUnit from 2.x to 3.x
timja Jun 6, 2023
cc93507
Merge branch 'feature/update-tools-bom' into htmlunit-2.x-to-3.x
hypery2k Jun 6, 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
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>plugin</artifactId>
<version>4.49</version>
<version>4.66</version>
<relativePath/>
</parent>

Expand All @@ -17,7 +17,7 @@

<properties>
<gitHubRepo>jenkinsci/${project.artifactId}</gitHubRepo>
<jenkins.version>2.332.1</jenkins.version>
<jenkins.version>2.361.3</jenkins.version>
<java.level>8</java.level>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand Down Expand Up @@ -333,8 +333,8 @@
<dependency>
<!-- Pick up common dependencies for the selected LTS line: https://github.com/jenkinsci/bom#usage -->
<groupId>io.jenkins.tools.bom</groupId>
<artifactId>bom-2.289.x</artifactId>
<version>1409.v7659b_c072f18</version>
<artifactId>bom-2.332.x</artifactId>
<version>1678.vc1feb_6a_3c0f1</version>
<scope>import</scope>
<type>pom</type>
</dependency>
Expand Down
14 changes: 7 additions & 7 deletions src/test/java/jenkins/plugins/rocketchatnotifier/RocketChatNotifierWithJenkinsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import com.cloudbees.plugins.credentials.CredentialsScope;
import com.cloudbees.plugins.credentials.SystemCredentialsProvider;
import com.gargoylesoftware.htmlunit.html.HtmlForm;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlSelect;
import org.htmlunit.html.HtmlForm;
import org.htmlunit.html.HtmlPage;
import org.htmlunit.html.HtmlSelect;
import hudson.model.FreeStyleProject;
import hudson.util.Secret;
import junit.framework.Assert;
Expand Down Expand Up @@ -75,7 +75,7 @@ public void testConfigurationRoundTrip() throws Exception {
// entry element name is webhookTokenCredentialId in config.jelly
HtmlSelect htmlSelectCredentials = form.getSelectByName("_.webhookTokenCredentialId");
assertEquals(2, htmlSelectCredentials.getOptionSize());
assertEquals("id 1", htmlSelectCredentials.getOption(1).getValueAttribute());
assertEquals("id 1", htmlSelectCredentials.getOption(1).getValue());

form.getInputByName("notifyStart").setAttribute("checked", "checked");
form.getInputByName("notifyAborted").setAttribute("checked", "checked");
Expand All @@ -92,10 +92,10 @@ public void testConfigurationRoundTrip() throws Exception {
form.getTextAreaByName("customMessage").setText("custom message 2");
// TODO: test attachments
form.getSelectByName("commitInfoChoice").setSelectedIndex(2);
form.getInputByName("rocketServerUrl").setValueAttribute("rocket server url 2");
form.getInputByName("rocketServerUrl").setValue("rocket server url 2");
form.getInputByName("trustSSL").setAttribute("checked", "checked");
form.getInputByName("channel").setValueAttribute("channel 2");
form.getInputByName("webhookToken").setValueAttribute("webhookToken 2");
form.getInputByName("channel").setValue("channel 2");
form.getInputByName("webhookToken").setValue("webhookToken 2");
form.getSelectByName("_.webhookTokenCredentialId").setSelectedIndex(1);

j.submit(form);
Expand Down