diff options
| author | Artur Signell <artur@vaadin.com> | 2012-10-09 11:25:59 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2012-10-09 11:25:59 +0000 |
| commit | d693378d9350934aebbf3b3562c1132fbbbd7a64 (patch) | |
| tree | fd2e9373219bb7519e52b31e14bc034544bb767e | |
| parent | a4f6156c4602690f766434a2c0cce7791873704d (diff) | |
| parent | aa29d089c0b4d253e98790142c4b02566328c21a (diff) | |
| download | vaadin-framework-d693378d9350934aebbf3b3562c1132fbbbd7a64.tar.gz vaadin-framework-d693378d9350934aebbf3b3562c1132fbbbd7a64.zip | |
Merge "Update test to work with recent changes: * translateVaadinUri now gives absolute URLs * app:// now goes to the root of the servlet mapping * VerticalLayout style names updated"
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.html b/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.html index 3e4649e7b9..56d86fdc6c 100644 --- a/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.html +++ b/uitest/src/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.html @@ -39,7 +39,7 @@ <tr> <td>assertText</td> <td>vaadin=runcomvaadintestscomponentsjavascriptcomponentBasicJavaScriptComponent::/VVerticalLayout[0]/VVerticalLayout[0]/JavaScriptWidget[0]/domChild[0]</td> - <td>4. Url: /run/com.vaadin.tests.components.javascriptcomponent.BasicJavaScriptComponent/APP/connector/0/10/test</td> + <td>4. Url: */run/APP/connector/0/10/test</td> </tr> <tr> <td>assertText</td> @@ -54,7 +54,7 @@ <tr> <td>assertText</td> <td>vaadin=runcomvaadintestscomponentsjavascriptcomponentBasicJavaScriptComponent::/VVerticalLayout[0]/VVerticalLayout[0]/JavaScriptWidget[0]/domChild[3]</td> - <td>1. Parent element className: v-layout v-vertical v-verticallayout v-widget v-has-width</td> + <td>1. Parent element className: v-verticallayout v-layout v-vertical v-widget v-has-width</td> </tr> </tbody></table> </body> |