summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--client/src/com/vaadin/client/ui/VTabsheet.java1
-rw-r--r--uitest/src/com/vaadin/tests/components/tabsheet/EmptyTabSheetTest.java13
2 files changed, 13 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/ui/VTabsheet.java b/client/src/com/vaadin/client/ui/VTabsheet.java
index a02679a0fc..8e4f3cb643 100644
--- a/client/src/com/vaadin/client/ui/VTabsheet.java
+++ b/client/src/com/vaadin/client/ui/VTabsheet.java
@@ -909,7 +909,6 @@ public class VTabsheet extends VTabsheetBase implements Focusable, SubPartAware
deco = DOM.createDiv();
- addStyleDependentName("loading"); // Indicate initial progress
tb.setStyleName(CLASSNAME + "-tabs");
DOM.setElementProperty(contentNode, "className", CLASSNAME + "-content");
DOM.setElementProperty(deco, "className", CLASSNAME + "-deco");
diff --git a/uitest/src/com/vaadin/tests/components/tabsheet/EmptyTabSheetTest.java b/uitest/src/com/vaadin/tests/components/tabsheet/EmptyTabSheetTest.java
index cebb00c11b..6d0b78debd 100644
--- a/uitest/src/com/vaadin/tests/components/tabsheet/EmptyTabSheetTest.java
+++ b/uitest/src/com/vaadin/tests/components/tabsheet/EmptyTabSheetTest.java
@@ -15,7 +15,10 @@
*/
package com.vaadin.tests.components.tabsheet;
+import org.junit.Assert;
import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
import com.vaadin.tests.tb3.MultiBrowserTest;
@@ -27,4 +30,14 @@ public class EmptyTabSheetTest extends MultiBrowserTest {
compareScreen("empty");
}
+ @Test
+ public void emptyTabSheetValo() {
+ openTestURL("theme=valo");
+
+ WebElement deco = getDriver().findElement(
+ By.className("v-tabsheet-deco"));
+
+ Assert.assertEquals("none", deco.getCssValue("display"));
+ }
+
}