SONAR-9254 Move projects facets sorting to the topbar of the projects page

3 files changed, 24 insertions, 24 deletions

diff --git a/it/it-tests/src/test/java/it/projectSearch/ProjectsPageTest.java b/it/it-tests/src/test/java/it/projectSearch/ProjectsPageTest.java
index 45dceeac2c6..ee9024db54e 100644
--- a/it/it-tests/src/test/java/it/projectSearch/ProjectsPageTest.java
+++ b/it/it-tests/src/test/java/it/projectSearch/ProjectsPageTest.java
@@ -146,11 +146,9 @@ public class ProjectsPageTest {
   @Test
   public void should_sort_by_facet() {
     ProjectsPage page = nav.openProjects();
-    page.getFacetByProperty("duplications")
-      .sortListDesc();
+    page.sortProjects("Duplications");
     page.getProjectByIdx(0).shouldHaveMeasure("duplicated_lines_density", "63.7%");
-    page.getFacetByProperty("duplications")
-      .sortListAsc();
+    page.invertSorting();
     page.getProjectByIdx(0).shouldHaveMeasure("duplicated_lines_density", "0.0%");
   }
 
diff --git a/it/it-tests/src/test/java/pageobjects/projects/FacetItem.java b/it/it-tests/src/test/java/pageobjects/projects/FacetItem.java
index 528cb3c2505..52f0f5bb70f 100644
--- a/it/it-tests/src/test/java/pageobjects/projects/FacetItem.java
+++ b/it/it-tests/src/test/java/pageobjects/projects/FacetItem.java
@@ -48,24 +48,4 @@ public class FacetItem {
     selectInput.pressEnter();
     return this;
   }
-
-  private SelenideElement getSortingButton(String selector) {
-    ElementsCollection buttons = this.elt.$$(".projects-facet-sort a");
-    return buttons.find(new Condition("AttributeMatch") {
-      @Override
-      public boolean apply(WebElement webElement) {
-        return webElement.getAttribute("href").matches(".*sort=" + selector + ".*");
-      }
-    });
-  }
-
-  public FacetItem sortListDesc() {
-    this.getSortingButton("-").click();
-    return this;
-  }
-
-  public FacetItem sortListAsc() {
-    this.getSortingButton("[a-zA-Z ]").click();
-    return this;
-  }
 }
diff --git a/it/it-tests/src/test/java/pageobjects/projects/ProjectsPage.java b/it/it-tests/src/test/java/pageobjects/projects/ProjectsPage.java
index de3b50834fa..2395f837b7f 100644
--- a/it/it-tests/src/test/java/pageobjects/projects/ProjectsPage.java
+++ b/it/it-tests/src/test/java/pageobjects/projects/ProjectsPage.java
@@ -89,4 +89,26 @@ public class ProjectsPage {
     searchInput.setValue("").sendKeys(search);
     return this;
   }
+
+  public ProjectsPage sortProjects(String sort) {
+    SelenideElement topbar = $(".projects-topbar-actions").should(Condition.exist);
+    if (!topbar.has(Condition.hasClass("open"))){
+      $(".js-projects-topbar-open").click();
+    }
+    topbar.should(Condition.hasClass("open"));
+    SelenideElement sortSelect = topbar.$(".js-projects-sorting-select");
+    sortSelect.$(".Select-value").should(Condition.exist).click();
+    sortSelect.$(".Select-option[title='" + sort + "']").should(Condition.exist).click();
+    return this;
+  }
+
+  public ProjectsPage invertSorting() {
+    SelenideElement topbar = $(".projects-topbar-actions").should(Condition.exist);
+    if (!topbar.has(Condition.hasClass("open"))){
+      $(".js-projects-topbar-open").click();
+    }
+    topbar.should(Condition.hasClass("open"));
+    topbar.$(".js-projects-sorting-select a.button-icon").should(Condition.exist).click();
+    return this;
+  }
 }