Test virtual hosts and select tags column

(cherry picked from commit 175abbf)

Author: MarcialRosales

selenium/test/pageobjects/BasePage.js

@@ -151,7 +151,9 @@ module.exports = class BasePage {
       let columns = await row.findElements(By.css('td'))
       let table_row = []
       for (let column of columns) {
-        if (table_row.length < firstNColumns) table_row.push(await column.getText())
+        if (firstNColumns == undefined || table_row.length < firstNColumns) {
+          table_row.push(await column.getText())
+        }
       }
       table_model.push(table_row)
     }
@@ -227,6 +229,7 @@ module.exports = class BasePage {
     return table_model
   }
   async selectTableColumnsById(arrayOfColumnsIds) {
+    await this.clickOnSelectTableColumns()
     const table = await this.waitForDisplayed(TABLE_COLUMNS_POPUP)
     for (let id of arrayOfColumnsIds) {
       let checkbox = await table.findElement(By.css('tbody tr input#'+id))

selenium/test/pageobjects/VhostsAdminTab.js

@@ -17,7 +17,7 @@ module.exports = class VhostsAdminTab extends AdminTab {
   }
   async searchForVhosts(vhost, regex = false) {
     await this.sendKeys(FILTER_VHOST, vhost)
-    await this.sendKeys(FILTER_VHOST, Key.RETURN)
+    //await this.sendKeys(FILTER_VHOST, Key.RETURN)
     if (regex) {
       await this.click(CHECKBOX_REGEX)
     }
@@ -31,7 +31,7 @@ module.exports = class VhostsAdminTab extends AdminTab {
      const links = await vhost_rows.findElements(By.css("td a"))
      for (let link of links) {
        let text = await link.getText()
-       if ( text === "/" ) return link.click()
+       if ( text === vhost ) return link.click()
      }
      throw "Vhost " + vhost + " not found"
   }

selenium/test/utils.js

@@ -135,16 +135,16 @@ module.exports = {
     let ret
     do {
       try {
-        console.log("Calling doCallback (attempts:" + attempts + ") ... ")
+        //console.log("Calling doCallback (attempts:" + attempts + ") ... ")
         ret = await doCallback()
-        console.log("Calling booleanCallback (attempts:" + attempts + ") with arg " + ret + " ... ")
+        //console.log("Calling booleanCallback (attempts:" + attempts + ") with arg " + ret + " ... ")
         done =  booleanCallback(ret)
       }catch(error) {
         console.log("Caught " + error + " on doWhile callback...")
 
       }finally {
         if (!done) {
-          console.log("Waiting until next attempt")
+          //console.log("Waiting until next attempt")
           await module.exports.delay(delayMs)
         }
       }     

selenium/test/vhosts/admin-vhosts.js

@@ -47,12 +47,16 @@ describe('Virtual Hosts in Admin tab', function () {
     }
     assert.equal("/", await vhostTab.getName())
   })
+    
   it('vhost selectable columns', async function () {  
     await overview.clickOnOverviewTab()
     await overview.clickOnAdminTab()
     await adminTab.clickOnVhosts()
+    await vhostsTab.searchForVhosts("/")
     await doWhile(async function() { return vhostsTab.getVhostsTable() },
-      function(table) { return table.length>1 })
+      function(table) { 
+        return table.length>0
+      })
 
     await vhostsTab.clickOnSelectTableColumns()
     let table = await vhostsTab.getSelectableTableColumns()
@@ -107,16 +111,18 @@ describe('Virtual Hosts in Admin tab', function () {
     })
     it('vhost is listed with tag', async function () {  
       log("Searching for vhost " + vhost)
-      await doWhile(async function() { return vhostsTab.searchForVhosts(vhost) },
+      await vhostsTab.searchForVhosts(vhost)
+      await doWhile(async function() { return vhostsTab.getVhostsTable()},
       function(table) { 
-        return table.length==1 && table[1][0].localeCompare(vhost)
+        log("table: "+ JSON.stringify(table) + " table[0][0]:" + table[0][0])
+        return table.length==1 && table[0][0].localeCompare(vhost) == 0
       })
       log("Found vhost " + vhost)
       await vhostsTab.selectTableColumnsById(["checkbox-vhosts-tags"])
 
       await doWhile(async function() { return vhostsTab.getVhostsTable() },
       function(table) { 
-        return table.length==1 && table[1][3].localeCompare("selenium-tag")
+        return table.length==1 && table[0][3].localeCompare("selenium-tag") == 0
       })
 
     })