diff options
| author | Leif Åstrand <leif@vaadin.com> | 2013-07-23 13:18:04 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2013-07-23 13:18:04 +0300 |
| commit | b345bf217a01e5395c893914e065e30f77e35350 (patch) | |
| tree | adb57cc78c6c37230f99d0ff1c86903cf6152424 /uitest | |
| parent | 7cf124627e712d8e956d7e3f60e181230075daf9 (diff) | |
| parent | 7f5a0a7827570188b7c62ed362f4724886b1a94d (diff) | |
| download | vaadin-framework-b345bf217a01e5395c893914e065e30f77e35350.tar.gz vaadin-framework-b345bf217a01e5395c893914e065e30f77e35350.zip | |
Merge changes from origin/7.1
3229847 Fix lost focus in Table when refreshing row cache (#12231)
654d570 Don't close an unbound VaadinSession for GAEVaadinServlet (#12209)
2ea19f3 Make VaadinService.closeInactiveUIs set UI threadlocals (#12186)
7f5a0a7 Add Require-Bundle for our rebased atmosphere bundle (#12195)
Change-Id: I65c9a33462b3508b763115f8410fec3e62e16d45
Diffstat (limited to 'uitest')
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/uitest/src/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.html b/uitest/src/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.html index c41f3fbfdd..670736127b 100644 --- a/uitest/src/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.html +++ b/uitest/src/com/vaadin/tests/components/table/MultiSelectWithRemovedRow.html @@ -91,7 +91,7 @@ <tr> <td>assertText</td> <td>vaadin=runcomvaadintestscomponentstableMultiSelectWithRemovedRow::PID_SLog_row_0</td> - <td>4. Selection: [William, Averell, Bob, Grat]</td> + <td>4. Selection: [Averell, Bob, Grat]</td> </tr> <!--Sort + shift select down--> <tr> |