Skip to content

Commit 4231ea7

Browse files
MarcialRosalesmergify[bot]
authored andcommitted
Select tags column on vhosts table
(cherry picked from commit 1ab81f7)
1 parent e308af1 commit 4231ea7

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

selenium/test/pageobjects/VhostsAdminTab.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ const CHECKBOX_REGEX = By.css('div#main div.filter input#filter-regex-mode')
1010

1111
const VHOSTS_TABLE_ROWS = By.css('div#main table.list tbody tr')
1212
const TABLE_SECTION = By.css('div#main table.list')
13+
const ADD_MINUS_BUTTON = By.css('div#main table.list thead tr th.plus-minus')
14+
15+
const TABLE_COLUMNS_POPUP = By.css('div.form-popup-options')
1316

1417
module.exports = class VhostsAdminTab extends AdminTab {
1518
async isLoaded () {
@@ -38,4 +41,10 @@ module.exports = class VhostsAdminTab extends AdminTab {
3841
async getVhostsTable(firstNColumns) {
3942
return this.getTable(TABLE_SECTION, firstNColumns)
4043
}
44+
async clickOnSelectColumns() {
45+
return this.click(ADD_MINUS_BUTTON)
46+
}
47+
async getSelectableTableColumns() {
48+
return this.waitForDisplayed(TABLE_COLUMNS_POPUP)
49+
}
4150
}

selenium/test/vhosts/admin-vhosts.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,13 @@ describe('Virtual Hosts in Admin tab', function () {
5656
})
5757
it('vhost is listed', async function () {
5858
await vhostsTab.searchForVhosts(vhost)
59-
let vhostTable = await doWhile(async function() {
59+
await doWhile(async function() {
6060
return vhostsTab.getVhostsTable()
6161
}, function(table) {
6262
return table.length > 0 && vhost.localeCompare(table[0][0])
6363
})
64-
log("vhostTable: " + vhostTable)
64+
await vhostsTab.clickOnSelectColumns()
65+
await vhostsTab.getSelectableTableColumns()
6566
})
6667
after(async function () {
6768
deleteVhost(getManagementUrl(), vhost)

0 commit comments

Comments
 (0)