Skip to content

Commit 31cfc6d

Browse files
Rohit0301Copilotchirag-madlani
committed
Fixed User spec flakiness (#27848)
Co-authored-by: Copilot <copilot@github.com> Co-authored-by: Chirag Madlani <12962843+chirag-madlani@users.noreply.github.com>
1 parent 76e09b3 commit 31cfc6d

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 @@ 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

4241
constructor(data?: UserData) {
4342
this.data = data ? data : generateRandomUsername();
@@ -168,28 +167,28 @@ export class UserClass {
168167
async setDataStewardRole(apiContext: APIRequestContext) {
169168
this.isUserDataSteward = true;
170169
const id = uuid();
171-
await dataStewardPolicy.create(apiContext, DATA_STEWARD_RULES);
172-
await dataStewardRoles.create(apiContext, [
173-
dataStewardPolicy.responseData.name,
170+
await this.dataStewardPolicy.create(apiContext, DATA_STEWARD_RULES);
171+
await this.dataStewardRoles.create(apiContext, [
172+
this.dataStewardPolicy.responseData.name,
174173
]);
175-
dataStewardTeam = new TeamClass({
174+
this.dataStewardTeam = new TeamClass({
176175
name: `PW%data_steward_team-${id}`,
177176
displayName: `PW Data Steward Team ${id}`,
178177
description: 'playwright data steward team description',
179178
teamType: 'Group',
180179
users: [this.responseData.id],
181-
defaultRoles: dataStewardRoles.responseData.id
182-
? [dataStewardRoles.responseData.id]
180+
defaultRoles: this.dataStewardRoles.responseData.id
181+
? [this.dataStewardRoles.responseData.id]
183182
: [],
184183
});
185-
await dataStewardTeam.create(apiContext);
184+
await this.dataStewardTeam.create(apiContext);
186185
}
187186

188187
async delete(apiContext: APIRequestContext, hardDelete = true) {
189188
if (this.isUserDataSteward) {
190-
await dataStewardPolicy.delete(apiContext);
191-
await dataStewardRoles.delete(apiContext);
192-
await dataStewardTeam.delete(apiContext);
189+
await this.dataStewardPolicy.delete(apiContext);
190+
await this.dataStewardRoles.delete(apiContext);
191+
await this.dataStewardTeam?.delete(apiContext);
193192
}
194193

195194
const response = await apiContext.delete(

0 commit comments

Comments
 (0)