Port almost all remaining Selenium tests

19 files changed, 230 insertions, 133 deletions

diff --git a/it/it-tests/src/test/java/analysis/suite/measure/MeasureFiltersTest.java b/it/it-tests/src/test/java/analysis/suite/measure/MeasureFiltersTest.java
index b699beaba3b..aa0a95e3e9c 100644
--- a/it/it-tests/src/test/java/analysis/suite/measure/MeasureFiltersTest.java
+++ b/it/it-tests/src/test/java/analysis/suite/measure/MeasureFiltersTest.java
@@ -30,6 +30,7 @@ import org.junit.Test;
 import org.sonar.wsclient.SonarClient;
 import org.sonar.wsclient.permissions.PermissionParameters;
 import org.sonar.wsclient.user.UserParameters;
+import selenium.SeleneseTest;
 
 import static util.ItUtils.projectDir;
 
@@ -63,8 +64,7 @@ public class MeasureFiltersTest {
       "/measure/suite/measure_filters/search-by-name.html",
       "/measure/suite/measure_filters/empty_filter.html"
       ).build();
-    // Use the old runner because it fails with the new Selenium runner
-    orchestrator.executeSelenese(selenese);
+    new SeleneseTest(selenese).runOn(orchestrator);
   }
 
   @Test
@@ -76,8 +76,7 @@ public class MeasureFiltersTest {
       "/measure/suite/measure_filters/list_sort_by_descending_name.html",
       "/measure/suite/measure_filters/list_sort_by_ncloc.html"
       ).build();
-    // Use the old runner because it fails with the new Selenium runner
-    orchestrator.executeSelenese(selenese);
+    new SeleneseTest(selenese).runOn(orchestrator);
   }
 
   @Test
@@ -91,9 +90,7 @@ public class MeasureFiltersTest {
         // SONAR-4469
         "/measure/suite/measure_filters/should-unshare-filter-remove-other-filters-favourite.html"
         ).build();
-      // Use the old runner because it fails with the new Selenium runner
-      orchestrator.executeSelenese(selenese);
-
+      new SeleneseTest(selenese).runOn(orchestrator);
     } finally {
       deactivateUser(user);
     }
@@ -108,10 +105,9 @@ public class MeasureFiltersTest {
     createUser(user, "User Measure Filters without sharing permission");
 
     try {
-      // Use the old runner because it fails with the new Selenium runner
-      orchestrator.executeSelenese(Selenese.builder().setHtmlTestsInClasspath("should_not_share_filter_when_user_have_no_sharing_permissions",
+      new SeleneseTest(Selenese.builder().setHtmlTestsInClasspath("should_not_share_filter_when_user_have_no_sharing_permissions",
         "/measure/suite/measure_filters/should-not-share-filter-when-user-have-no-sharing-permissions.html"
-        ).build());
+        ).build()).runOn(orchestrator);
     } finally {
       deactivateUser(user);
     }
@@ -123,8 +119,7 @@ public class MeasureFiltersTest {
       "/measure/suite/measure_filters/copy_measure_filter.html",
       "/measure/suite/measure_filters/copy_uniqueness_of_name.html"
       ).build();
-    // Use the old runner because it fails with the new Selenium runner
-    orchestrator.executeSelenese(selenese);
+    new SeleneseTest(selenese).runOn(orchestrator);
   }
 
   @Test
@@ -132,8 +127,7 @@ public class MeasureFiltersTest {
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("manage_measure_filters",
       "/measure/suite/measure_filters/save_with_special_characters.html"
       ).build();
-    // Use the old runner because it fails with the new Selenium runner
-    orchestrator.executeSelenese(selenese);
+    new SeleneseTest(selenese).runOn(orchestrator);
   }
 
   @Test
@@ -143,8 +137,7 @@ public class MeasureFiltersTest {
       "/measure/suite/measure_filters/list_widget_sort.html",
       "/measure/suite/measure_filters/list_widget_warning_if_missing_filter.html"
       ).build();
-    // Use the old runner because it fails with the new Selenium runner
-    orchestrator.executeSelenese(selenese);
+    new SeleneseTest(selenese).runOn(orchestrator);
   }
 
   private static void createUser(String login, String name) {
@@ -164,5 +157,4 @@ public class MeasureFiltersTest {
   private static void deactivateUser(String user) {
     orchestrator.getServer().adminWsClient().userClient().deactivate(user);
   }
-
 }
diff --git a/it/it-tests/src/test/java/selenium/LazyDomElement.java b/it/it-tests/src/test/java/selenium/LazyDomElement.java
index 1a230bd0e5a..dcf2ee2f363 100644
--- a/it/it-tests/src/test/java/selenium/LazyDomElement.java
+++ b/it/it-tests/src/test/java/selenium/LazyDomElement.java
@@ -24,6 +24,7 @@ import com.google.common.base.Predicate;
 import com.google.common.base.Supplier;
 import com.google.common.collect.FluentIterable;
 import org.openqa.selenium.By;
+import org.openqa.selenium.Keys;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.Select;
 
@@ -84,6 +85,15 @@ class LazyDomElement {
     });
   }
 
+  public void pressEnter() {
+    execute("pressEnter", new Consumer<WebElement>() {
+      @Override
+      public void accept(WebElement element) {
+        element.sendKeys(Keys.ENTER);
+      }
+    });
+  }
+
   public void select(final String text) {
     executeSelect("select(" + text + ")", new Consumer<Select>() {
       @Override
diff --git a/it/it-tests/src/test/java/selenium/SeleneseTest.java b/it/it-tests/src/test/java/selenium/SeleneseTest.java
index 9d7d2bb495d..1c5de9446bc 100644
--- a/it/it-tests/src/test/java/selenium/SeleneseTest.java
+++ b/it/it-tests/src/test/java/selenium/SeleneseTest.java
@@ -26,6 +26,7 @@ import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.openqa.selenium.By;
+import org.openqa.selenium.NotFoundException;
 import org.openqa.selenium.WebElement;
 
 import java.io.File;
@@ -93,6 +94,9 @@ public class SeleneseTest {
       case "type":
         type(param1, param2);
         return this;
+      case "keyPressAndWait":
+        keyPressAndWait(param1, param2);
+        return this;
       case "select":
         select(param1, param2);
         return this;
@@ -118,6 +122,9 @@ public class SeleneseTest {
       case "storeEval":
         storeEval(param1, param2);
         return this;
+      case "store":
+        store(param1, param2);
+        return this;
       case "assertText":
       case "waitForText":
         assertText(param1, param2);
@@ -169,6 +176,8 @@ public class SeleneseTest {
   private void goTo(String url) {
     requireNonNull(url, "The url cannot be null");
 
+    url = replacePlaceholders(url);
+
     URI uri = URI.create(url.replace(" ", "%20"));
     if (!uri.isAbsolute()) {
       url = baseUrl + url;
@@ -232,6 +241,13 @@ public class SeleneseTest {
     find(selector).fill(replacePlaceholders(text));
   }
 
+  private void keyPressAndWait(String selector, String key) {
+    if (!key.equals("\\13")) {
+      throw new IllegalArgumentException("Invalid key: " + key);
+    }
+    find(selector).pressEnter();
+  }
+
   private void select(String selector, String text) {
     if (text.startsWith("label=")) {
       find(selector).select(text.substring(6));
@@ -252,8 +268,27 @@ public class SeleneseTest {
     find(selector).execute(new ExtractVariable(name));
   }
 
-  private void storeEval(String expression, String name) {
-    variables.put(name, driver.executeScript("return " + expression).toString());
+  private void storeEval(final String expression, final String name) {
+    // Retry until it's not null and doesn't fail
+    _30_SECONDS.execute(new Runnable() {
+      @Override
+      public void run() {
+        Object result = driver.executeScript("return " + expression);
+        if (result == null) {
+          throw new NotFoundException(expression);
+        }
+        String value = result.toString();
+        variables.put(name, value);
+      }
+    });
+  }
+
+  private void store(String expression, String name) {
+    if (expression.startsWith("javascript{") && expression.endsWith("}")) {
+      storeEval(expression.substring(11, expression.length() - 1), name);
+    } else {
+      throw new IllegalArgumentException("Invalid store expression: " + expression);
+    }
   }
 
   private class ExtractVariable implements Consumer<WebElement> {
@@ -312,12 +347,12 @@ public class SeleneseTest {
     regexp = regexp.replaceAll("([\\]\\[\\\\{\\}$\\(\\)\\|\\^\\+.])", "\\\\$1");
     regexp = regexp.replaceAll("\\*", ".*");
     regexp = regexp.replaceAll("\\?", ".");
-    return Pattern.compile(regexp, DOTALL);
+    return Pattern.compile(regexp, DOTALL | Pattern.CASE_INSENSITIVE);
   }
 
   private static Pattern regex(String pattern) {
     String regexp = pattern.replaceFirst("regexp:", ".*") + ".*";
-    return Pattern.compile(regexp, DOTALL);
+    return Pattern.compile(regexp, DOTALL | Pattern.CASE_INSENSITIVE);
   }
 
   private void assertTextPresent(String text) {
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/copy_measure_filter.html b/it/it-tests/src/test/resources/measure/suite/measure_filters/copy_measure_filter.html
index 22005c9a9d6..d707a0d4fc6 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/copy_measure_filter.html
+++ b/it/it-tests/src/test/resources/measure/suite/measure_filters/copy_measure_filter.html
@@ -44,14 +44,14 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>name=qualifiers[]</td>
-	<td></td>
+    <td>click</td>
+    <td>css=.navigator-filter[title='Components: Any']</td>
+    <td></td>
 </tr>
 <tr>
-	<td>select</td>
-	<td>name=qualifiers[]</td>
-	<td>Files</td>
+    <td>click</td>
+    <td>css=label[title='Files']</td>
+    <td></td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -119,14 +119,14 @@
 	<td>*description of copy*</td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>name=qualifiers[]</td>
-	<td>Files</td>
+    <td>click</td>
+    <td>css=.navigator-filter[title='Components: Files']</td>
+    <td></td>
 </tr>
 <tr>
-	<td>assertSelectedLabel</td>
-	<td>name=qualifiers[]</td>
-	<td>Files</td>
+    <td>click</td>
+    <td>css=label[title='Files']</td>
+    <td></td>
 </tr>
 </tbody>
 </table>
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/copy_uniqueness_of_name.html b/it/it-tests/src/test/resources/measure/suite/measure_filters/copy_uniqueness_of_name.html
index 7f6f914a8a2..10a3e686802 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/copy_uniqueness_of_name.html
+++ b/it/it-tests/src/test/resources/measure/suite/measure_filters/copy_uniqueness_of_name.html
@@ -44,14 +44,14 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>name=qualifiers[]</td>
-	<td></td>
+    <td>click</td>
+    <td>css=.navigator-filter[title='Components: Any']</td>
+    <td></td>
 </tr>
 <tr>
-	<td>select</td>
-	<td>name=qualifiers[]</td>
-	<td>Files</td>
+    <td>click</td>
+    <td>css=label[title='Files']</td>
+    <td></td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -123,16 +123,6 @@
 	<td>filter-title</td>
 	<td>*copy of ${FILTER_NAME}*</td>
 </tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>name=qualifiers[]</td>
-	<td>Files</td>
-</tr>
-<tr>
-	<td>assertSelectedLabel</td>
-	<td>name=qualifiers[]</td>
-	<td>Files</td>
-</tr>
 </tbody>
 </table>
 </body>
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/list_change_columns.html b/it/it-tests/src/test/resources/measure/suite/measure_filters/list_change_columns.html
index b23e78ca1c4..febc4f83fdb 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/list_change_columns.html
+++ b/it/it-tests/src/test/resources/measure/suite/measure_filters/list_change_columns.html
@@ -10,18 +10,43 @@
     <tbody>
     <tr>
         <td>open</td>
+        <td>/sonar/sessions/logout</td>
+        <td></td>
+    </tr>
+    <tr>
+        <td>open</td>
+        <td>/sonar/sessions/new</td>
+        <td></td>
+    </tr>
+    <tr>
+        <td>type</td>
+        <td>id=login</td>
+        <td>admin</td>
+    </tr>
+    <tr>
+        <td>type</td>
+        <td>id=password</td>
+        <td>admin</td>
+    </tr>
+    <tr>
+        <td>clickAndWait</td>
+        <td>name=commit</td>
+        <td></td>
+    </tr>
+    <tr>
+        <td>open</td>
         <td>/sonar/measures</td>
         <td></td>
     </tr>
     <tr>
-      <td>waitForElementPresent</td>
-      <td>name=qualifiers[]</td>
-      <td></td>
+        <td>click</td>
+        <td>css=.navigator-filter[title='Components: Any']</td>
+        <td></td>
     </tr>
     <tr>
-        <td>select</td>
-        <td>name=qualifiers[]</td>
-        <td>Files</td>
+        <td>click</td>
+        <td>css=label[title='Files']</td>
+        <td></td>
     </tr>
     <tr>
         <td>clickAndWait</td>
@@ -34,11 +59,21 @@
         <td></td>
     </tr>
     <tr>
-        <td>select</td>
-        <td>select-metric</td>
+        <td>click</td>
+        <td>class=select2-choice</td>
+        <td></td>
+    </tr>
+    <tr>
+        <td>type</td>
+        <td>css=.select2-with-searchbox .select2-input</td>
         <td>Complexity</td>
     </tr>
     <tr>
+        <td>keyPressAndWait</td>
+        <td>css=.select2-with-searchbox .select2-input</td>
+        <td>\13</td>
+    </tr>
+    <tr>
         <td>clickAndWait</td>
         <td>id=add-metric</td>
         <td></td>
@@ -49,11 +84,21 @@
         <td>*Name*Cmpx*</td>
     </tr>
     <tr>
-        <td>select</td>
-        <td>select-metric</td>
+        <td>click</td>
+        <td>class=select2-choice</td>
+        <td></td>
+    </tr>
+    <tr>
+        <td>type</td>
+        <td>css=.select2-with-searchbox .select2-input</td>
         <td>Comment lines</td>
     </tr>
     <tr>
+        <td>keyPressAndWait</td>
+        <td>css=.select2-with-searchbox .select2-input</td>
+        <td>\13</td>
+    </tr>
+    <tr>
         <td>select</td>
         <td>id=select-period</td>
         <td>label=since previous analysis</td>
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/list_delete_column.html b/it/it-tests/src/test/resources/measure/suite/measure_filters/list_delete_column.html
index 3075d43b47e..a747b2d1485 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/list_delete_column.html
+++ b/it/it-tests/src/test/resources/measure/suite/measure_filters/list_delete_column.html
@@ -14,14 +14,14 @@
         <td></td>
     </tr>
     <tr>
-      <td>waitForElementPresent</td>
-      <td>name=qualifiers[]</td>
-      <td></td>
+        <td>click</td>
+        <td>css=.navigator-filter[title='Components: Any']</td>
+        <td></td>
     </tr>
     <tr>
-        <td>select</td>
-        <td>name=qualifiers[]</td>
-        <td>Files</td>
+        <td>click</td>
+        <td>css=label[title='Files']</td>
+        <td></td>
     </tr>
     <tr>
         <td>clickAndWait</td>
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/list_move_columns.html b/it/it-tests/src/test/resources/measure/suite/measure_filters/list_move_columns.html
index ee78b261c94..5bd4435387a 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/list_move_columns.html
+++ b/it/it-tests/src/test/resources/measure/suite/measure_filters/list_move_columns.html
@@ -14,14 +14,14 @@
         <td></td>
     </tr>
     <tr>
-      <td>waitForElementPresent</td>
-      <td>name=qualifiers[]</td>
-      <td></td>
+        <td>click</td>
+        <td>css=.navigator-filter[title='Components: Any']</td>
+        <td></td>
     </tr>
     <tr>
-        <td>select</td>
-        <td>name=qualifiers[]</td>
-        <td>Files</td>
+        <td>click</td>
+        <td>css=label[title='Files']</td>
+        <td></td>
     </tr>
     <tr>
         <td>clickAndWait</td>
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/list_sort_by_descending_name.html b/it/it-tests/src/test/resources/measure/suite/measure_filters/list_sort_by_descending_name.html
index 8705a7efee2..c4d1c85ee57 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/list_sort_by_descending_name.html
+++ b/it/it-tests/src/test/resources/measure/suite/measure_filters/list_sort_by_descending_name.html
@@ -34,14 +34,14 @@
         <td></td>
     </tr>
     <tr>
-      <td>waitForElementPresent</td>
-      <td>name=qualifiers[]</td>
-      <td></td>
+        <td>click</td>
+        <td>css=.navigator-filter[title='Components: Any']</td>
+        <td></td>
     </tr>
     <tr>
-        <td>select</td>
-        <td>name=qualifiers[]</td>
-        <td>Files</td>
+        <td>click</td>
+        <td>css=label[title='Files']</td>
+        <td></td>
     </tr>
     <tr>
         <td>clickAndWait</td>
@@ -55,7 +55,7 @@
     </tr>
     <tr>
         <td>clickAndWait</td>
-        <td>link=Name</td>
+        <td>link=NAME</td>
         <td></td>
     </tr>
     <tr>
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/list_sort_by_ncloc.html b/it/it-tests/src/test/resources/measure/suite/measure_filters/list_sort_by_ncloc.html
index 95ef3b0deeb..cc630f35100 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/list_sort_by_ncloc.html
+++ b/it/it-tests/src/test/resources/measure/suite/measure_filters/list_sort_by_ncloc.html
@@ -34,14 +34,14 @@
     <td></td>
   </tr>
   <tr>
-    <td>waitForElementPresent</td>
-    <td>name=qualifiers[]</td>
-    <td></td>
+      <td>click</td>
+      <td>css=.navigator-filter[title='Components: Any']</td>
+      <td></td>
   </tr>
   <tr>
-    <td>select</td>
-    <td>name=qualifiers[]</td>
-    <td>Files</td>
+      <td>click</td>
+      <td>css=label[title='Files']</td>
+      <td></td>
   </tr>
   <tr>
     <td>clickAndWait</td>
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/list_widget.html b/it/it-tests/src/test/resources/measure/suite/measure_filters/list_widget.html
index 81695821706..f0d001840a9 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/list_widget.html
+++ b/it/it-tests/src/test/resources/measure/suite/measure_filters/list_widget.html
@@ -61,7 +61,7 @@
     </tr>
     <tr>
         <td>storeEval</td>
-        <td>window.location.pathname.split('/').last()</td>
+        <td>window.location.pathname.split('/')[4]</td>
         <td>FILTER_ID</td>
     </tr>
     <tr>
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/list_widget_sort.html b/it/it-tests/src/test/resources/measure/suite/measure_filters/list_widget_sort.html
index 82b5f7e6eea..c1024fc568f 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/list_widget_sort.html
+++ b/it/it-tests/src/test/resources/measure/suite/measure_filters/list_widget_sort.html
@@ -68,11 +68,16 @@
 	<td>class=navigator-filters</td>
 	<td>*More Criteria*</td>
 </tr>
-<tr>
-	<td>select</td>
-	<td>name=qualifiers[]</td>
-	<td>Files</td>
-</tr>
+    <tr>
+        <td>click</td>
+        <td>css=.navigator-filter[title='Components: Any']</td>
+        <td></td>
+    </tr>
+    <tr>
+        <td>click</td>
+        <td>css=label[title='Files']</td>
+        <td></td>
+    </tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>class=navigator-filter-submit</td>
@@ -100,7 +105,7 @@
 </tr>
 <tr>
 	<td>storeEval</td>
-	<td>window.location.pathname.split('/').last()</td>
+	<td>window.location.pathname.split('/')[4]</td>
 	<td>FILTER_ID</td>
 </tr>
 <tr>
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/save_with_special_characters.html b/it/it-tests/src/test/resources/measure/suite/measure_filters/save_with_special_characters.html
index 19b116782e9..6b023a1d9cc 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/save_with_special_characters.html
+++ b/it/it-tests/src/test/resources/measure/suite/measure_filters/save_with_special_characters.html
@@ -80,9 +80,9 @@
         <td>*description with special characters &quot; ' éà*</td>
     </tr>
     <tr>
-      <td>waitForElementPresent</td>
-      <td>id=manage-favorites</td>
-      <td></td>
+        <td>click</td>
+        <td>class=navigator-filter-favorite</td>
+        <td></td>
     </tr>
     <tr>
         <td>clickAndWait</td>
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/search-by-key.html b/it/it-tests/src/test/resources/measure/suite/measure_filters/search-by-key.html
index 50fce19e151..07c702e52c2 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/search-by-key.html
+++ b/it/it-tests/src/test/resources/measure/suite/measure_filters/search-by-key.html
@@ -34,18 +34,28 @@
     <td></td>
   </tr>
   <tr>
-    <td>waitForElementPresent</td>
-    <td>name=qualifiers[]</td>
+      <td>click</td>
+      <td>css=.navigator-filter[title='Components: Any']</td>
+      <td></td>
+  </tr>
+  <tr>
+      <td>click</td>
+      <td>css=label[title='Projects']</td>
+      <td></td>
+  </tr>
+  <tr>
+    <td>click</td>
+    <td>class=navigator-filter-more-criteria</td>
     <td></td>
   </tr>
   <tr>
-    <td>select</td>
-    <td>name=qualifiers[]</td>
-    <td>Projects</td>
+    <td>click</td>
+    <td>css=label[data-property='keySearch']</td>
+    <td></td>
   </tr>
   <tr>
     <td>type</td>
-    <td>name=keySearch</td>
+    <td>css=#filter-keySearch input[name='keySearch']</td>
     <td>multi-modules</td>
   </tr>
   <tr>
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/search-by-name.html b/it/it-tests/src/test/resources/measure/suite/measure_filters/search-by-name.html
index 2c4fb8c53d3..4eef059a3d6 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/search-by-name.html
+++ b/it/it-tests/src/test/resources/measure/suite/measure_filters/search-by-name.html
@@ -34,18 +34,28 @@
     <td></td>
   </tr>
   <tr>
-    <td>waitForElementPresent</td>
-    <td>name=qualifiers[]</td>
-    <td></td>
+      <td>click</td>
+      <td>css=.navigator-filter[title='Components: Any']</td>
+      <td></td>
+  </tr>
+  <tr>
+      <td>click</td>
+      <td>css=label[title='Projects']</td>
+      <td></td>
+  </tr>
+  <tr>
+      <td>click</td>
+      <td>class=navigator-filter-more-criteria</td>
+      <td></td>
   </tr>
   <tr>
-    <td>select</td>
-    <td>name=qualifiers[]</td>
-    <td>Projects</td>
+      <td>click</td>
+      <td>css=label[data-property='nameSearch']</td>
+      <td></td>
   </tr>
   <tr>
     <td>type</td>
-    <td>name=nameSearch</td>
+    <td>css=#filter-nameSearch input[name='nameSearch']</td>
     <td>Integration</td>
   </tr>
   <tr>
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/search_for_files.html b/it/it-tests/src/test/resources/measure/suite/measure_filters/search_for_files.html
index 4e001a597c9..a24b655b4b8 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/search_for_files.html
+++ b/it/it-tests/src/test/resources/measure/suite/measure_filters/search_for_files.html
@@ -14,14 +14,14 @@
     <td></td>
   </tr>
   <tr>
-    <td>waitForElementPresent</td>
-    <td>name=qualifiers[]</td>
-    <td></td>
+      <td>click</td>
+      <td>css=.navigator-filter[title='Components: Any']</td>
+      <td></td>
   </tr>
   <tr>
-    <td>select</td>
-    <td>name=qualifiers[]</td>
-    <td>Files</td>
+      <td>click</td>
+      <td>css=label[title='Files']</td>
+      <td></td>
   </tr>
   <tr>
     <td>clickAndWait</td>
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/search_for_projects.html b/it/it-tests/src/test/resources/measure/suite/measure_filters/search_for_projects.html
index c7c0e83bdb2..2dcb6f76233 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/search_for_projects.html
+++ b/it/it-tests/src/test/resources/measure/suite/measure_filters/search_for_projects.html
@@ -34,14 +34,14 @@
     <td></td>
   </tr>
   <tr>
-    <td>waitForElementPresent</td>
-    <td>name=qualifiers[]</td>
-    <td></td>
+      <td>click</td>
+      <td>css=.navigator-filter[title='Components: Any']</td>
+      <td></td>
   </tr>
   <tr>
-    <td>select</td>
-    <td>name=qualifiers[]</td>
-    <td>Projects</td>
+      <td>click</td>
+      <td>css=label[title='Projects']</td>
+      <td></td>
   </tr>
   <tr>
     <td>clickAndWait</td>
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/should-not-share-filter-when-user-have-no-sharing-permissions.html b/it/it-tests/src/test/resources/measure/suite/measure_filters/should-not-share-filter-when-user-have-no-sharing-permissions.html
index 94f85a0e3c5..5747fa0bf04 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/should-not-share-filter-when-user-have-no-sharing-permissions.html
+++ b/it/it-tests/src/test/resources/measure/suite/measure_filters/should-not-share-filter-when-user-have-no-sharing-permissions.html
@@ -44,14 +44,14 @@
 	<td></td>
 </tr>
 <tr>
-  <td>waitForElementPresent</td>
-  <td>name=qualifiers[]</td>
-  <td></td>
+    <td>click</td>
+    <td>css=.navigator-filter[title='Components: Any']</td>
+    <td></td>
 </tr>
 <tr>
-	<td>select</td>
-	<td>name=qualifiers[]</td>
-	<td>Projects</td>
+    <td>click</td>
+    <td>css=label[title='Projects']</td>
+    <td></td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/should-unshare-filter-remove-other-filters-favourite.html b/it/it-tests/src/test/resources/measure/suite/measure_filters/should-unshare-filter-remove-other-filters-favourite.html
index 8b6fb44c4e5..cafdec948d4 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/should-unshare-filter-remove-other-filters-favourite.html
+++ b/it/it-tests/src/test/resources/measure/suite/measure_filters/should-unshare-filter-remove-other-filters-favourite.html
@@ -44,14 +44,14 @@
 	<td></td>
 </tr>
 <tr>
-  <td>waitForElementPresent</td>
-  <td>name=qualifiers[]</td>
-  <td></td>
+    <td>click</td>
+    <td>css=.navigator-filter[title='Components: Any']</td>
+    <td></td>
 </tr>
 <tr>
-	<td>select</td>
-	<td>name=qualifiers[]</td>
-	<td>Projects</td>
+    <td>click</td>
+    <td>css=label[title='Projects']</td>
+    <td></td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
@@ -164,8 +164,8 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>id=manage-favorites</td>
+	<td>click</td>
+	<td>class=navigator-filter-favorite</td>
 	<td></td>
 </tr>
 <tr>