Fix accounts table reference, especially for tests
This commit is contained in:
File diff suppressed because one or more lines are too long
@@ -1,9 +1,9 @@
|
|||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<oc-table-simple>
|
<oc-table-simple id="accounts-user-list">
|
||||||
<oc-thead>
|
<oc-thead>
|
||||||
<oc-tr class="fix-table-header">
|
<oc-tr class="fix-table-header">
|
||||||
<oc-th shrink type="head" alignH="center">
|
<oc-th shrink type="head" align-h="center">
|
||||||
<oc-checkbox
|
<oc-checkbox
|
||||||
class="oc-ml-s"
|
class="oc-ml-s"
|
||||||
:value="areAllAccountsSelected"
|
:value="areAllAccountsSelected"
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<oc-tr>
|
<oc-tr>
|
||||||
<oc-td alignH="center">
|
<oc-td align-h="center">
|
||||||
<oc-checkbox
|
<oc-checkbox
|
||||||
class="oc-ml-s"
|
class="oc-ml-s"
|
||||||
size="large"
|
size="large"
|
||||||
@@ -44,7 +44,7 @@
|
|||||||
</ul>
|
</ul>
|
||||||
</oc-drop>
|
</oc-drop>
|
||||||
</oc-td>
|
</oc-td>
|
||||||
<oc-td alignH="center">
|
<oc-td align-h="center">
|
||||||
<oc-icon
|
<oc-icon
|
||||||
v-if="account.accountEnabled"
|
v-if="account.accountEnabled"
|
||||||
key="account-icon-enabled"
|
key="account-icon-enabled"
|
||||||
|
|||||||
@@ -104,15 +104,14 @@ module.exports = {
|
|||||||
selector: '#accounts-app'
|
selector: '#accounts-app'
|
||||||
},
|
},
|
||||||
accountsListTable: {
|
accountsListTable: {
|
||||||
selector: "//table[@class='uk-table uk-table-middle uk-table-divider']",
|
selector: '#accounts-user-list'
|
||||||
locateStrategy: 'xpath'
|
|
||||||
},
|
},
|
||||||
userInAccountsList: {
|
userInAccountsList: {
|
||||||
selector: '//table//td[text()="%s"]',
|
selector: '//table[@id="accounts-user-list"]//td[text()="%s"]',
|
||||||
locateStrategy: 'xpath'
|
locateStrategy: 'xpath'
|
||||||
},
|
},
|
||||||
rowByUsername: {
|
rowByUsername: {
|
||||||
selector: '//table//td[text()="%s"]/ancestor::tr',
|
selector: '//table[@id="accounts-user-list"]//td[text()="%s"]/ancestor::tr',
|
||||||
locateStrategy: 'xpath'
|
locateStrategy: 'xpath'
|
||||||
},
|
},
|
||||||
currentRole: {
|
currentRole: {
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ trap clean_up SIGHUP SIGINT SIGTERM
|
|||||||
if [ -z "$TEST_INFRA_DIRECTORY" ]
|
if [ -z "$TEST_INFRA_DIRECTORY" ]
|
||||||
then
|
then
|
||||||
cleanup=true
|
cleanup=true
|
||||||
testFolder=$(< /dev/urandom tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)
|
testFolder=$(< /dev/urandom LC_CTYPE=C tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)
|
||||||
printf "creating folder $testFolder for Test infrastructure setup\n\n"
|
printf "creating folder $testFolder for Test infrastructure setup\n\n"
|
||||||
export TEST_INFRA_DIRECTORY=$testFolder
|
export TEST_INFRA_DIRECTORY=$testFolder
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user