Subscription improvements (#100)

* Default values for notification message is set to "Rest Post" and "Raw JSON Body".
* Default values for repeat is set to "False".
* Notification message and meta type is set using radio buttons where you select between the 2 oprions.
* The repeat is set using a checkbox covered by a sliding bar indicating On or Off.
* After switching back end the page is reloaded before the subscription page was loaded and back end list was updated, the later did not work well.
* Geckodriver for tests windows updated
* Added email validation when adding subscription
* logged in/ logged out status now updates and display correctly when switching back end.
* 2.5C is the best and by surefire recommended forkCount for 4 core CPUś pom updated.
* If switching back end fails, the gui will display the last used back end in list, so user do not believe the back end was switched.

Author: Anders Breid

pom.xml

@@ -152,7 +152,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.20</version>
         <configuration>
-          <forkCount>2C</forkCount>
+          <forkCount>2.5C</forkCount>
           <reuseForks>false</reuseForks>
           <useSystemClassLoader>false</useSystemClassLoader>
           <excludes>

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

@@ -53,19 +53,17 @@ public void testSubscriptionHandlingWithLDAPEnabled() throws Exception {
         // present AND there exists "edit" and" delete buttons" for unauthorized
         // user "ABCD"
         String response = getJSONStringFromFile(SUBSCRIPTION_FOR_RELOAD_TEST_FILE_PATH);
-        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.clickElementByXPath(expandButtonXPath));
-        assert (subscriptionPage.buttonExist(deleteButtonXPath));
-        assert (subscriptionPage.buttonExist(editButtonXPath));
-        assert (subscriptionPage.buttonExist(viewButtonXPath));
+        String expandButtonXPath = "//tr[contains(.,'Subscription1')]/td[1]";
+        String viewButtonXPath = "(//button[@id='view-Subscription1'])";
+        String editButtonXPath = "(//button[@id='edit-Subscription1'])";
+        String deleteButtonXPath = "(//button[@id='delete-Subscription1'])";
+        assert (subscriptionPage.clickExpandButtonByXPath(expandButtonXPath));
+        assert (subscriptionPage.buttonExistByXPath(deleteButtonXPath));
+        assert (subscriptionPage.buttonExistByXPath(editButtonXPath));
+        assert (subscriptionPage.buttonExistByXPath(viewButtonXPath));
 
         // Given LDAP is enabled, "Reload" subscriptions and then click
         // subscription page with LDAP enabled with unauthorized user names
@@ -76,10 +74,10 @@ public void testSubscriptionHandlingWithLDAPEnabled() throws Exception {
         subscriptionPage.clickReloadLDAP(responseSub, responseAuth);
         indexPageObject.clickSubscriptionPage();
 
-        assert (subscriptionPage.clickElementByXPath(expandButtonXPath));
-        assert (!subscriptionPage.buttonExist(deleteButtonXPath));
-        assert (!subscriptionPage.buttonExist(editButtonXPath));
-        assert (subscriptionPage.buttonExist(viewButtonXPath));
+        assert (subscriptionPage.clickExpandButtonByXPath(expandButtonXPath));
+        assert (!subscriptionPage.buttonExistByXPath(deleteButtonXPath));
+        assert (!subscriptionPage.buttonExistByXPath(editButtonXPath));
+        assert (subscriptionPage.buttonExistByXPath(viewButtonXPath));
 
         // Given LDAP is enabled, "Reload" subscriptions and then click
         // subscription page with LDAP enabled with both unauthorized and
@@ -95,25 +93,26 @@ public void testSubscriptionHandlingWithLDAPEnabled() throws Exception {
         indexPageObject.clickSubscriptionPage();
 
         assert (subscriptionPage.textExistsInTable("Subscription1"));
-        assert (subscriptionPage.clickElementByXPath(expandButtonXPath));
-        assert (subscriptionPage.buttonExist(deleteButtonXPath));
-        assert (subscriptionPage.buttonExist(editButtonXPath));
-        assert (subscriptionPage.buttonExist(viewButtonXPath));
+        assert (subscriptionPage.clickExpandButtonByXPath(expandButtonXPath));
+        assert (subscriptionPage.buttonExistByXPath(deleteButtonXPath));
+        assert (subscriptionPage.buttonExistByXPath(editButtonXPath));
+        assert (subscriptionPage.buttonExistByXPath(viewButtonXPath));
 
         // Now, path for "subscriptions2" with user name "DEF", so user "ABCD"
         // is unauthorized for this subscription
-        String viewButtonXPath2 = "(//button[@id='view-Subscription2'])[2]";
-        String editButtonXPath2 = "(//button[@id='edit-Subscription2'])[2]";
-        String deleteButtonXPath2 = "(//button[@id='delete-Subscription2'])[2]";
+        String viewButtonXPath2 = "(//button[@id='view-Subscription2'])";
+        String editButtonXPath2 = "(//button[@id='edit-Subscription2'])";
+        String deleteButtonXPath2 = "(//button[@id='delete-Subscription2'])";
         String expandButtonXPath2 = "//tr[contains(.,'Subscription2')]/td[1]";
 
-        assert (subscriptionPage.clickElementByXPath(expandButtonXPath2));
-        assert (subscriptionPage.buttonExist(viewButtonXPath2));
-        assert (!subscriptionPage.buttonExist(editButtonXPath2));
-        assert (!subscriptionPage.buttonExist(deleteButtonXPath2));
+        assert (subscriptionPage.clickExpandButtonByXPath(expandButtonXPath2));
+        assert (subscriptionPage.buttonExistByXPath(viewButtonXPath2));
+        subscriptionPage.clickViewButtonByXPath(viewButtonXPath2);
+        assert (!subscriptionPage.buttonExistByXPath(editButtonXPath2));
+        assert (!subscriptionPage.buttonExistByXPath(deleteButtonXPath2));
 
         // Test view button
-        subscriptionPage.clickElementByXPath(viewButtonXPath2);
+        subscriptionPage.clickViewButtonByXPath(viewButtonXPath2);
         assert (new WebDriverWait(driver, 10)
                 .until((webdriver) -> driver.getPageSource().contains("View Subscription")));
         subscriptionPage.clickFormCloseBtn();
@@ -163,29 +162,34 @@ public void testSubscriptionHandlingWithLDAPEnabled() throws Exception {
         // On subscription form, select the template as "Mail Trigger" and
         // verify
         String selectID = "selectTemplate";
+        String mailRadioID = "mailRadio";
+        String notificationMetaInputID = "notificationMeta";
         String tempMail = "Mail Trigger";
         subscriptionPage.selectDropdown(selectID, tempMail);
-        assert (new WebDriverWait(driver, 10)
-                .until((webdriver) -> (subscriptionPage.getValueFromSelect().equals("MAIL"))));
-        assert (new WebDriverWait(driver, 10)
-                .until((webdriver) -> (subscriptionPage.getValueFromElement().equals("mymail@company.com"))));
+        assert (subscriptionPage.isRadioCheckboxSelected(mailRadioID));
+        assertEquals ("mymail@company.com", subscriptionPage.getValueFromElement(notificationMetaInputID));
 
         // On subscription form, select the template as "REST POST (Raw
         // Body:JSON)" and verify
         String tempPost = "REST POST (Raw Body : JSON)";
+        String restPostRadio = "restPostRadio";
+        String keyValueRadio = "keyValueRadio";
+        String appJsonRadio = "appJsonRadio";
         subscriptionPage.selectDropdown(selectID, tempPost);
-        assert (new WebDriverWait(driver, 10)
-                .until((webdriver) -> (subscriptionPage.getValueFromSelect().equals("REST_POST"))));
-        assert (new WebDriverWait(driver, 10).until(
-                (webdriver) -> (subscriptionPage.getValueFromElement().equals("http://<MyHost:port>/api/doit"))));
+        assert (subscriptionPage.isRadioCheckboxSelected(restPostRadio));
+        assert (subscriptionPage.isRadioCheckboxSelected(appJsonRadio));
+        assert (!subscriptionPage.isRadioCheckboxSelected(keyValueRadio));
+        assertEquals ("http://<MyHost:port>/api/doit", subscriptionPage.getValueFromElement(notificationMetaInputID));
 
         // On subscription form, select the template as "Jenkins Pipeline
-        // Parameterized Job Trigger" and verify
+        // Parameterized Job Trigger" and verify RawBody unselected.
         String tempJenkins = "Jenkins Pipeline Parameterized Job Trigger";
         subscriptionPage.selectDropdown(selectID, tempJenkins);
-        assertEquals("REST_POST", subscriptionPage.getValueFromSelect());
+        assert (subscriptionPage.isRadioCheckboxSelected(restPostRadio));
+        assert (subscriptionPage.isRadioCheckboxSelected(keyValueRadio));
+        assert (!subscriptionPage.isRadioCheckboxSelected(appJsonRadio));
         assertEquals("http://<JenkinsHost:port>/job/<JobName>/job/<branch>/build",
-                subscriptionPage.getValueFromElement());
+                subscriptionPage.getValueFromElement(notificationMetaInputID));
 
         // Choose Authorization as "Basic_AUTH" ===> input User Name as "ABCD"
         // and Token as "EFGH" ===> click "Generate Key/Value Pair", verify the
@@ -196,43 +200,37 @@ public void testSubscriptionHandlingWithLDAPEnabled() throws Exception {
         String userNameID = "userNameInput";
         String password = "password";
         String passwordID = "passwordInput";
-        String subName = "Selenium_test_subscription";
-        String subNameID = "subscriptionNameInput";
-        String selectRepeatID = "selectRepeat";
-        String repeatValue = "true";
-        String conditionFieldID = "conditionID";
-        String requirementFieldID = "requirementID";
-
         subscriptionPage.selectDropdown(selectAuthID, authValue);
         subscriptionPage.addFieldValue(userNameID, userName);
         subscriptionPage.addFieldValue(passwordID, password);
 
         assert (new WebDriverWait(driver, 10).until((webdriver) -> driver.getPageSource().contains("ABCD")));
         assert (new WebDriverWait(driver, 10).until((webdriver) -> driver.getPageSource().contains("password")));
 
-        // Test "Repeat" dropdown: Select repeat value as "true" and then verify the selected value
-        subscriptionPage.selectDropdown(selectRepeatID, repeatValue);
-        assert (new WebDriverWait(driver, 10)
-              .until((webdriver) -> (subscriptionPage.getValueFromSelectRepeat().equals(repeatValue))));
+        // Test "Repeat" checkbox: verify unchecked, then checked.
+        // NOTE: repeat checkbox is covered by a span, we click span
+        String checkboxRepeatID = "repeatCheckbox";
+        String spanId = "repeatCheckboxSpan";
+        assert (!subscriptionPage.isCheckboxSelected(checkboxRepeatID));
+        subscriptionPage.clickSpanAroundCheckbox(checkboxRepeatID, spanId);
+        assert (subscriptionPage.isCheckboxSelected(checkboxRepeatID));
 
         // Test "Add Condition" button: click add condition button and check that it adds an additional "condition" field
+        String conditionFieldID = "conditionID";
         subscriptionPage.clickAddConditionBtn();
         assertEquals(2, subscriptionPage.countElements(conditionFieldID));
 
         // Test "Add Requirement" button: click the button and assert that it adds an additional "requirement" field
+        String requirementFieldID = "requirementID";
         subscriptionPage.clickAddRequirementBtn();
         assertEquals(2, subscriptionPage.countElements(requirementFieldID));
 
-        // Test "Repeat" dropdown: Select repeat value as "true" and then verify
-        // the selected value
-        subscriptionPage.selectDropdown(selectRepeatID, repeatValue);
-        assert (new WebDriverWait(driver, 10)
-                .until((webdriver) -> (subscriptionPage.getValueFromSelectRepeat().equals(repeatValue))));
-
         // Test save subscription form: add subscription name
         // as "selenium_test_subscription" and then click "save" button
         // verification that subscription is added in the datatable (and is
         // displayed on the main page)
+        String subName = "Selenium_test_subscription";
+        String subNameID = "subscriptionNameInput";
         String responseSave = getJSONStringFromFile(SUBSCRIPTION_FOR_SAVE_TEST_FILE_PATH);
         subscriptionPage.addFieldValue(subNameID, subName);
         subscriptionPage.clickFormsSaveBtn(responseSave);

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

@@ -101,25 +101,48 @@ public void selectDropdown(String loc, String value) {
         dropdown.selectByVisibleText(value);
     }
 
-    public String getValueFromSelect() {
+    public boolean isRadioCheckboxSelected(String id) {
         new WebDriverWait(driver, TIMEOUT_TIMER)
-                .until(ExpectedConditions.elementToBeClickable(By.id("notificationType")));
-        WebElement selectNotificationType = driver.findElement(By.id("notificationType"));
-        Select dropdown = new Select(selectNotificationType);
-        return dropdown.getFirstSelectedOption().getText();
+                .until(ExpectedConditions.elementToBeClickable(By.id(id)));
+        WebElement checkbox = driver.findElement(By.id(id));
+        boolean radioBtnIsSelected = checkbox.isSelected();
+        return radioBtnIsSelected;
+    }
+
+    public boolean isCheckboxSelected(String id) {
+        new WebDriverWait(driver, TIMEOUT_TIMER)
+                .until(ExpectedConditions.presenceOfElementLocated(By.id(id)));
+        WebElement checkbox = driver.findElement(By.id(id));
+        boolean isSelected = checkbox.isSelected();
+        return isSelected;
+    }
+
+    public void clickSpanAroundCheckbox(String id, String spanId) {
+        new WebDriverWait(driver, TIMEOUT_TIMER)
+                .until(ExpectedConditions.presenceOfElementLocated(By.id(id)));
+        new WebDriverWait(driver, TIMEOUT_TIMER)
+                .until(ExpectedConditions.presenceOfElementLocated(By.id(spanId)));
+
+        WebElement checkbox = driver.findElement(By.id(id));
+        WebElement span = driver.findElement(By.id(spanId));
+
+        span.click();
+
+        new WebDriverWait(driver, TIMEOUT_TIMER)
+                .until(ExpectedConditions.elementSelectionStateToBe(checkbox, true));
     }
-    
-    public String getValueFromSelectRepeat() {
+
+    public String getValueFromSelect(String id) {
         new WebDriverWait(driver, TIMEOUT_TIMER)
-                .until(ExpectedConditions.elementToBeClickable(By.id("selectRepeat")));
-        WebElement selectNotificationType = driver.findElement(By.id("selectRepeat"));
+                .until(ExpectedConditions.elementToBeClickable(By.id(id)));
+        WebElement selectNotificationType = driver.findElement(By.id(id));
         Select dropdown = new Select(selectNotificationType);
         return dropdown.getFirstSelectedOption().getText();
     }
 
-    public String getValueFromElement() {
-        new WebDriverWait(driver, TIMEOUT_TIMER).until(ExpectedConditions.elementToBeClickable(By.id("metaData")));
-        WebElement metaTxt = driver.findElement(By.id("metaData"));
+    public String getValueFromElement(String id) {
+        new WebDriverWait(driver, TIMEOUT_TIMER).until(ExpectedConditions.elementToBeClickable(By.id(id)));
+        WebElement metaTxt = driver.findElement(By.id(id));
         return metaTxt.getAttribute("value");
     }
 
@@ -172,13 +195,13 @@ public void clickFormCloseBtn() {
         WebElement viewBtn = driver.findElement(By.className("close"));
         viewBtn.click();
     }
-    
+
     public void clickAddConditionBtn() {
         new WebDriverWait(driver, TIMEOUT_TIMER).until(ExpectedConditions.elementToBeClickable(By.id("addCondition")));
         WebElement viewBtn = driver.findElement(By.id("addCondition"));
         viewBtn.click();
     }
-    
+
     public void clickAddRequirementBtn(){
         new WebDriverWait(driver, TIMEOUT_TIMER).until(ExpectedConditions.elementToBeClickable(By.id("addRequirement")));
         WebElement viewBtn = driver.findElement(By.id("addRequirement"));
@@ -192,15 +215,34 @@ public String getSubscriptionNameFromSubscription() {
         return subscriptionNameElement.getText();
     }
 
-    public boolean buttonExist(String loc) {
+    public boolean expandButtonExist(String XPath) {
         try {
-            new WebDriverWait(driver, TIMEOUT_TIMER).until(ExpectedConditions.elementToBeClickable(By.xpath(loc)));
+            new WebDriverWait(driver, TIMEOUT_TIMER).until(ExpectedConditions.elementToBeClickable(By.xpath(XPath)));
         } catch (Exception e) {
             return false;
         }
         return true;
     }
 
+    public boolean buttonExistByXPath(String XPath) {
+        // The row indicates weather or not the del / view and edit buttons has moved down to
+        // next row.
+        String findInRow;
+        try {
+            findInRow = "[2]";
+            new WebDriverWait(driver, TIMEOUT_TIMER).until(ExpectedConditions.elementToBeClickable(By.xpath(XPath + findInRow)));
+            return true;
+        } catch (Exception e) {
+        }
+        try {
+            findInRow = "[1]";
+            new WebDriverWait(driver, TIMEOUT_TIMER).until(ExpectedConditions.elementToBeClickable(By.xpath(XPath + findInRow)));
+            return true;
+        } catch (Exception e) {
+        }
+        return false;
+    }
+
     public void clickReloadLDAP(String response, String responseAuth) throws IOException {
         CloseableHttpResponse responseData = this.createMockedHTTPResponse(response, 200);
         CloseableHttpResponse responseDataAuth = this.createMockedHTTPResponse(responseAuth, 200);
@@ -222,17 +264,41 @@ public boolean textExistsInTable(String txt) {
         return true;
     }
 
-    public boolean clickElementByXPath(String loc) {
+    public boolean clickExpandButtonByXPath(String loc) {
         try {
-            new WebDriverWait(driver, TIMEOUT_TIMER).until(ExpectedConditions.elementToBeClickable(By.xpath(loc)));
-            driver.findElement(By.xpath(loc)).click();
+            if (expandButtonExist(loc)) {
+                new WebDriverWait(driver, TIMEOUT_TIMER).until(ExpectedConditions.elementToBeClickable(By.xpath(loc)));
+                driver.findElement(By.xpath(loc)).click();
+            } else {
+                return true;
+            }
         } catch (Exception e) {
             return false;
         }
         return true;
     }
-    
+
     public int countElements(String id) {
-    	return driver.findElements(By.id(id)).size();   	
+    	return driver.findElements(By.id(id)).size();
     }
+
+    public void clickViewButtonByXPath(String XPath) {
+        // The row indicates weather or not the del / view and edit buttons has moved down to
+        // next row.
+        try {
+            String Xpath2 = XPath + "[2]";
+            new WebDriverWait(driver, TIMEOUT_TIMER).until(ExpectedConditions.elementToBeClickable(By.xpath(Xpath2)));
+            driver.findElement(By.xpath(Xpath2)).click();
+            return;
+        } catch (Exception e) {
+        }
+        try {
+            String Xpath1 = XPath + "[1]";
+            new WebDriverWait(driver, TIMEOUT_TIMER).until(ExpectedConditions.elementToBeClickable(By.xpath(Xpath1)));
+            driver.findElement(By.xpath(Xpath1)).click();
+            return;
+        } catch (Exception e) {
+        }
+    }
+
 }