summaryrefslogtreecommitdiffstats
path: root/uitest
diff options
context:
space:
mode:
Diffstat (limited to 'uitest')
-rw-r--r--uitest/src/main/java/com/vaadin/tests/OrderedLayoutSwapComponents.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java2
-rw-r--r--uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedThemeResource.java2
-rw-r--r--uitest/src/main/resources/html-tests/BottomComponentScrollsUp.html2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedThemeResourceTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/components/ui/ComboboxSelectedItemTextTest.java2
-rw-r--r--uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserTest.java2
7 files changed, 7 insertions, 7 deletions
diff --git a/uitest/src/main/java/com/vaadin/tests/OrderedLayoutSwapComponents.java b/uitest/src/main/java/com/vaadin/tests/OrderedLayoutSwapComponents.java
index d878c19aa8..91d62a9b83 100644
--- a/uitest/src/main/java/com/vaadin/tests/OrderedLayoutSwapComponents.java
+++ b/uitest/src/main/java/com/vaadin/tests/OrderedLayoutSwapComponents.java
@@ -29,7 +29,7 @@ import com.vaadin.ui.VerticalLayout;
/**
*
* This Component contains some simple test to see that component updates its
- * contents propertly.
+ * contents properly.
*
* @author Vaadin Ltd.
*/
diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java
index 8432605b09..b352170846 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/GridLayoutComboBoxZoomOut.java
@@ -17,7 +17,7 @@ public class GridLayoutComboBoxZoomOut extends AbstractTestCase {
Label description = new Label(
"Open this application in Chrome, zoom out (cmd + \"-\") and "
- + "open the ComboBox for weird behaviour.");
+ + "open the ComboBox for weird behavior.");
mainWindow.addComponent(description);
Layout formLayout = new GridLayout(2, 1);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedThemeResource.java b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedThemeResource.java
index c39e30be48..9f393d9398 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedThemeResource.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/embedded/EmbeddedThemeResource.java
@@ -27,7 +27,7 @@ import com.vaadin.v7.ui.themes.Reindeer;
/**
* Tests that {@link Embedded} uses correct theme when the theme is set with
* {@link #setTheme(String)}, and also updates correctly if theme is changed
- * later. {@link Image} is used as the baseline for correct behaviour.
+ * later. {@link Image} is used as the baseline for correct behavior.
*
* @author Vaadin Ltd
*/
diff --git a/uitest/src/main/resources/html-tests/BottomComponentScrollsUp.html b/uitest/src/main/resources/html-tests/BottomComponentScrollsUp.html
index a264b38ba8..f9d1a08182 100644
--- a/uitest/src/main/resources/html-tests/BottomComponentScrollsUp.html
+++ b/uitest/src/main/resources/html-tests/BottomComponentScrollsUp.html
@@ -1,7 +1,7 @@
<html>
<head>
-<title>Bottom component scroll when focus - test with plain html to see the default behaviour</title>
+<title>Bottom component scroll when focus - test with plain html to see the default behavior</title>
<link rel="stylesheet" type="text/css" href="./../VAADIN/themes/reindeer/styles.css">
<script>
diff --git a/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedThemeResourceTest.java b/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedThemeResourceTest.java
index 56ef8ebcae..bf7a663971 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedThemeResourceTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/embedded/EmbeddedThemeResourceTest.java
@@ -41,7 +41,7 @@ import com.vaadin.ui.Image;
/**
* Tests that {@link Embedded} uses correct theme when the theme is set with
* {@link #setTheme(String)}, and also updates correctly if theme is changed
- * later. {@link Image} is used as the baseline for correct behaviour.
+ * later. {@link Image} is used as the baseline for correct behavior.
*
* @author Vaadin Ltd
*/
diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/ComboboxSelectedItemTextTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/ComboboxSelectedItemTextTest.java
index ac62ffe6d6..073fbf4abe 100644
--- a/uitest/src/test/java/com/vaadin/tests/components/ui/ComboboxSelectedItemTextTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/components/ui/ComboboxSelectedItemTextTest.java
@@ -95,7 +95,7 @@ public class ComboboxSelectedItemTextTest extends MultiBrowserTest {
clickElement(comboBoxPopup.findElements(By.tagName("td")).get(2));
// click the button of the first combobox. This would reveal the
- // unwanted behaviour.
+ // unwanted behavior.
clickElement(
comboBox.findElement(By.className("v-filterselect-button")));
diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserTest.java b/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserTest.java
index 1193ba9334..615bc7e0eb 100644
--- a/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserTest.java
+++ b/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserTest.java
@@ -80,7 +80,7 @@ public abstract class MultiBrowserTest extends PrivateTB3Configuration {
protected List<DesiredCapabilities> getBrowsersSupportingTooltip() {
// With IEDriver, the cursor seems to jump to default position after the
- // mouse move, so we are not able to test the tooltip behaviour properly
+ // mouse move, so we are not able to test the tooltip behavior properly
// unless using requireWindowFocusForIE() { return true; } .
// See #13854.
// On Firefox, the driver causes additional mouseOut events causing the