Fixes to element aligments and responsive design (#58)

* Fixed missaligned buttons in Add subscription modal

* Various changes to to alignments, responsive design and folder structure.

* Further fixes to responsive design

* Minor fix

* Hide navbar menu when clicking a link

* Fixed some testing errors

* Fix merge errors

* Fix Test Rules overlay

* Minor fix

Author: Christoffer-Cortes

src/functionaltest/java/com/ericsson/ei/frontend/SubscriptionHandlingFunctionality.java

@@ -52,15 +52,17 @@ public void testSubscription() throws Exception {
         // with names "Subscription1" and "Subscription2" are present AND there exists "edit" and
         // "delete buttons" for unauthorized user "ABCD"
         String response = this.getJSONStringFromFile(SUBSCRIPTION_FOR_RELOAD_TEST_FILE_PATH);
-        String deleteButtonXPath = "//tr[td[contains(.,'Subscription1')]]/td/button[contains(text(),'Delete')]";
-        String editButtonXPath = "//tr[td[contains(.,'Subscription1')]]/td/button[contains(text(),'Edit')]";
-        String viewButtonXPath = "//tr[td[contains(.,'Subscription1')]]/td/button[contains(text(),'View')]";
+        String viewButtonXPath = "(//button[@id='view-Subscription1'])[2]";
+        String editButtonXPath = "(//button[@id='edit-Subscription1'])[2]";
+        String deleteButtonXPath = "(//button[@id='delete-Subscription1'])[2]";
+        String expandButtonXPath = "//tr[contains(.,'Subscription1')]/td[1]";
         subscriptionPage.clickReload(response);
         assert (subscriptionPage.textExistsInTable("Subscription1"));
         assert (subscriptionPage.textExistsInTable("Subscription2"));
-        assert (subscriptionPage.buttonExist(deleteButtonXPath) == true);
-        assert (subscriptionPage.buttonExist(editButtonXPath) == true);
-        assert (subscriptionPage.buttonExist(viewButtonXPath) == true);
+        assert (subscriptionPage.clickElementByXPath(expandButtonXPath));
+        assert (subscriptionPage.buttonExist(deleteButtonXPath));
+        assert (subscriptionPage.buttonExist(editButtonXPath));
+        assert (subscriptionPage.buttonExist(viewButtonXPath));
 
         // Given LDAP is enabled, "Reload" subscriptions and then click subscription
         // page with LDAP enabled with unauthorized user names
@@ -69,9 +71,10 @@ public void testSubscription() throws Exception {
         String responseAuth = "{\"security\":true}";
         subscriptionPage.clickReloadLDAP(responseSub, responseAuth);
         indexPageObject.clickSubscriptionPage();
-        assert (subscriptionPage.buttonExist(deleteButtonXPath) == false);
-        assert (subscriptionPage.buttonExist(editButtonXPath) == false);
-        assert (subscriptionPage.buttonExist(viewButtonXPath) == true);
+        assert (subscriptionPage.clickElementByXPath(expandButtonXPath));
+        assert (!subscriptionPage.buttonExist(deleteButtonXPath));
+        assert (!subscriptionPage.buttonExist(editButtonXPath));
+        assert (subscriptionPage.buttonExist(viewButtonXPath));
 
         // Given LDAP is enabled, "Reload" subscriptions and then click subscription
         // page with LDAP enabled with both unauthorized and unauthorized user names (in
@@ -85,21 +88,24 @@ public void testSubscription() throws Exception {
         js.executeScript(String.format("window.localStorage.setItem('%s','%s');", keyForUser, valueForUser));
         indexPageObject.clickSubscriptionPage();
         assert (subscriptionPage.textExistsInTable("Subscription1"));
-        assert (subscriptionPage.buttonExist(deleteButtonXPath) == true);
-        assert (subscriptionPage.buttonExist(editButtonXPath) == true);
-        assert (subscriptionPage.buttonExist(viewButtonXPath) == true);
+        assert (subscriptionPage.clickElementByXPath(expandButtonXPath));
+        assert (subscriptionPage.buttonExist(deleteButtonXPath));
+        assert (subscriptionPage.buttonExist(editButtonXPath));
+        assert (subscriptionPage.buttonExist(viewButtonXPath));
 
         // Now, path for "subscriptions2" with user name "DEF", so user "ABCD" is
         // unauthorized for this subscription
-        String deleteButtonXPath2 = "//tr[td[contains(.,'Subscription2')]]/td/button[contains(text(),'Delete')]";
-        String editButtonXPath2 = "//tr[td[contains(.,'Subscription2')]]/td/button[contains(text(),'Edit')]";
-        String viewButtonXPath2 = "//tr[td[contains(.,'Subscription2')]]/td/button[contains(text(),'View')]";
-        assert (subscriptionPage.buttonExist(deleteButtonXPath2) == false);
-        assert (subscriptionPage.buttonExist(editButtonXPath2) == false);
-        assert (subscriptionPage.buttonExist(viewButtonXPath2) == true);
+        String viewButtonXPath2 = "(//button[@id='view-Subscription2'])[2]";
+        String editButtonXPath2 = "(//button[@id='edit-Subscription2'])[2]";
+        String deleteButtonXPath2 = "(//button[@id='delete-Subscription2'])[2]";
+        String expandButtonXPath2 = "//tr[contains(.,'Subscription2')]/td[1]";
+        assert (subscriptionPage.clickElementByXPath(expandButtonXPath2));
+        assert (subscriptionPage.buttonExist(viewButtonXPath2));
+        assert (!subscriptionPage.buttonExist(editButtonXPath2));
+        assert (!subscriptionPage.buttonExist(deleteButtonXPath2));
 
         // Test view button
-        subscriptionPage.clickViewBtn();
+        subscriptionPage.clickElementByXPath(viewButtonXPath2);
         assert (new WebDriverWait(driver, 10)
                 .until((webdriver) -> driver.getPageSource().contains("View Subscription")));
         subscriptionPage.clickFormCloseBtn();
@@ -112,8 +118,8 @@ public void testSubscription() throws Exception {
         // subscriptions are deleted
         String mockedDeleteResponse = "";
         subscriptionPage.clickBulkDelete(mockedDeleteResponse);
-        assert (subscriptionPage.textExistsInTable("Subscription1") == false);
-        assert (subscriptionPage.textExistsInTable("Subscription2") == false);
+        assert (!subscriptionPage.textExistsInTable("Subscription1"));
+        assert (!subscriptionPage.textExistsInTable("Subscription2"));
 
         // Verify that "get template" button works
         String mockedTemplateResponse = this.getJSONStringFromFile(SUBSCRIPTION_TEMPLATE_FILE_PATH);

src/functionaltest/java/com/ericsson/ei/frontend/pageobjects/SubscriptionPage.java

@@ -166,8 +166,8 @@ public void clickFormCloseBtn() {
 
     public String getSubscriptionNameFromSubscription() {
         new WebDriverWait(driver, TIMEOUT_TIMER)
-                .until(ExpectedConditions.elementToBeClickable(By.xpath("//tr[@class='odd']/td[2]")));
-        WebElement subscriptionNameElement = driver.findElement(By.xpath("//tr[@class='odd']/td[2]"));
+                .until(ExpectedConditions.elementToBeClickable(By.xpath("//tr[@class='odd']/td[3]")));
+        WebElement subscriptionNameElement = driver.findElement(By.xpath("//tr[@class='odd']/td[3]"));
         return subscriptionNameElement.getText();
     }
 
@@ -200,4 +200,14 @@ public boolean textExistsInTable(String txt) {
         }
         return true;
     }
+
+    public boolean clickElementByXPath(String loc) {
+        try {
+            new WebDriverWait(driver, TIMEOUT_TIMER).until(ExpectedConditions.elementToBeClickable(By.xpath(loc)));
+            driver.findElement(By.xpath(loc)).click();
+        } catch (Exception e) {
+            return false;
+        }
+        return true;
+    }
 }

src/functionaltest/java/com/ericsson/ei/frontend/pageobjects/TestRulesPage.java

@@ -89,37 +89,37 @@ public String getFirstRuleText() {
     }
 
     public String getFirstEventText() {
-        new WebDriverWait(driver, 10).until(ExpectedConditions.presenceOfElementLocated(By.id("Events2")));
+        new WebDriverWait(driver, TIMEOUT_TIMER).until(ExpectedConditions.presenceOfElementLocated(By.id("Events2")));
         WebElement textArea = driver.findElementsByClassName("formEvents").get(0);
         return textArea.getText().replaceAll("[\\n ]", "");
     }
 
     public void clickDownloadRulesButton() {
-        new WebDriverWait(driver, 10).until(ExpectedConditions.elementToBeClickable(By.className("download_rules")));
+        new WebDriverWait(driver, TIMEOUT_TIMER).until(ExpectedConditions.elementToBeClickable(By.className("download_rules")));
         WebElement downloadRulesButton = driver.findElement(By.className("download_rules"));
         downloadRulesButton.click();
     }
 
     public void clickAddRuleButton() {
-        new WebDriverWait(driver, 10).until(ExpectedConditions.presenceOfElementLocated(By.className("add_rule")));
+        new WebDriverWait(driver, TIMEOUT_TIMER).until(ExpectedConditions.presenceOfElementLocated(By.className("add_rule")));
         WebElement addRuleButton = driver.findElement(By.className("add_rule"));
         addRuleButton.click();
     }
 
     public void clickRemoveRuleNumber(int number) {
-        new WebDriverWait(driver, 10).until(ExpectedConditions.presenceOfElementLocated(By.id("Rule" + number)));
+        new WebDriverWait(driver, TIMEOUT_TIMER).until(ExpectedConditions.presenceOfElementLocated(By.id("Rule" + number)));
         WebElement removeRuleButton = driver.findElement(By.id("Rule" + number)).findElement(By.className("fa-trash"));
         removeRuleButton.click();
     }
 
     public void clickAddEventButton() {
-        new WebDriverWait(driver, 10).until(ExpectedConditions.elementToBeClickable(By.className("add_event")));
+        new WebDriverWait(driver, TIMEOUT_TIMER).until(ExpectedConditions.elementToBeClickable(By.className("add_event")));
         WebElement addEventButton = driver.findElement(By.className("add_event"));
         addEventButton.click();
     }
 
     public void clickRemoveEventNumber(int number) {
-        new WebDriverWait(driver, 10).until(ExpectedConditions.presenceOfElementLocated(By.id("Events" + number)));
+        new WebDriverWait(driver, TIMEOUT_TIMER).until(ExpectedConditions.presenceOfElementLocated(By.id("Events" + number)));
         WebElement removeEventButton = driver.findElement(By.id("Events" + number)).findElement(By.className("fa-trash"));
 
         // We need the following two lines in order to be sure that the remove event button is not obscured...
@@ -130,7 +130,7 @@ public void clickRemoveEventNumber(int number) {
     }
 
     public void clickFindAggregatedObject(String findAggregatedObjectResponse) throws IOException {
-        new WebDriverWait(driver, 10).until(ExpectedConditions.elementToBeClickable(By.className("find_aggregated_object")));
+        new WebDriverWait(driver, TIMEOUT_TIMER).until(ExpectedConditions.elementToBeClickable(By.className("find_aggregated_object")));
         CloseableHttpResponse response = this.createMockedHTTPResponse(findAggregatedObjectResponse, 200);
         Mockito.doReturn(response).when(mockedHttpClient).execute(Mockito.argThat(request ->
                 (request).getURI().toString().contains("/aggregation")));
@@ -140,7 +140,7 @@ public void clickFindAggregatedObject(String findAggregatedObjectResponse) throw
     }
 
     public String getAggregatedResultData() {
-        new WebDriverWait(driver, 10).until(ExpectedConditions.presenceOfElementLocated(By.id("aggregatedresultData")));
+        new WebDriverWait(driver, TIMEOUT_TIMER).until(ExpectedConditions.presenceOfElementLocated(By.id("aggregatedresultData")));
         WebElement aggregatedResultDataElement = driver.findElement(By.id("aggregatedresultData"));
         return aggregatedResultDataElement.getAttribute("textContent").replaceAll("[\\n ]", "");
     }