diff --git a/client/package-lock.json b/client/package-lock.json index cd815a9aef9d8436c1b5207cbce7f10f8ff5ee1b..ef036354b4d491cbe3fcc19a13e6d2139759502a 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -8285,9 +8285,9 @@ "integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==" }, "hosted-git-info": { - "version": "2.8.8", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz", - "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==" + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==" }, "hpack.js": { "version": "2.1.6", @@ -11020,9 +11020,9 @@ } }, "lodash": { - "version": "4.17.20", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", - "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "lodash-es": { "version": "4.17.21", @@ -16916,9 +16916,9 @@ } }, "url-parse": { - "version": "1.4.7", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz", - "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz", + "integrity": "sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==", "requires": { "querystringify": "^2.1.1", "requires-port": "^1.0.0" @@ -17610,8 +17610,7 @@ }, "ssri": { "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", - "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", + "resolved": "", "requires": { "figgy-pudding": "^3.5.1" } diff --git a/client/src/e2e/AdminPage.test.tsx b/client/src/e2e/AdminPage.test.tsx index c9c67580ba029c41c9849a6b057cfcdba25dd2a0..048fc128052f5657f81563c7a3d05192014504e2 100644 --- a/client/src/e2e/AdminPage.test.tsx +++ b/client/src/e2e/AdminPage.test.tsx @@ -137,6 +137,7 @@ describe('Admin page', () => { const competitionRegionSelectSelector = '[data-testid="competitionRegion"]' const acceptAddCompetition = '[data-testid="acceptCompetition"]' const removeCompetitionButtonSelector = '[data-testid="removeCompetitionButton"]' + const acceptRemoveCompetitionSelector = '[data-testid="acceptRemoveCompetition"]' const testCompetitionName = 'New test competition' const testCompetitionRegion = 'Linköping' @@ -169,6 +170,8 @@ describe('Admin page', () => { await page.click(testCompetitionSelector) await page.waitForTimeout(100) await page.click(removeCompetitionButtonSelector) + await page.waitForTimeout(100) + await page.click(acceptRemoveCompetitionSelector) await page.waitForTimeout(1000) competitions = await page.$$eval('.MuiTableRow-root > td', (elList) => elList.map((p) => p.textContent)) expect(competitions).not.toContain(testCompetitionName) diff --git a/client/src/pages/admin/competitions/CompetitionManager.tsx b/client/src/pages/admin/competitions/CompetitionManager.tsx index e48d4244072b5b96d81b2569d1dd087bab18145f..cf5332a089c1a2381f2cb813f16cc53c8e7639a1 100644 --- a/client/src/pages/admin/competitions/CompetitionManager.tsx +++ b/client/src/pages/admin/competitions/CompetitionManager.tsx @@ -370,7 +370,7 @@ const CompetitionManager: React.FC = (props: any) => { <Button autoFocus onClick={handleCloseVerify} color="primary"> Avbryt </Button> - <Button data-testid="acceptRemoveUser" onClick={handleDeleteCompetition} color="primary" autoFocus> + <Button data-testid="acceptRemoveCompetition" onClick={handleDeleteCompetition} color="primary" autoFocus> Ta bort </Button> </DialogActions>