Merge pull request #350 from timja-bot/htmlunit-2.x-to-3.x

Upgrade HtmlUnit from 2.x to 3.x
jenkinsci · Jun 4, 2023 · e06a0eb · e06a0eb
2 parents d59b025 + caeab3c
commit e06a0eb
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>org.jenkins-ci.plugins</groupId>
  <artifactId>plugin</artifactId>
- <version>4.60</version>
+ <version>4.66</version>
  <relativePath />
  </parent>
 

diff --git a/src/test/java/com/cloudbees/jenkins/GlobalConfigSubmitTest.java b/src/test/java/com/cloudbees/jenkins/GlobalConfigSubmitTest.java
@@ -1,7 +1,7 @@
 package com.cloudbees.jenkins;
 
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.html.HtmlForm;
+import org.htmlunit.html.HtmlPage;
 import org.jenkinsci.plugins.github.GitHubPlugin;
 import org.junit.Ignore;
 import org.junit.Rule;
@@ -36,7 +36,7 @@ public void shouldSetHookUrl() throws Exception {
  HtmlForm form = globalConfig();
 
  form.getInputByName(OVERRIDE_HOOK_URL_CHECKBOX).setChecked(true);
- form.getInputByName(HOOK_URL_INPUT).setValueAttribute(WEBHOOK_URL);
+ form.getInputByName(HOOK_URL_INPUT).setValue(WEBHOOK_URL);
  jenkins.submit(form);
 
  assertThat(GitHubPlugin.configuration().getHookUrl(), equalTo(new URL(WEBHOOK_URL)));
@@ -49,7 +49,7 @@ public void shouldNotSetHookUrl() throws Exception {
  HtmlForm form = globalConfig();
 
  form.getInputByName(OVERRIDE_HOOK_URL_CHECKBOX).setChecked(false);
- form.getInputByName(HOOK_URL_INPUT).setValueAttribute("http://foo");
+ form.getInputByName(HOOK_URL_INPUT).setValue("http://foo");
  jenkins.submit(form);
 
  assertThat(GitHubPlugin.configuration().getHookUrl(), equalTo(new URL(WEBHOOK_URL)));
@@ -62,7 +62,7 @@ public void shouldNotOverrideAPreviousHookUrlIfNotChecked() throws Exception {
  HtmlForm form = globalConfig();
 
  form.getInputByName(OVERRIDE_HOOK_URL_CHECKBOX).setChecked(false);
- form.getInputByName(HOOK_URL_INPUT).setValueAttribute("");
+ form.getInputByName(HOOK_URL_INPUT).setValue("");
  jenkins.submit(form);
 
  assertThat(GitHubPlugin.configuration().getHookUrl(), equalTo(new URL(WEBHOOK_URL)));

diff --git a/src/test/java/org/jenkinsci/plugins/github/config/GitHubPluginConfigTest.java b/src/test/java/org/jenkinsci/plugins/github/config/GitHubPluginConfigTest.java
@@ -3,9 +3,9 @@
 import com.cloudbees.plugins.credentials.CredentialsScope;
 import com.cloudbees.plugins.credentials.SystemCredentialsProvider;
 import com.cloudbees.plugins.credentials.domains.Domain;
-import com.gargoylesoftware.htmlunit.HttpMethod;
-import com.gargoylesoftware.htmlunit.Page;
-import com.gargoylesoftware.htmlunit.WebRequest;
+import org.htmlunit.HttpMethod;
+import org.htmlunit.Page;
+import org.htmlunit.WebRequest;
 import hudson.security.GlobalMatrixAuthorizationStrategy;
 import hudson.util.Secret;
 import jenkins.model.Jenkins;

diff --git a/src/test/java/org/jenkinsci/plugins/github/config/GitHubServerConfigIntegrationTest.java b/src/test/java/org/jenkinsci/plugins/github/config/GitHubServerConfigIntegrationTest.java
@@ -5,9 +5,9 @@
 import com.cloudbees.plugins.credentials.CredentialsScope;
 import com.cloudbees.plugins.credentials.CredentialsStore;
 import com.cloudbees.plugins.credentials.domains.Domain;
-import com.gargoylesoftware.htmlunit.HttpMethod;
-import com.gargoylesoftware.htmlunit.Page;
-import com.gargoylesoftware.htmlunit.WebRequest;
+import org.htmlunit.HttpMethod;
+import org.htmlunit.Page;
+import org.htmlunit.WebRequest;
 import hudson.security.GlobalMatrixAuthorizationStrategy;
 import hudson.util.Secret;
 import jenkins.model.Jenkins;