From 4547621da6a57ad228edcc2eebdcb594e826cdb6 Mon Sep 17 00:00:00 2001 From: arditdomi <32884230+arditdomi@users.noreply.github.com> Date: Fri, 2 Oct 2020 12:28:31 +0100 Subject: [PATCH] Update to latest ADF and fix unit tests and broken e2e (#1702) * Update to latest ADF * Trigger a run with an older ADF version (investigation of e2e failures) * Update to latest ADF * Fix search e2e to search for a more specific search term according to the files uploaded --- e2e/suites/search/search-filters.test.ts | 4 +- package-lock.json | 44 +++++++++---------- package.json | 12 ++--- .../src/lib/services/app.service.spec.ts | 1 + 4 files changed, 31 insertions(+), 30 deletions(-) diff --git a/e2e/suites/search/search-filters.test.ts b/e2e/suites/search/search-filters.test.ts index 7edcd5b69..c8d867db7 100644 --- a/e2e/suites/search/search-filters.test.ts +++ b/e2e/suites/search/search-filters.test.ts @@ -88,7 +88,7 @@ describe('Search filters', () => { await apis.user1.upload.uploadFileWithRename(fileJpgUser1.source, docLibId, fileJpgUser1.name); await apis.user2.upload.uploadFileWithRename(filePdfUser2.source, parentId, filePdfUser2.name, filePdfUser2.title, filePdfUser2.description); - await apis.user1.search.waitForNodes('search-filters', { expect: 2 }); + await apis.user1.search.waitForNodes(`search-filters-${random}`, { expect: 2 }); await loginPage.loginWith(user1); done(); @@ -99,7 +99,7 @@ describe('Search filters', () => { await page.clickPersonalFilesAndWait(); await searchInput.clickSearchButton(); - await searchInput.searchFor('search filters'); + await searchInput.searchFor(`search-filters-${random}`); await dataTable.waitForBody(); done(); }); diff --git a/package-lock.json b/package-lock.json index bef206925..d1fd364db 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,12 +5,12 @@ "requires": true, "dependencies": { "@alfresco/adf-cli": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-4.0.0.tgz", - "integrity": "sha512-S56gUwfmk8ann3ytflU9d6ysEKcFES5C8rFTLkId2IZDP66koQng9yuatPqlEG+R2P6rXB7JHZ0ZdP6WZ7LEYg==", + "version": "4.1.0-d83bc9935cbdf12b592f282271aa431eee66b514", + "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-4.1.0-d83bc9935cbdf12b592f282271aa431eee66b514.tgz", + "integrity": "sha512-lNB96o1sEoyhIYq8vNahQ9zq4FUClp3p9btn6QmQj0Xgno1X+MZE7dRqLIELG0h7wzrP75U1WOW3lSin1pmgYg==", "dev": true, "requires": { - "@alfresco/js-api": "4.0.0", + "@alfresco/js-api": "4.1.0-44f2a9255656bf2ad23cd1faa5ecfd195fa0f9bd", "commander": "^4.0.0", "ejs": "^2.6.1", "license-checker": "^25.0.1", @@ -29,42 +29,42 @@ } }, "@alfresco/adf-content-services": { - "version": "4.1.0-c84ef7318ff84a681971f7e3aa08065b13eb5e05", - "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-4.1.0-c84ef7318ff84a681971f7e3aa08065b13eb5e05.tgz", - "integrity": "sha512-UIxRluX2+cjaeovBT8mv1IHNHHSKiwVZLCoe9+MroYSXiUNJRT/DwtxVmXjwLqgAta1hqe5BF5C4tncedXXODg==", + "version": "4.1.0-d83bc9935cbdf12b592f282271aa431eee66b514", + "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-4.1.0-d83bc9935cbdf12b592f282271aa431eee66b514.tgz", + "integrity": "sha512-yI24/H6ggPVePlRW1LhHHY3L8/dKH8jxSoBwPs4OUaU4O0SR2EfLGngUEP/yKuq6099NGS8Rg6ijnuXAQFJSEg==", "requires": { "tslib": "^2.0.0" } }, "@alfresco/adf-core": { - "version": "4.1.0-c84ef7318ff84a681971f7e3aa08065b13eb5e05", - "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-4.1.0-c84ef7318ff84a681971f7e3aa08065b13eb5e05.tgz", - "integrity": "sha512-PszXiBcU4DlY5BaLhz+SoOB8WAWsv8x9NwPysZpFAGA9LsI4UC6ma66tpfjCSIdM7y0QjIFi8crqaQ5NPwNGtQ==", + "version": "4.1.0-d83bc9935cbdf12b592f282271aa431eee66b514", + "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-4.1.0-d83bc9935cbdf12b592f282271aa431eee66b514.tgz", + "integrity": "sha512-Y0/7ZlpFO9+F1bhrFEr9uMHxtofQFOHA6U78Qyuz0tuyQk/spOf56OwubfOCoUtpFmmARNwZOssQ3sMELliPBg==", "requires": { "tslib": "^2.0.0" } }, "@alfresco/adf-extensions": { - "version": "4.1.0-c84ef7318ff84a681971f7e3aa08065b13eb5e05", - "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-4.1.0-c84ef7318ff84a681971f7e3aa08065b13eb5e05.tgz", - "integrity": "sha512-IXVUOMk2TSZUL61KM+abdsKSli0+lS5Y24ahZALqNFQq+n9DSi/r1SQeoJIuUb446ibyLJRhIIIyLeXrtsUmUA==", + "version": "4.1.0-d83bc9935cbdf12b592f282271aa431eee66b514", + "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-4.1.0-d83bc9935cbdf12b592f282271aa431eee66b514.tgz", + "integrity": "sha512-Qa1sNYUlJnabc910IPhoofSYqjvYVoTKRLuU37x91lIS+jU4uOeGWlom7kODAiycDxOLN4eH0xWXGR09IBK2og==", "requires": { "tslib": "^2.0.0" } }, "@alfresco/adf-testing": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-4.0.0.tgz", - "integrity": "sha512-8QYuApRoyYUMfOyriAf+cORarpYULQwKr41rrwkXRK3Kay6iKHV6OoYReKpJgYeVRYyPqRDs2zkIFfAd6m1KxQ==", + "version": "4.1.0-d83bc9935cbdf12b592f282271aa431eee66b514", + "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-4.1.0-d83bc9935cbdf12b592f282271aa431eee66b514.tgz", + "integrity": "sha512-5Q20xV6Xy8CwXSkI5MPg3JS0K6CLLNMxZ4k3j+9lp0jkwwq/B/AO0LbPbaoyutpNaS0vqZxT3zIDorpR1pFBGw==", "dev": true, "requires": { "tslib": "^2.0.0" } }, "@alfresco/js-api": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-4.0.0.tgz", - "integrity": "sha512-k2XFyRueRfDnUWsYRW8hwJfrv8Ftx5ePJBEf5gWkgSlOcSVS0NSQUbq/9x12xGCerXnvjh7CLQNXqwgisBuu2Q==", + "version": "4.1.0-44f2a9255656bf2ad23cd1faa5ecfd195fa0f9bd", + "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-4.1.0-44f2a9255656bf2ad23cd1faa5ecfd195fa0f9bd.tgz", + "integrity": "sha512-dgMB4oL8sS44QWSIDtBKWrzOXyW17SOxDf22CVoQdH3v0BJAq+W/1GZ5vZwM6SC8Ao0RvZtzjdyMJ63eqN0xpg==", "requires": { "event-emitter": "^0.3.5", "minimatch": "3.0.4", @@ -15763,9 +15763,9 @@ } }, "superagent": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/superagent/-/superagent-6.0.0.tgz", - "integrity": "sha512-gBiyDSUR3zbYO8za+MudSNxMFSOhKcZfQ1Anya1DWzk9R32zl++cYUFHXzP3VnyvQO8h/1/uPPA9FUDDtE+qdA==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/superagent/-/superagent-6.1.0.tgz", + "integrity": "sha512-OUDHEssirmplo3F+1HWKUrUjvnQuA+nZI6i/JJBdXb5eq9IyEQwPyPpqND+SSsxf6TygpBEkUjISVRN4/VOpeg==", "requires": { "component-emitter": "^1.3.0", "cookiejar": "^2.1.2", diff --git a/package.json b/package.json index 59f215474..3de660287 100644 --- a/package.json +++ b/package.json @@ -34,10 +34,10 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "4.1.0-c84ef7318ff84a681971f7e3aa08065b13eb5e05", - "@alfresco/adf-core": "4.1.0-c84ef7318ff84a681971f7e3aa08065b13eb5e05", - "@alfresco/adf-extensions": "4.1.0-c84ef7318ff84a681971f7e3aa08065b13eb5e05", - "@alfresco/js-api": "4.0.0", + "@alfresco/adf-content-services": "4.1.0-d83bc9935cbdf12b592f282271aa431eee66b514", + "@alfresco/adf-core": "4.1.0-d83bc9935cbdf12b592f282271aa431eee66b514", + "@alfresco/adf-extensions": "4.1.0-d83bc9935cbdf12b592f282271aa431eee66b514", + "@alfresco/js-api": "4.1.0-44f2a9255656bf2ad23cd1faa5ecfd195fa0f9bd", "@angular-custom-builders/lite-serve": "^0.2.2", "@angular/animations": "10.0.4", "@angular/cdk": "^10.0.2", @@ -73,8 +73,8 @@ "zone.js": "~0.10.2" }, "devDependencies": { - "@alfresco/adf-cli": "4.0.0", - "@alfresco/adf-testing": "4.0.0", + "@alfresco/adf-cli": "4.1.0-d83bc9935cbdf12b592f282271aa431eee66b514", + "@alfresco/adf-testing": "4.1.0-d83bc9935cbdf12b592f282271aa431eee66b514", "@angular-devkit/build-angular": "~0.1000.8", "@angular-devkit/build-ng-packagr": "~0.1001.3", "@angular/cli": "^10.1.3", diff --git a/projects/aca-shared/src/lib/services/app.service.spec.ts b/projects/aca-shared/src/lib/services/app.service.spec.ts index 87f5c3747..405107212 100644 --- a/projects/aca-shared/src/lib/services/app.service.spec.ts +++ b/projects/aca-shared/src/lib/services/app.service.spec.ts @@ -43,6 +43,7 @@ describe('AppService', () => { imports: [HttpClientModule], providers: [ AppRouteReuseStrategy, + SearchQueryBuilderService, { provide: AuthenticationService, useValue: {