summaryrefslogtreecommitdiffstats
path: root/uitest/src
diff options
context:
space:
mode:
authorSami Ekblad <sami@vaadin.com>2014-07-17 16:07:56 +0300
committerVaadin Code Review <review@vaadin.com>2014-07-31 06:27:44 +0000
commit161d5289e23fdf1d9cb8e97d2e55f948b43fe0aa (patch)
tree7afd4364532b77e0c34ff39154d5980ec2c3f3ee /uitest/src
parent2f5df41f2ec6b3b4a3be0ffc454d47c4502a8364 (diff)
downloadvaadin-framework-161d5289e23fdf1d9cb8e97d2e55f948b43fe0aa.tar.gz
vaadin-framework-161d5289e23fdf1d9cb8e97d2e55f948b43fe0aa.zip
Hide visible file input in immediate Upload (#14238)
Change-Id: I4f5bc370a1a60ed2acbd38f62732547f1db7bee9
Diffstat (limited to 'uitest/src')
-rw-r--r--uitest/src/com/vaadin/tests/themes/valo/ImmediateUpload.java71
-rw-r--r--uitest/src/com/vaadin/tests/themes/valo/ImmediateUploadTest.java73
2 files changed, 144 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/themes/valo/ImmediateUpload.java b/uitest/src/com/vaadin/tests/themes/valo/ImmediateUpload.java
new file mode 100644
index 0000000000..87f24d98d4
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/themes/valo/ImmediateUpload.java
@@ -0,0 +1,71 @@
+/*
+ * 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.Upload;
+
+/**
+ *
+ * @since
+ * @author Vaadin Ltd
+ */
+@Theme("valo")
+public class ImmediateUpload extends AbstractTestUI {
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.vaadin.tests.components.AbstractTestUI#setup(com.vaadin.server.
+ * VaadinRequest)
+ */
+ @Override
+ protected void setup(VaadinRequest request) {
+
+ Upload upload = new Upload();
+ upload.setId("upload");
+ upload.setImmediate(false);
+ addComponent(upload);
+
+ Upload immediateUpload = new Upload();
+ immediateUpload.setId("immediateupload");
+ immediateUpload.setImmediate(true);
+ addComponent(immediateUpload);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.vaadin.tests.components.AbstractTestUI#getTestDescription()
+ */
+ @Override
+ protected String getTestDescription() {
+ return "Immediate upload should hide the button";
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see com.vaadin.tests.components.AbstractTestUI#getTicketNumber()
+ */
+ @Override
+ protected Integer getTicketNumber() {
+ return Integer.valueOf(14238);
+ }
+
+}
diff --git a/uitest/src/com/vaadin/tests/themes/valo/ImmediateUploadTest.java b/uitest/src/com/vaadin/tests/themes/valo/ImmediateUploadTest.java
new file mode 100644
index 0000000000..044f76e335
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/themes/valo/ImmediateUploadTest.java
@@ -0,0 +1,73 @@
+/*
+ * 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 static org.hamcrest.Matchers.equalToIgnoringCase;
+import static org.junit.Assert.assertThat;
+
+import java.util.List;
+
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.remote.DesiredCapabilities;
+
+import com.vaadin.testbench.elements.UploadElement;
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+/**
+ * Test to see if upload immediate mode hides the native file input.
+ *
+ * @author Vaadin Ltd
+ */
+public class ImmediateUploadTest extends MultiBrowserTest {
+
+ @Override
+ public List<DesiredCapabilities> getBrowsersToTest() {
+ return getAllBrowsers();
+ }
+
+ @Test
+ public void fileInputShouldNotBeVisibleInImmediate()
+ throws InterruptedException {
+ openTestURL();
+
+ UploadElement normalUpload = $(UploadElement.class).id("upload");
+ UploadElement immediateUpload = $(UploadElement.class).id(
+ "immediateupload");
+
+ WebElement normalUploadInput = normalUpload.findElement(By
+ .cssSelector("input[type='file']"));
+ WebElement immediateUploadInput = immediateUpload.findElement(By
+ .cssSelector("input[type='file']"));
+
+ WebElement normalUploadButton = normalUpload.findElement(By
+ .tagName("div"));
+ WebElement immediateUploadButton = immediateUpload.findElement(By
+ .tagName("div"));
+
+ assertThat(normalUploadButton.getCssValue("display"),
+ equalToIgnoringCase("block"));
+ assertThat(immediateUploadButton.getCssValue("display"),
+ equalToIgnoringCase("block"));
+
+ assertThat(normalUploadInput.getCssValue("position"),
+ equalToIgnoringCase("static"));
+ assertThat(immediateUploadInput.getCssValue("position"),
+ equalToIgnoringCase("absolute"));
+
+ }
+}