Select columns of vhosts

(cherry picked from commit 7003fef)

Author: MarcialRosales

deps/rabbitmq_management/priv/www/js/tmpl/popup.ejs

@@ -2,5 +2,5 @@
   <%= text %>
   <br/>
   <br/>
-  <span>Close</span>
+  <span id="close">Close</span>
 </div>

selenium/test/pageobjects/BasePage.js

@@ -14,7 +14,10 @@ const ADMIN_TAB = By.css('div#menu ul#tabs li#admin')
 const STREAM_CONNECTIONS_TAB = By.css('div#menu ul#tabs li#stream-connections')
 
 const FORM_POPUP = By.css('div.form-popup-warn')
-const FORM_POPUP_CLOSE_BUTTON = By.css('div.form-popup-warn span')
+const FORM_POPUP_CLOSE_BUTTON = By.css('div.form-popup-warn span#close')
+
+const ADD_MINUS_BUTTON = By.css('div#main table.list thead tr th.plus-minus')
+const TABLE_COLUMNS_POPUP = By.css('div.form-popup-options table.form')
 
 module.exports = class BasePage {
   driver
@@ -136,6 +139,7 @@ module.exports = class BasePage {
   }
 
 
+
   async getTable(tableLocator, firstNColumns, rowClass) {
     const table = await this.waitForDisplayed(tableLocator)
     const rows = await table.findElements(rowClass == undefined ? 
@@ -199,6 +203,32 @@ module.exports = class BasePage {
   async closePopupWarning() {
     return this.click(FORM_POPUP_CLOSE_BUTTON)
   }
+  async clickOnSelectTableColumns() {
+    return this.click(ADD_MINUS_BUTTON)
+  }
+  async getSelectableTableColumns() {
+    const table = await this.waitForDisplayed(TABLE_COLUMNS_POPUP)
+    const rows = await table.findElements(By.css('tbody tr'))
+    let table_model = []
+    console.log("Found "+ rows.length + " rows")
+    for (let i = 1; i < rows.length; i++) { // skip first row      
+      let groupNameLabel = await rows[i].findElement(By.css('th label'))
+      let groupName = await groupNameLabel.getText()
+      console.log("Found group "+ groupName )
+      let columns = await rows[i].findElements(By.css('td label'))
+      let table_row = []
+      console.log("Found "+ columns.length + " columns")
+      for (let column of columns) {
+        let checkbox = await column.findElement(By.css('input'))
+        table_row.push({"name:" : await column.getText(), "id" : await checkbox.getAttribute("id")})
+      }
+      let group = {"name": groupName, "columns": table_row}
+      console.log("Add group " + group)
+      table_model.push(group)
+    }
+    return table_model
+  }
+
   async isDisplayed(locator) {
       try {
         let element = await driver.findElement(locator)

selenium/test/pageobjects/VhostsAdminTab.js

@@ -10,9 +10,6 @@ const CHECKBOX_REGEX = By.css('div#main div.filter input#filter-regex-mode')
 
 const VHOSTS_TABLE_ROWS = By.css('div#main table.list tbody tr')
 const TABLE_SECTION = By.css('div#main table.list')
-const ADD_MINUS_BUTTON = By.css('div#main table.list thead tr th.plus-minus')
-
-const TABLE_COLUMNS_POPUP = By.css('div.form-popup-options')
 
 module.exports = class VhostsAdminTab extends AdminTab {
   async isLoaded () {
@@ -41,10 +38,5 @@ module.exports = class VhostsAdminTab extends AdminTab {
   async getVhostsTable(firstNColumns) {
     return this.getTable(TABLE_SECTION, firstNColumns)
   }
-  async clickOnSelectColumns() {
-    return this.click(ADD_MINUS_BUTTON)
-  }
-  async getSelectableTableColumns() {
-    return this.waitForDisplayed(TABLE_COLUMNS_POPUP)
-  }
+
 }

selenium/test/utils.js

@@ -68,10 +68,10 @@ module.exports = {
         'enable-automation',
       ],
       prefs: {
-        'profile.managed_default_content_settings.popups' : 2,
-        'profile.managed_default_content_settings.notifications' : 2,
+        'profile.password_manager_enabled' : false      
       },
       args: [
+          "--guest",
           "disable-infobars",
           "--disable-notifications",
           "--lang=en",

selenium/test/vhosts/admin-vhosts.js

@@ -29,7 +29,7 @@ describe('Virtual Hosts in Admin tab', function () {
     if (!await overview.isLoaded()) {
       throw new Error('Failed to login')
     }
-
+    await overview.selectRefreshOption("Do not refresh")
   })
 
   it('find default vhost', async function () {
@@ -38,6 +38,7 @@ describe('Virtual Hosts in Admin tab', function () {
     assert.equal(true, await vhostsTab.hasVhosts("/"))
   })
   it('find default vhost and view it', async function () {
+    await overview.clickOnOverviewTab()
     await overview.clickOnAdminTab()
     await adminTab.clickOnVhosts()
     await vhostsTab.clickOnVhost(await vhostsTab.searchForVhosts("/"), "/")
@@ -46,25 +47,42 @@ 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.clickOnSelectTableColumns()
+    let table = await vhostsTab.getSelectableTableColumns()
+    log("Table: " + table)
+    await doWhile(async function() {
+      return vhostsTab.getVhostsTable()
+    }, function(table) {
+      return table.length > 0 && vhost.localeCompare(table[0][0])      
+    })
+  })
   describe('given there is a new virtualhost with a tag', async function() {
     let vhost = "test_" + Math.floor(Math.random() * 1000)
     before(async function() {
+      log("Creating vhost")
       createVhost(getManagementUrl(), vhost, "selenium", "selenium-tag")
+      await overview.clickOnOverviewTab()
       await overview.clickOnAdminTab()
-      await adminTab.clickOnVhosts()      
+      await adminTab.clickOnVhosts()
     })
-    it('vhost is listed', async function () {      
-      await vhostsTab.searchForVhosts(vhost)
+    it('vhost is listed with tag', async function () {  
+      log("Searching for vhost")
+      await vhostsTab.searchForVhosts(vhost)      
+      await vhostsTab.clickOnSelectTableColumns()
+      let table = vhostsTab.getSelectableTableColumns()
+      log("Table: " + table)
       await doWhile(async function() {
         return vhostsTab.getVhostsTable()
       }, function(table) {
-        return table.length > 0 && vhost.localeCompare(table[0][0])        
+        return table.length > 0 && vhost.localeCompare(table[0][0])      
       })
-      await vhostsTab.clickOnSelectColumns()
-      await vhostsTab.getSelectableTableColumns()
     })
     after(async function () {
+      log("Deleting vhost")
       deleteVhost(getManagementUrl(), vhost)
     })