Change-Id: Ia3598b9bcef280bef38daa189ab3c7885e5d535atags/7.4.0.beta1
@@ -0,0 +1,3 @@ | |||
$v-bevel: false; | |||
@import "../valo/valo"; |
@@ -0,0 +1,6 @@ | |||
@import "variables"; | |||
@import "../tests-valo/valotest"; | |||
.tests-valo-textfield-bevel { | |||
@include valotest; | |||
} |
@@ -14,7 +14,7 @@ $v-textfield-background-color--readonly: darkest-color($v-app-background-color, | |||
* The bevel style for text fields. See the documentation for $v-bevel. | |||
* @group textfield | |||
*/ | |||
$v-textfield-bevel: inset 0 1px 0 v-shade !default; | |||
$v-textfield-bevel: if($v-bevel and ($v-bevel != none), inset 0 1px 0 v-shade, $v-bevel) !default; | |||
/** | |||
* The shadow style for text fields. See the documentation for $v-shadow. |
@@ -0,0 +1,52 @@ | |||
/* | |||
* Copyright 2000-2014 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.themes.valo; | |||
import com.vaadin.annotations.Theme; | |||
import com.vaadin.server.VaadinRequest; | |||
import com.vaadin.tests.components.AbstractTestUI; | |||
import com.vaadin.ui.TextField; | |||
/** | |||
* Test UI for $v-textfield-bevel value in TextField component. | |||
* | |||
* @author Vaadin Ltd | |||
*/ | |||
@Theme("tests-valo-textfield-bevel") | |||
public class TextFieldBevel extends AbstractTestUI { | |||
@Override | |||
protected void setup(VaadinRequest request) { | |||
TextField field = new TextField(); | |||
addComponent(field); | |||
} | |||
@Override | |||
protected Integer getTicketNumber() { | |||
return 14634; | |||
} | |||
@Override | |||
protected String getTestDescription() { | |||
return "Set v-bevel to 'false' should unset 'v-textfield-bevel' value."; | |||
} | |||
@Theme("valo") | |||
public static class ValoDefaultTextFieldBevel extends TextFieldBevel { | |||
} | |||
} |
@@ -0,0 +1,59 @@ | |||
/* | |||
* Copyright 2000-2014 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.themes.valo; | |||
import org.junit.Assert; | |||
import org.junit.Test; | |||
import com.vaadin.testbench.elements.TextFieldElement; | |||
import com.vaadin.tests.tb3.MultiBrowserTest; | |||
/** | |||
* Test for $v-textfield-bevel value when $v-bevel is unset. | |||
* | |||
* @author Vaadin Ltd | |||
*/ | |||
public class TextFieldBevelTest extends MultiBrowserTest { | |||
@Test | |||
public void testTextFieldBevel() { | |||
String url = getTestUrl(); | |||
StringBuilder defaultValoUi = new StringBuilder( | |||
TextFieldBevel.class.getSimpleName()); | |||
defaultValoUi.append('$'); | |||
defaultValoUi.append(TextFieldBevel.ValoDefaultTextFieldBevel.class | |||
.getSimpleName()); | |||
url = url.replace(TextFieldBevel.class.getSimpleName(), | |||
defaultValoUi.toString()); | |||
getDriver().get(url); | |||
String defaultBoxShadow = $(TextFieldElement.class).first() | |||
.getCssValue("box-shadow"); | |||
if (url.contains("restartApplication")) { | |||
openTestURL(); | |||
} else { | |||
openTestURL("restartApplication"); | |||
} | |||
String boxShadow = $(TextFieldElement.class).first().getCssValue( | |||
"box-shadow"); | |||
Assert.assertNotEquals( | |||
"Set v-bevel to 'false' doesn't affect 'v-textfield-bevel' value", | |||
defaultBoxShadow, boxShadow); | |||
} | |||
} |