Skip to content

Commit 56a3cb7

Browse files
Rohit0301Copilotchirag-madlani
authored
Fixed User spec flakiness (open-metadata#27848)
Co-authored-by: Copilot <copilot@github.com> Co-authored-by: Chirag Madlani <12962843+chirag-madlani@users.noreply.github.com>
1 parent 4a2f42f commit 56a3cb7

1 file changed

Lines changed: 13 additions & 14 deletions

File tree

  • openmetadata-ui/src/main/resources/ui/playwright/support/user

openmetadata-ui/src/main/resources/ui/playwright/support/user/UserClass.ts

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,14 @@ export type UserData = {
2929
password: string;
3030
};
3131

32-
const dataStewardPolicy = new PolicyClass();
33-
const dataStewardRoles = new RolesClass();
34-
let dataStewardTeam: TeamClass;
35-
3632
export class UserClass {
3733
data: UserData;
3834

3935
responseData: UserResponseDataType = {} as UserResponseDataType;
4036
isUserDataSteward = false;
37+
private readonly dataStewardPolicy = new PolicyClass();
38+
private readonly dataStewardRoles = new RolesClass();
39+
private dataStewardTeam: TeamClass | undefined;
4140
isAdmin: boolean;
4241

4342
constructor(data?: UserData, isAdmin = false) {
@@ -185,28 +184,28 @@ export class UserClass {
185184
async setDataStewardRole(apiContext: APIRequestContext) {
186185
this.isUserDataSteward = true;
187186
const id = uuid();
188-
await dataStewardPolicy.create(apiContext, DATA_STEWARD_RULES);
189-
await dataStewardRoles.create(apiContext, [
190-
dataStewardPolicy.responseData.name,
187+
await this.dataStewardPolicy.create(apiContext, DATA_STEWARD_RULES);
188+
await this.dataStewardRoles.create(apiContext, [
189+
this.dataStewardPolicy.responseData.name,
191190
]);
192-
dataStewardTeam = new TeamClass({
191+
this.dataStewardTeam = new TeamClass({
193192
name: `PW%data_steward_team-${id}`,
194193
displayName: `PW Data Steward Team ${id}`,
195194
description: 'playwright data steward team description',
196195
teamType: 'Group',
197196
users: [this.responseData.id],
198-
defaultRoles: dataStewardRoles.responseData.id
199-
? [dataStewardRoles.responseData.id]
197+
defaultRoles: this.dataStewardRoles.responseData.id
198+
? [this.dataStewardRoles.responseData.id]
200199
: [],
201200
});
202-
await dataStewardTeam.create(apiContext);
201+
await this.dataStewardTeam.create(apiContext);
203202
}
204203

205204
async delete(apiContext: APIRequestContext, hardDelete = true) {
206205
if (this.isUserDataSteward) {
207-
await dataStewardPolicy.delete(apiContext);
208-
await dataStewardRoles.delete(apiContext);
209-
await dataStewardTeam.delete(apiContext);
206+
await this.dataStewardPolicy.delete(apiContext);
207+
await this.dataStewardRoles.delete(apiContext);
208+
await this.dataStewardTeam?.delete(apiContext);
210209
}
211210

212211
const response = await apiContext.delete(

0 commit comments

Comments
 (0)