From 1d12fc07677debcac711586b5a57c2f397f3ec1f Mon Sep 17 00:00:00 2001 From: Denis Anisimov Date: Sat, 8 Nov 2014 12:47:05 +0200 Subject: Set v-bevel to 'false' should unset 'v-textfield-bevel' value (#14634). Change-Id: Ia3598b9bcef280bef38daa189ab3c7885e5d535a --- .../tests-valo-textfield-bevel/_variables.scss | 3 ++ .../themes/tests-valo-textfield-bevel/styles.scss | 6 +++ .../VAADIN/themes/valo/components/_textfield.scss | 2 +- .../vaadin/tests/themes/valo/TextFieldBevel.java | 52 +++++++++++++++++++ .../tests/themes/valo/TextFieldBevelTest.java | 59 ++++++++++++++++++++++ 5 files changed, 121 insertions(+), 1 deletion(-) create mode 100644 WebContent/VAADIN/themes/tests-valo-textfield-bevel/_variables.scss create mode 100644 WebContent/VAADIN/themes/tests-valo-textfield-bevel/styles.scss create mode 100644 uitest/src/com/vaadin/tests/themes/valo/TextFieldBevel.java create mode 100644 uitest/src/com/vaadin/tests/themes/valo/TextFieldBevelTest.java diff --git a/WebContent/VAADIN/themes/tests-valo-textfield-bevel/_variables.scss b/WebContent/VAADIN/themes/tests-valo-textfield-bevel/_variables.scss new file mode 100644 index 0000000000..b1b215a40c --- /dev/null +++ b/WebContent/VAADIN/themes/tests-valo-textfield-bevel/_variables.scss @@ -0,0 +1,3 @@ +$v-bevel: false; + +@import "../valo/valo"; diff --git a/WebContent/VAADIN/themes/tests-valo-textfield-bevel/styles.scss b/WebContent/VAADIN/themes/tests-valo-textfield-bevel/styles.scss new file mode 100644 index 0000000000..96a3ca63b6 --- /dev/null +++ b/WebContent/VAADIN/themes/tests-valo-textfield-bevel/styles.scss @@ -0,0 +1,6 @@ +@import "variables"; +@import "../tests-valo/valotest"; + +.tests-valo-textfield-bevel { + @include valotest; +} diff --git a/WebContent/VAADIN/themes/valo/components/_textfield.scss b/WebContent/VAADIN/themes/valo/components/_textfield.scss index 58f69e5e4c..50cb7b8042 100644 --- a/WebContent/VAADIN/themes/valo/components/_textfield.scss +++ b/WebContent/VAADIN/themes/valo/components/_textfield.scss @@ -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. diff --git a/uitest/src/com/vaadin/tests/themes/valo/TextFieldBevel.java b/uitest/src/com/vaadin/tests/themes/valo/TextFieldBevel.java new file mode 100644 index 0000000000..4e1debc5b6 --- /dev/null +++ b/uitest/src/com/vaadin/tests/themes/valo/TextFieldBevel.java @@ -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 { + + } + +} diff --git a/uitest/src/com/vaadin/tests/themes/valo/TextFieldBevelTest.java b/uitest/src/com/vaadin/tests/themes/valo/TextFieldBevelTest.java new file mode 100644 index 0000000000..ee2cdd41f8 --- /dev/null +++ b/uitest/src/com/vaadin/tests/themes/valo/TextFieldBevelTest.java @@ -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); + } +} -- cgit v1.2.3