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

fix!: bump Jsoup version #12046

Merged
merged 2 commits into from
Oct 18, 2021
Merged

fix!: bump Jsoup version #12046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b85f16a
fix!: bump Jsoup version
Oct 15, 2021
1a3c436
chore: fix unit tests
Oct 15, 2021
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
9 changes: 5 additions & 4 deletions flow-server/src/test/java/com/vaadin/flow/internal/UsageStatisticsExporterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

import java.util.stream.Collectors;

import elemental.json.Json;
import elemental.json.JsonObject;
import org.jsoup.internal.StringUtil;
import org.jsoup.nodes.DataNode;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
import org.jsoup.select.Elements;
import org.junit.Test;

import elemental.json.Json;
import elemental.json.JsonObject;

import static org.junit.Assert.assertEquals;

public class UsageStatisticsExporterTest {
Expand Down Expand Up @@ -40,6 +40,7 @@ public void should_append_script_element_to_the_body() {
Elements bodyInlineElements = document.body()
.getElementsByTag("script");
assertEquals(StringUtil.normaliseWhitespace(expected),
bodyInlineElements.get(0).childNode(0).outerHtml());
StringUtil.normaliseWhitespace(
bodyInlineElements.get(0).childNode(0).outerHtml()));
}
}
5 changes: 3 additions & 2 deletions ...erver/src/test/java/com/vaadin/flow/server/communication/IndexHtmlRequestHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
import com.vaadin.flow.component.UI;
import com.vaadin.flow.component.internal.JavaScriptBootstrapUI;
import com.vaadin.flow.di.Lookup;
import com.vaadin.flow.internal.DevModeHandler;
import com.vaadin.flow.internal.DevModeHandlerManager;
import com.vaadin.flow.internal.UsageStatistics;
import com.vaadin.flow.internal.DevModeHandler;
import com.vaadin.flow.server.AppShellRegistry;
import com.vaadin.flow.server.BootstrapHandler;
import com.vaadin.flow.server.MockServletServiceSessionSetup;
Expand Down Expand Up @@ -676,7 +676,8 @@ public void should_export_usage_statistics_in_development_mode()
+ "window.Vaadin.registrations.push(" + entries + ");");

assertEquals(StringUtil.normaliseWhitespace(expected),
bodyInlineElements.get(1).childNode(0).outerHtml());
StringUtil.normaliseWhitespace(
bodyInlineElements.get(1).childNode(0).outerHtml()));
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
<flow.dev.dependencies.file>devDependencies.json</flow.dev.dependencies.file>

<!-- Used in OSGi manifests -->
<jsoup.version>1.12.1</jsoup.version>
<jsoup.version>1.14.3</jsoup.version>
<!-- Note that this should be kept in sync with the class Constants -->
<atmosphere.runtime.version>2.4.30.slf4jvaadin1
</atmosphere.runtime.version>
Expand Down