diff --git a/e2e/suites/actions/library-actions.test.ts b/e2e/suites/actions/library-actions.test.ts index 7eb580da3..0fde471d7 100755 --- a/e2e/suites/actions/library-actions.test.ts +++ b/e2e/suites/actions/library-actions.test.ts @@ -129,7 +129,7 @@ describe('Library actions', () => { await dataTable.selectItem(sitePublic1Admin); await toolbar.joinButton.click(); - expect(await dataTable.getLibraryRole(sitePublic1Admin)).toEqual('Consumer'); + expect(await dataTable.getLibraryRole(sitePublic1Admin)).toEqual(SITE_ROLES.SITE_CONSUMER.LABEL); }); it('[C306959] from Search Results', async () => { @@ -141,7 +141,7 @@ describe('Library actions', () => { await dataTable.selectItem(siteSearchPublic1Admin); await toolbar.joinButton.click(); - expect(await dataTable.getLibraryRole(siteSearchPublic1Admin)).toEqual('Consumer'); + expect(await dataTable.getLibraryRole(siteSearchPublic1Admin)).toEqual(SITE_ROLES.SITE_CONSUMER.LABEL); }); }); @@ -158,7 +158,7 @@ describe('Library actions', () => { await dataTable.selectItem(siteModerated1Admin); await toolbar.joinButton.click(); - expect(await dataTable.getLibraryRole(siteModerated1Admin)).toEqual(''); + expect(await dataTable.getLibraryRole(siteModerated1Admin)).toEqual(SITE_ROLES.NONE.LABEL); const hasJoinRequest = await apis.user.sites.hasMembershipRequest(siteModerated1Admin); expect(hasJoinRequest).toBe(true, `Join request does not exist on ${siteModerated1Admin}`); }); @@ -172,7 +172,7 @@ describe('Library actions', () => { await dataTable.selectItem(siteSearchModerated1Admin); await toolbar.joinButton.click(); - expect(await dataTable.getLibraryRole(siteSearchModerated1Admin)).toEqual(''); + expect(await dataTable.getLibraryRole(siteSearchModerated1Admin)).toEqual(SITE_ROLES.NONE.LABEL); const hasJoinRequest = await apis.user.sites.hasMembershipRequest(siteSearchModerated1Admin); expect(hasJoinRequest).toBe(true, `Join request does not exist on ${siteSearchModerated1Admin}`); }); diff --git a/package-lock.json b/package-lock.json index 3e202f1c9..72d40cb81 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29,25 +29,25 @@ } }, "@alfresco/adf-content-services": { - "version": "3.10.0-6001ff801e211e8385966d2f2b773e59b4667dd9", - "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.10.0-6001ff801e211e8385966d2f2b773e59b4667dd9.tgz", - "integrity": "sha512-cdITEG6B7FdLftGTQD61zst968usJzRQSq6+6ReKrskqB350brO5IwPYk/f41spiHDl52BzJa/jBKDqvZZkiuw==", + "version": "3.10.0-d1672596bad1cd90940de9499e24791801dc9011", + "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.10.0-d1672596bad1cd90940de9499e24791801dc9011.tgz", + "integrity": "sha512-SgsO0c8Dyv5q2EnEaT0lP7C1om8fNrzfyuYzXs0RhqHwfhJTVSXqnHDCJZFMa2IuStmi+aAwMLy3/m9IdepFbg==", "requires": { "tslib": "^2.0.0" } }, "@alfresco/adf-core": { - "version": "3.10.0-6001ff801e211e8385966d2f2b773e59b4667dd9", - "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.10.0-6001ff801e211e8385966d2f2b773e59b4667dd9.tgz", - "integrity": "sha512-Ds1SVSo5ZE6AF7Q4Y40k+NSOdQdp5JHV7e4IB0lYl2NQuSSLK+DYhmg9hsxRPiDo4+ro93IHtCSKY4Ys14uv4A==", + "version": "3.10.0-d1672596bad1cd90940de9499e24791801dc9011", + "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.10.0-d1672596bad1cd90940de9499e24791801dc9011.tgz", + "integrity": "sha512-JxcwtzIoDgyPanUZLVfK3AYVyf+axOl7467ExfGLCHUGIwGmOFmxvdl3ktjULosLZx7u1O2X2cKucvyZtyGopw==", "requires": { "tslib": "^2.0.0" } }, "@alfresco/adf-extensions": { - "version": "3.10.0-6001ff801e211e8385966d2f2b773e59b4667dd9", - "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.10.0-6001ff801e211e8385966d2f2b773e59b4667dd9.tgz", - "integrity": "sha512-7gJWTGCUAlXW2z4QYyRcXL0dEpZzqrHTT4a7JF1MxYVRyOmIpX+cqq9Q13hVFLQ2c5yLhH5Zt9X2m4stSiaudA==", + "version": "3.10.0-d1672596bad1cd90940de9499e24791801dc9011", + "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.10.0-d1672596bad1cd90940de9499e24791801dc9011.tgz", + "integrity": "sha512-MELz6zyCH74q9TUlmA+jjwGjLT71dS8wqkL6bhojUpISPU1BsZ9oyQeM+HWaDgVwS9iXzJ7+cHOMrtgD8g3j7A==", "requires": { "tslib": "^2.0.0" } diff --git a/package.json b/package.json index 86a736283..a9d5aaa1d 100644 --- a/package.json +++ b/package.json @@ -32,9 +32,9 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "3.10.0-6001ff801e211e8385966d2f2b773e59b4667dd9", - "@alfresco/adf-core": "3.10.0-6001ff801e211e8385966d2f2b773e59b4667dd9", - "@alfresco/adf-extensions": "3.10.0-6001ff801e211e8385966d2f2b773e59b4667dd9", + "@alfresco/adf-content-services": "3.10.0-d1672596bad1cd90940de9499e24791801dc9011", + "@alfresco/adf-core": "3.10.0-d1672596bad1cd90940de9499e24791801dc9011", + "@alfresco/adf-extensions": "3.10.0-d1672596bad1cd90940de9499e24791801dc9011", "@alfresco/js-api": "3.10.0-1deb4e85760f96f550a7d6d894e4002ecd4a4c18", "@angular-custom-builders/lite-serve": "0.2.0", "@angular/animations": "10.0.3", diff --git a/projects/aca-testing-shared/src/configs.ts b/projects/aca-testing-shared/src/configs.ts index 6c27d14bb..d70fe2d84 100755 --- a/projects/aca-testing-shared/src/configs.ts +++ b/projects/aca-testing-shared/src/configs.ts @@ -93,6 +93,9 @@ export const SITE_ROLES = { SITE_MANAGER: { ROLE: 'SiteManager', LABEL: 'Manager' + }, + NONE: { + LABEL: 'Not a member' } }; diff --git a/src/app/services/node-actions.service.spec.ts b/src/app/services/node-actions.service.spec.ts index d5cbfbc61..8b285f5b0 100644 --- a/src/app/services/node-actions.service.spec.ts +++ b/src/app/services/node-actions.service.spec.ts @@ -1015,7 +1015,7 @@ describe('NodeActionsService', () => { }); })); - it('should take no extra delete action, if its children were partially moved', async(() => { + it('should take no extra delete action, if its children were partially moved', (done) => { const movedChildrenNodes = [fileToMove, folderToMove]; spyOn(service, 'moveFolderAction').and.returnValue(of(movedChildrenNodes)); spyOn(service, 'processResponse').and.returnValue({ @@ -1040,8 +1040,9 @@ describe('NodeActionsService', () => { expect(spyOnSuccess).toHaveBeenCalled(); expect(spyOnError).not.toHaveBeenCalled(); + done(); }); - })); + }); it('should take extra delete action, if children successfully moved and folder is still on location', async(() => { const movedChildrenNodes = [fileToMove, folderToMove];