-
Notifications
You must be signed in to change notification settings - Fork 161
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: retain fragment when using push/replaceState (#11630)
Fixes #11628
- Loading branch information
Showing
6 changed files
with
208 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
145 changes: 145 additions & 0 deletions
145
flow-server/src/test/java/com/vaadin/flow/component/page/HistoryTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,145 @@ | ||
| /* | ||
| * Copyright 2000-2021 Vaadin Ltd. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not | ||
| * use this file except in compliance with the License. You may obtain a copy of | ||
| * the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| * License for the specific language governing permissions and limitations under | ||
| * the License. | ||
| */ | ||
|
|
||
| package com.vaadin.flow.component.page; | ||
|
|
||
| import java.io.Serializable; | ||
|
|
||
| import org.junit.Assert; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
|
|
||
| import com.vaadin.flow.component.UI; | ||
|
|
||
| import elemental.json.Json; | ||
| import elemental.json.JsonString; | ||
|
|
||
| public class HistoryTest { | ||
|
|
||
| private class TestUI extends UI { | ||
| @Override | ||
| public Page getPage() { | ||
| return page; | ||
| } | ||
| } | ||
|
|
||
| private class TestPage extends Page { | ||
|
|
||
| private String expression; | ||
|
|
||
| private Serializable[] parameters; | ||
|
|
||
| public TestPage(UI ui) { | ||
| super(ui); | ||
| } | ||
|
|
||
| @Override | ||
| public PendingJavaScriptResult executeJs(String expression, | ||
| Serializable... parameters) { | ||
| this.expression = expression; | ||
| this.parameters = parameters; | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| private UI ui = new TestUI(); | ||
| private TestPage page = new TestPage(ui); | ||
| private History history; | ||
|
|
||
| @Before | ||
| public void setup() { | ||
| history = new History(ui); | ||
| } | ||
|
|
||
| @Test | ||
| public void pushState_locationWithQueryParameters_queryParametersRetained() { | ||
| history.pushState(Json.create("{foo:bar;}"), "context/view?param=4"); | ||
|
|
||
| Assert.assertEquals("push state JS not included", | ||
| "window.history.pushState($0, '', $1)", page.expression); | ||
| Assert.assertEquals("push state not included", "{foo:bar;}", | ||
| ((JsonString) page.parameters[0]).getString()); | ||
| Assert.assertEquals("invalid location", "context/view?param=4", | ||
| page.parameters[1]); | ||
|
|
||
| history.pushState(Json.create("{foo:bar;}"), "context/view/?param=4"); | ||
|
|
||
| Assert.assertEquals("push state JS not included", | ||
| "window.history.pushState($0, '', $1)", page.expression); | ||
| Assert.assertEquals("push state not included", "{foo:bar;}", | ||
| ((JsonString) page.parameters[0]).getString()); | ||
| Assert.assertEquals("invalid location", "context/view/?param=4", | ||
| page.parameters[1]); | ||
| } | ||
|
|
||
| @Test | ||
| public void pushState_locationWithFragment_fragmentRetained() { | ||
| history.pushState(null, "context/view#foobar"); | ||
|
|
||
| Assert.assertEquals("push state JS not included", | ||
| "window.history.pushState($0, '', $1)", page.expression); | ||
| Assert.assertEquals(null, page.parameters[0]); | ||
| Assert.assertEquals("fragment not retained", "context/view#foobar", | ||
| page.parameters[1]); | ||
|
|
||
| history.pushState(null, "context/view/#foobar"); | ||
|
|
||
| Assert.assertEquals("push state JS not included", | ||
| "window.history.pushState($0, '', $1)", page.expression); | ||
| Assert.assertEquals(null, page.parameters[0]); | ||
| Assert.assertEquals("fragment not retained", "context/view/#foobar", | ||
| page.parameters[1]); | ||
| } | ||
|
|
||
| @Test // #11628 | ||
| public void pushState_locationWithQueryParametersAndFragment_QueryParametersAndFragmentRetained() { | ||
| history.pushState(null, "context/view?foo=bar#foobar"); | ||
|
|
||
| Assert.assertEquals("push state JS not included", | ||
| "window.history.pushState($0, '', $1)", page.expression); | ||
| Assert.assertEquals(null, page.parameters[0]); | ||
| Assert.assertEquals("invalid location", "context/view?foo=bar#foobar", | ||
| page.parameters[1]); | ||
|
|
||
| history.pushState(null, "context/view/?foo=bar#foobar"); | ||
|
|
||
| Assert.assertEquals("push state JS not included", | ||
| "window.history.pushState($0, '', $1)", page.expression); | ||
| Assert.assertEquals(null, page.parameters[0]); | ||
| Assert.assertEquals("invalid location", "context/view/?foo=bar#foobar", | ||
| page.parameters[1]); | ||
| } | ||
|
|
||
| @Test // #11628 | ||
| public void replaceState_locationWithQueryParametersAndFragment_QueryParametersAndFragmentRetained() { | ||
| history.replaceState(null, "context/view?foo=bar#foobar"); | ||
|
|
||
| Assert.assertEquals("push state JS not included", | ||
| "window.history.replaceState($0, '', $1)", page.expression); | ||
| Assert.assertEquals(null, page.parameters[0]); | ||
| Assert.assertEquals("invalid location", "context/view?foo=bar#foobar", | ||
| page.parameters[1]); | ||
|
|
||
| history.replaceState(null, "context/view/?foo=bar#foobar"); | ||
|
|
||
| Assert.assertEquals("push state JS not included", | ||
| "window.history.replaceState($0, '', $1)", page.expression); | ||
| Assert.assertEquals(null, page.parameters[0]); | ||
| Assert.assertEquals("invalid location", "context/view/?foo=bar#foobar", | ||
| page.parameters[1]); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters