diff options
| author | Johannes Dahlström <johannesd@vaadin.com> | 2012-06-11 11:47:04 +0300 |
|---|---|---|
| committer | Johannes Dahlström <johannesd@vaadin.com> | 2012-06-11 11:47:04 +0300 |
| commit | 8fcb17519486c4629d90df4bc8f8db12a3d7a3ba (patch) | |
| tree | 60d6d9b55be6c139bc5152d623cd0eb9ff2f192c /tests | |
| parent | 8648be6705298dbbcfed5aafd9a57ab94d93105a (diff) | |
| parent | 2a72a1db5f3698c4fe040b96043f9fea3f31d308 (diff) | |
| download | vaadin-framework-8fcb17519486c4629d90df4bc8f8db12a3d7a3ba.tar.gz vaadin-framework-8fcb17519486c4629d90df4bc8f8db12a3d7a3ba.zip | |
Merge commit '2a72a'
Conflicts:
src/com/vaadin/terminal/UserError.java
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.html | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.html b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.html index bbe5d5d717..1459a30985 100644 --- a/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.html +++ b/tests/testbench/com/vaadin/tests/components/combobox/ComboBoxInvalidNullSelection.html @@ -33,6 +33,11 @@ </tr> <tr> <td>click</td> + <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxInvalidNullSelection::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>click</td> <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxInvalidNullSelection::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td> <td></td> </tr> |