[java]

feat:
 - Add method to deselect options containing the provided text
 - Add method for checking element visibility

fix:
 - fix selectByContainsVisibleText method to check element visibility

Author: syber911911

common/src/web/formPage.html

@@ -80,6 +80,12 @@
         <option value="oranges">Oranges</option>
       </select>
 
+    <select id="invisible_multi_select" multiple>
+      <option selected="selected" value="apples" style="opacity: 0;">Apples</option>
+      <option value="oranges">Oranges</option>
+      <option selected="selected" value="lemons">Lemons</option>
+    </select>
+
     <select name="select-default">
         <option>One</option>
         <option>Two</option>

java/src/org/openqa/selenium/support/ui/ISelect.java

@@ -125,4 +125,6 @@ public interface ISelect {
    * @param text The visible text to match against
    */
   void deselectByVisibleText(String text);
+
+  void deSelectByContainsVisibleText(String text);
 }

java/src/org/openqa/selenium/support/ui/Select.java

@@ -17,9 +17,7 @@
 
 package org.openqa.selenium.support.ui;
 
-import java.util.List;
-import java.util.Objects;
-import java.util.StringTokenizer;
+import java.util.*;
 import java.util.stream.Collectors;
 import org.openqa.selenium.By;
 import org.openqa.selenium.NoSuchElementException;
@@ -68,6 +66,22 @@ public boolean isMultiple() {
     return isMulti;
   }
 
+  /**
+   * @return This is done by checking the value of attributes in "visibility", "display", "opacity"
+   * Return false if visibility is set to 'hidden', display is 'none', or opacity is 0 or 0.0.
+   */
+  private boolean hasCssPropertyAndVisible(WebElement webElement) {
+    List<String> cssValueCandidates = Arrays.asList(new String[]{"hidden", "none", "0", "0.0"});
+    String[] cssPropertyCandidates = new String[]{"visibility", "display", "opacity"};
+
+    for (String property : cssPropertyCandidates) {
+        String cssValue = webElement.getCssValue(property);
+        if (cssValueCandidates.contains(cssValue)) return false;
+    }
+
+    return true;
+  }
+
   /**
    * @return All options belonging to this select tag
    */
@@ -173,13 +187,15 @@ public void selectByVisibleText(String text) {
   @Override
   public void selectByContainsVisibleText(String text) {
     assertSelectIsEnabled();
+    assertSelectIsVisible();
 
     // try to find the option via XPATH ...
     List<WebElement> options =
       element.findElements(
         By.xpath(".//option[normalize-space(.) = " + Quotes.escape(text) + "]"));
 
     for (WebElement option : options) {
+      if (!hasCssPropertyAndVisible(option)) throw new NoSuchElementException("Invisible option with text: " + text);
       setSelected(option, true);
       if (!isMultiple()) {
         return;
@@ -201,6 +217,7 @@ public void selectByContainsVisibleText(String text) {
       String trimmed = text.trim();
       for (WebElement option : candidates) {
         if (option.getText().contains(trimmed)) {
+          if (!hasCssPropertyAndVisible(option)) throw new NoSuchElementException("Invisible option with text: " + text);
           setSelected(option, true);
           if (!isMultiple()) {
             return;
@@ -343,6 +360,27 @@ public void deselectByVisibleText(String text) {
     }
   }
 
+  @Override
+  public void deSelectByContainsVisibleText(String text) {
+    if (!isMultiple()) {
+      throw new UnsupportedOperationException("You may only deselect options of a multi-select");
+    }
+
+    String trimmed = text.trim();
+    List<WebElement> options =
+      element.findElements(
+        By.xpath(".//option[contains(., " + Quotes.escape(trimmed) + ")]"));
+
+    if (options.isEmpty()) {
+      throw new NoSuchElementException("Cannot locate option with text: " + text);
+    }
+
+    for (WebElement option : options) {
+      if (!hasCssPropertyAndVisible(option)) throw new NoSuchElementException("Invisible option with text: " + text);
+      setSelected(option, false);
+    }
+  }
+
   private List<WebElement> findOptionsByValue(String value) {
     List<WebElement> options =
         element.findElements(By.xpath(".//option[@value = " + Quotes.escape(value) + "]"));
@@ -389,6 +427,12 @@ private void assertSelectIsEnabled() {
     }
   }
 
+  private void assertSelectIsVisible() {
+    if (!hasCssPropertyAndVisible(element)) {
+      throw new UnsupportedOperationException("You may not select an option in invisible select");
+    }
+  }
+
   @Override
   public boolean equals(Object o) {
     if (!(o instanceof Select)) {

java/test/org/openqa/selenium/support/ui/SelectElementTest.java

@@ -162,6 +162,24 @@ public void shouldNotAllowInvisibleOptionsToBeSelectedByVisibleText() {
         .isThrownBy(() -> select.selectByVisibleText("Apples"));
   }
 
+  @Test
+  void shouldNotAllowInvisibleSelectElementToBeSelectedByContainsVisibleText() {
+    WebElement selectElement = driver.findElement(By.id("invisi_select"));
+    Select select = new Select(selectElement);
+
+    assertThatExceptionOfType(UnsupportedOperationException.class)
+        .isThrownBy(() -> select.selectByContainsVisibleText("Apples"));
+  }
+
+  @Test
+  void shouldNotAllowInvisibleOptionsToBeSelectedByContainsVisibleText() {
+    WebElement selectElement = driver.findElement(By.id("invisible_multi_select"));
+    Select select = new Select(selectElement);
+
+    assertThatExceptionOfType(NoSuchElementException.class)
+        .isThrownBy(() -> select.selectByContainsVisibleText("Apples"));
+  }
+
   @Test
   void shouldThrowExceptionOnSelectByVisibleTextIfOptionDoesNotExist() {
     WebElement selectElement = driver.findElement(By.name("select_empty_multiple"));
@@ -260,6 +278,15 @@ void shouldAllowUserToDeselectOptionsByVisibleText() {
     assertThat(select.getAllSelectedOptions()).hasSize(1);
   }
 
+  @Test
+  void shouldAllowUserToDeselectOptionsByContainsVisibleText() {
+    WebElement selectElement = driver.findElement(By.name("multi"));
+    Select select = new Select(selectElement);
+    select.deSelectByContainsVisibleText("Egg");
+
+    assertThat(select.getAllSelectedOptions()).hasSize(1);
+  }
+
   @Test
   @Ignore(ALL)
   public void shouldNotAllowUserToDeselectOptionsByInvisibleText() {
@@ -270,6 +297,24 @@ public void shouldNotAllowUserToDeselectOptionsByInvisibleText() {
         .isThrownBy(() -> select.deselectByVisibleText("Apples"));
   }
 
+  @Test
+  void shouldNotAllowUserDeselectOptionsByContainsText() {
+    WebElement selectElement = driver.findElement(By.name("multi"));
+    Select select = new Select(selectElement);
+
+    assertThatExceptionOfType(NoSuchElementException.class)
+        .isThrownBy(() -> select.deSelectByContainsVisibleText("Eggs_"));
+  }
+
+  @Test
+  void shouldNotAllowUserDeselectOptionsByContainsInvisibleText() {
+    WebElement selectElement = driver.findElement(By.id("invisible_multi_select"));
+    Select select = new Select(selectElement);
+
+    assertThatExceptionOfType(NoSuchElementException.class)
+        .isThrownBy(() -> select.deSelectByContainsVisibleText("Apples"));
+  }
+
   @Test
   void shouldAllowOptionsToBeDeselectedByIndex() {
     WebElement selectElement = driver.findElement(By.name("multi"));
@@ -316,6 +361,15 @@ void shouldThrowExceptionOnDeselectByVisibleTextIfOptionDoesNotExist() {
         .isThrownBy(() -> select.deselectByVisibleText("not there"));
   }
 
+  @Test
+  void shouldThrowExceptionOnDeselectByContainsTextIfOptionDoesNotExist() {
+    WebElement selectElement = driver.findElement(By.name("select_empty_multiple"));
+    Select select = new Select(selectElement);
+
+    assertThatExceptionOfType(NoSuchElementException.class)
+        .isThrownBy(() -> select.deSelectByContainsVisibleText("not there"));
+  }
+
   @Test
   void shouldThrowExceptionOnDeselectByIndexIfOptionDoesNotExist() {
     WebElement selectElement = driver.findElement(By.name("select_empty_multiple"));
@@ -351,4 +405,13 @@ void shouldNotAllowUserToDeselectByVisibleTextWhenSelectDoesNotSupportMultipleSe
     assertThatExceptionOfType(UnsupportedOperationException.class)
         .isThrownBy(() -> select.deselectByVisibleText("Four"));
   }
+
+  @Test
+  void shouldNotAllowUserToDeselectByContainsTextDoesNotSupportMultipleSelections() {
+    WebElement selectElement = driver.findElement(By.name("selectomatic"));
+    Select select = new Select(selectElement);
+
+    assertThatExceptionOfType(UnsupportedOperationException.class)
+        .isThrownBy(() -> select.deSelectByContainsVisibleText("Four"));
+  }
 }

java/test/org/openqa/selenium/support/ui/SelectTest.java

@@ -250,6 +250,23 @@ void shouldAllowUserToDeselectOptionsByVisibleText() {
     verify(secondOption, never()).click();
   }
 
+  @Test
+  void shouldAllowOptionsToDeSelectedByContainsVisibleText() {
+    String parameterText = "b";
+    final WebElement firstOption = mockOption("first", true);
+    final WebElement secondOption = mockOption("second", false);
+
+    final WebElement element = mockSelectWebElement("multiple");
+    when(element.findElements(By.xpath(".//option[contains(., " + Quotes.escape(parameterText) + ")]")))
+      .thenReturn(Arrays.asList(firstOption, secondOption));
+
+    Select select = new Select(element);
+    select.deSelectByContainsVisibleText(parameterText);
+
+    verify(firstOption).click();
+    verify(secondOption, never()).click();
+  }
+
   @Test
   void shouldAllowOptionsToBeDeselectedByIndex() {
     final WebElement firstOption = mockOption("first", true, 2);