Skip to content

Commit b8a662d

Browse files
Simplifying mocha-test image building
1 parent c0f0abc commit b8a662d

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

selenium/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# syntax=docker/dockerfile:1
2-
FROM atools/jdk-maven-node:mvn3-jdk11-node16 as base
1+
FROM node:18 as base
32

43
WORKDIR /code
54

selenium/test/pageobjects/BasePage.js

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,12 +155,20 @@ module.exports = class BasePage {
155155
return this.getTableMiniUsingTableElement(table)
156156
}
157157
async getTableMiniUsingTableElement(table) {
158-
const rows = await table.findElements(By.css('tbody tr'))
158+
let tbody = await table.findElement(By.css('tbody'))
159+
let rows = await tbody.findElements(By.xpath("./child::*"))
160+
161+
console.log("getTableMiniUsingTableElement found " + rows.length + " rows")
159162
let table_model = []
160163
for (let row of rows) {
161164
let columnName = await row.findElement(By.css('th')).getText()
165+
console.log("getTableMiniUsingTableElement parsing column Name " + columnName )
166+
162167
let columnValue = await row.findElement(By.css('td'))
163-
let columnType = await columnValue.getTagName()
168+
let columnContent = await columnValue.findElement(By.xpath("./child::*"))
169+
170+
let columnType = await columnContent.getTagName()
171+
164172
switch (columnType) {
165173
case "table":
166174
table_model.push({
@@ -171,7 +179,7 @@ module.exports = class BasePage {
171179
default:
172180
table_model.push({
173181
"name" : columnName,
174-
"value" : await columnValue.getText()
182+
"value" : await columnContent.getText()
175183
})
176184
}
177185
}

selenium/test/pageobjects/QueuePage.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const QUEUE_NAME = By.css('div#main h1 b')
77

88
const DELETE_SECTION = By.css('div#main div#delete')
99
const DELETE_BUTTON = By.css('div#main div#delete input[type=submit]')
10-
const FEATURES = By.css('table#details-queue-table td#details-queue-features')
10+
const FEATURES = By.css('table#details-queue-table td#details-queue-features table.mini')
1111

1212
module.exports = class QueuePage extends BasePage {
1313
async isLoaded() {

0 commit comments

Comments
 (0)