diff options
| author | Leif Åstrand <leif@vaadin.com> | 2013-06-04 13:05:42 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2013-06-04 13:05:43 +0300 |
| commit | a82d57ee336803359ba2a49aba80604c74c782e0 (patch) | |
| tree | cae7462c8037e3ae33b9e40eb54cfa791cef879c /uitest | |
| parent | 6c36784ad2853d0187f69ef8f023717aa7bade12 (diff) | |
| parent | 158c162d688fdfa701f9c6c9035e27d9f64a312f (diff) | |
| download | vaadin-framework-a82d57ee336803359ba2a49aba80604c74c782e0.tar.gz vaadin-framework-a82d57ee336803359ba2a49aba80604c74c782e0.zip | |
Merge changes from origin/7.0
b1390c5 Don't autoclose PopupView when changing fragment, fixes #10530
158c162 Do not clear combobox text unnecessarily (#10924, #11887)
Change-Id: I5cda623309d9e1b16ad09aa2a388552b5f33ca30
Diffstat (limited to 'uitest')
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/popupview/PopupViewAndFragment.html | 32 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/popupview/PopupViewAndFragment.java | 54 |
2 files changed, 86 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewAndFragment.html b/uitest/src/com/vaadin/tests/components/popupview/PopupViewAndFragment.html new file mode 100644 index 0000000000..28af578bac --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/popupview/PopupViewAndFragment.html @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="http://localhost:8888/" /> +<title>PopupViewAndFragment</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">PopupViewAndFragment</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/run/PopupViewAndFragment?restartApplication#</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>vaadin=runPopupViewAndFragment::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/uitest/src/com/vaadin/tests/components/popupview/PopupViewAndFragment.java b/uitest/src/com/vaadin/tests/components/popupview/PopupViewAndFragment.java new file mode 100644 index 0000000000..1606b78604 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/popupview/PopupViewAndFragment.java @@ -0,0 +1,54 @@ +/* + * Copyright 2000-2013 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.tests.components.popupview; + +import com.vaadin.server.VaadinRequest; +import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Label; +import com.vaadin.ui.PopupView; + +public class PopupViewAndFragment extends AbstractTestUI { + + @Override + protected void setup(VaadinRequest request) { + final PopupView pw = new PopupView("Open", new Label("Oh, hi")); + addComponent(pw); + + final Button button = new Button("Open and change fragment", + new Button.ClickListener() { + @Override + public void buttonClick(final ClickEvent event) { + pw.setPopupVisible(true); + getPage().setUriFragment( + String.valueOf(System.currentTimeMillis())); + } + }); + addComponent(button); + } + + @Override + protected String getTestDescription() { + return "Changing frament should not automatically close PopupView"; + } + + @Override + protected Integer getTicketNumber() { + return 10530; + } + +} |