Skip to content

Commit

Permalink
Merge branch 'develop' into ACS-7381-ADF-Break-DataTable-dependency-o…
Browse files Browse the repository at this point in the history
…n-Material-Module
  • Loading branch information
tamaragruszka authored May 7, 2024
2 parents 41de378 + cf309dc commit 4e876c8
Show file tree
Hide file tree
Showing 3 changed files with 80 additions and 39 deletions.
12 changes: 6 additions & 6 deletions e2e-playwright/process-services-cloud/specs/people-cloud.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ test.describe('People component stories tests', () => {

await processServicesCloud.navigateTo({ moduleNames: ['people-cloud'], componentName: 'people-cloud', story: 'valid-preselected-users' });

expect(peopleComponent.usersNaming).toContainText(expectedUsersName);
await expect(peopleComponent.usersNaming).toContainText(expectedUsersName);
});

test('Mandatory Preselected Users', async ({ processServicesCloud, peopleComponent }) => {
Expand All @@ -41,8 +41,8 @@ test.describe('People component stories tests', () => {
await processServicesCloud.navigateTo({ moduleNames: ['people-cloud'], componentName: 'people-cloud', story: 'mandatory-preselected-users' });
await peopleComponent.getUserLocator('Kielbasa Sausage').hover();

expect.soft(peopleComponent.usersNaming).toContainText(expectedUsersName);
expect(peopleComponent.tooltip.content).toContainText('Mandatory');
await expect.soft(peopleComponent.usersNaming).toContainText(expectedUsersName);
await expect(peopleComponent.tooltip.content).toContainText('Mandatory');
});

test('Invalid Preselected Users', async ({ processServicesCloud, peopleComponent }) => {
Expand All @@ -51,7 +51,7 @@ test.describe('People component stories tests', () => {

await processServicesCloud.navigateTo({ moduleNames: ['people-cloud'], componentName: 'people-cloud', story: 'invalid-preselected-users' });

expect(peopleComponent.error.content).toContainText(expectedWarningIcon + expectedWarningMessage);
await expect(peopleComponent.error.content).toContainText(expectedWarningIcon + expectedWarningMessage);
});

test('Excluded Users', async ({ processServicesCloud, peopleComponent }) => {
Expand All @@ -63,7 +63,7 @@ test.describe('People component stories tests', () => {
await processServicesCloud.navigateTo({ moduleNames: ['people-cloud'], componentName: 'people-cloud', story: 'excluded-users' });
await peopleComponent.usersInput.type('user');

expect(peopleComponent.listbox.allOptions).not.toContainText(expectedExcludedUsers);
await expect(peopleComponent.listbox.allOptions).not.toContainText(expectedExcludedUsers);
});

test('No Users', async ({ processServicesCloud, peopleComponent }) => {
Expand All @@ -72,6 +72,6 @@ test.describe('People component stories tests', () => {
await processServicesCloud.navigateTo({ moduleNames: ['people-cloud'], componentName: 'people-cloud', story: 'no-users' });
await peopleComponent.usersInput.type('user');

expect(peopleComponent.listbox.oneOption).toContainText(expectedInformation);
await expect(peopleComponent.listbox.oneOption).toContainText(expectedInformation);
});
});
101 changes: 71 additions & 30 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"@angular/platform-browser": "14.1.3",
"@angular/platform-browser-dynamic": "14.1.3",
"@angular/router": "14.1.3",
"@apollo/client": "^3.8.4",
"@apollo/client": "^3.10.2",
"@cspell/eslint-plugin": "^7.3.6",
"@mat-datetimepicker/core": "^10.1.1",
"@ngx-translate/core": "^14.0.0",
Expand Down Expand Up @@ -142,7 +142,7 @@
"editorjs-html": "3.4.3",
"editorjs-paragraph-with-alignment": "3.0.0",
"editorjs-text-color-plugin": "2.0.4",
"ejs": "^3.1.9",
"ejs": "^3.1.10",
"eslint": "^8.47.0",
"eslint-config-prettier": "^8.10.0",
"eslint-plugin-ban": "^1.6.0",
Expand Down Expand Up @@ -192,7 +192,7 @@
"shx": "^0.3.4",
"spdx-license-list": "^6.9.0",
"stylelint": "^16.3.1",
"stylelint-config-standard-scss": "^13.0.0",
"stylelint-config-standard-scss": "^13.1.0",
"ts-node": "^10.9.1",
"tsconfig-paths": "^4.1.1",
"typescript": "4.7.4",
Expand Down

0 comments on commit 4e876c8

Please sign in to comment.