Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WEBUI-1620: fix ftest features for cft browser 131 using nuxeo table (authorized app.feature) lts 2021 #2411

Merged
merged 1 commit into from
Jan 9, 2025
Merged

WEBUI-1620: fix ftest features for cft browser 131 using nuxeo table (authorized app.feature) lts 2021 #2411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/nuxeo-web-ui-ftest/features/step_definitions/user_settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Then(/^I can revoke access for "(.+)" application$/, async function(appName) {
const appRevoke = await authPage.getApps(appName);
appRevoke.length.should.equal(1);
const app = await appRevoke[0];
const revokeButton = await app.revokeButton();
const revokeButton = await authPage.revokeButton(app, appName);
await revokeButton.waitForVisible();
await revokeButton.click();
await driver.alertAccept();
Expand Down
60 changes: 25 additions & 35 deletions packages/nuxeo-web-ui-ftest/pages/ui/oauth2/user_authorized_apps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,55 +1,45 @@
/* eslint-disable no-await-in-loop */
import BasePage from '../../base';

class AuthorizedApp {
constructor(element) {
this.el = element;
}

get name() {
return (async () => {
const eles = await this.el.elements('nuxeo-data-table-cell');
const ele = await eles[0];
const eleText = await ele.getText();
return eleText;
})();
}

get authorizationDate() {
return this.el.elements('nuxeo-data-table-cell')[1].getText();
}

async revokeButton() {
return (async () => {
const ele = await this.el.element('paper-icon-button[name="revoke"]');
return ele;
})();
}
}

export default class UserAuthorizedApps extends BasePage {
async getApps(appName) {
await driver.pause(2000);
const elEx = await this.el;
await elEx.waitForVisible('nuxeo-data-table nuxeo-data-table-row');
const appsNew = await this.el
.$$('nuxeo-data-table nuxeo-data-table-row:not([header])')
.map((el) => new AuthorizedApp(el));
const rows = await this.el.$$('nuxeo-data-table nuxeo-data-table-row:not([header])');
const cells = await this.el.$$('nuxeo-data-table nuxeo-data-table-row:not([header]) nuxeo-data-table-cell');
const cellsPerRow = cells.length / rows.length;
const filterAppNames = [];
const filterApps = [];
const apps = await appsNew.filter(async (app) => !!(await app.name).trim());
for (let i = 0; i < apps.length; i++) {
const app = await apps[i];
const appText = await app.el.$('nuxeo-data-table-cell').getText();
for (let i = 0; i < rows.length; i++) {
const appText = await cells[cellsPerRow * i].getText();
if (appText.trim() !== '') {
filterAppNames.push(app);
filterAppNames.push(rows[i]);
}
if (appName === appText) {
filterApps.push(app);
filterApps.push(rows[i]);
}
}
if (appName) {
return filterApps;
}
return filterAppNames;
}

async revokeButton(app, appName) {
return (async () => {
const rows = await app.$$('nuxeo-data-table nuxeo-data-table-row:not([header])');
const cells = await app.$$('nuxeo-data-table nuxeo-data-table-row:not([header]) nuxeo-data-table-cell');
const cellsPerRow = cells.length / rows.length;
const revokeButtons = await app.$$(
'nuxeo-data-table nuxeo-data-table-row:not([header]) paper-icon-button[name="revoke"]',
);
for (let i = 0; i < rows.length; i++) {
const appText = await cells[cellsPerRow * i].getText();
if (appName === appText) {
return revokeButtons[i];
}
}
})();
}
}
Loading