From 2d04cb9807891dfd6225d7fb867fef51a143daa9 Mon Sep 17 00:00:00 2001 From: Robert Deutz Date: Fri, 18 Oct 2024 10:01:03 +0200 Subject: [PATCH 1/7] cleanup tables --- .../administrator/components/com_privacy/Consent.cy.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/System/integration/administrator/components/com_privacy/Consent.cy.js b/tests/System/integration/administrator/components/com_privacy/Consent.cy.js index 0b1d03f53c647..cf2743f5c257e 100644 --- a/tests/System/integration/administrator/components/com_privacy/Consent.cy.js +++ b/tests/System/integration/administrator/components/com_privacy/Consent.cy.js @@ -1,8 +1,9 @@ describe('Test in backend that the privacy consent component', () => { beforeEach(() => cy.doAdministratorLogin()); afterEach(() => { - cy.task('queryDB', 'DELETE FROM #__privacy_consents'); - cy.task('queryDB', "DELETE FROM #__users WHERE name = 'test user'"); + cy.task('queryDB', 'TRUNCATE #__privacy_consents'); + cy.task('queryDB', 'TRUNCATE #__users'); + cy.task('queryDB', 'TRUNCATE #__user_usergroup_map'); cy.get('.js-stools-btn-clear').click({ force: true }); }); From 7a3592117e63d0d07273e202c9038a742ac0b290 Mon Sep 17 00:00:00 2001 From: Robert Deutz Date: Fri, 18 Oct 2024 10:30:02 +0200 Subject: [PATCH 2/7] was a bit to much --- .../administrator/components/com_privacy/Consent.cy.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/System/integration/administrator/components/com_privacy/Consent.cy.js b/tests/System/integration/administrator/components/com_privacy/Consent.cy.js index cf2743f5c257e..fc91d41c5bdf8 100644 --- a/tests/System/integration/administrator/components/com_privacy/Consent.cy.js +++ b/tests/System/integration/administrator/components/com_privacy/Consent.cy.js @@ -2,8 +2,11 @@ describe('Test in backend that the privacy consent component', () => { beforeEach(() => cy.doAdministratorLogin()); afterEach(() => { cy.task('queryDB', 'TRUNCATE #__privacy_consents'); - cy.task('queryDB', 'TRUNCATE #__users'); - cy.task('queryDB', 'TRUNCATE #__user_usergroup_map'); + cy.task('queryDB', 'DELETE FROM #__users WHERE name LIKE "%test user%"') + .then( () => { + cy.task('queryDB', 'DELETE FROM #__user_usergroup_map WHERE user_id NOT IN (SELECT id FROM #__users)'); + }); + cy.get('.js-stools-btn-clear').click({ force: true }); }); From ec1f17f95abb581710d6dd6b6a581b7190fdb62d Mon Sep 17 00:00:00 2001 From: Richard Fath Date: Fri, 18 Oct 2024 10:46:11 +0200 Subject: [PATCH 3/7] Fix quotes --- .../administrator/components/com_privacy/Consent.cy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/System/integration/administrator/components/com_privacy/Consent.cy.js b/tests/System/integration/administrator/components/com_privacy/Consent.cy.js index fc91d41c5bdf8..e2e8141b0238a 100644 --- a/tests/System/integration/administrator/components/com_privacy/Consent.cy.js +++ b/tests/System/integration/administrator/components/com_privacy/Consent.cy.js @@ -2,7 +2,7 @@ describe('Test in backend that the privacy consent component', () => { beforeEach(() => cy.doAdministratorLogin()); afterEach(() => { cy.task('queryDB', 'TRUNCATE #__privacy_consents'); - cy.task('queryDB', 'DELETE FROM #__users WHERE name LIKE "%test user%"') + cy.task('queryDB', "DELETE FROM #__users WHERE name LIKE '%test user%'") .then( () => { cy.task('queryDB', 'DELETE FROM #__user_usergroup_map WHERE user_id NOT IN (SELECT id FROM #__users)'); }); From b84db7c0365fbe897a3f46e45c92fc81d9585ee7 Mon Sep 17 00:00:00 2001 From: Robert Deutz Date: Fri, 18 Oct 2024 10:54:54 +0200 Subject: [PATCH 4/7] js-lint fix --- .../administrator/components/com_privacy/Consent.cy.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/System/integration/administrator/components/com_privacy/Consent.cy.js b/tests/System/integration/administrator/components/com_privacy/Consent.cy.js index e2e8141b0238a..d469ad370a779 100644 --- a/tests/System/integration/administrator/components/com_privacy/Consent.cy.js +++ b/tests/System/integration/administrator/components/com_privacy/Consent.cy.js @@ -2,11 +2,9 @@ describe('Test in backend that the privacy consent component', () => { beforeEach(() => cy.doAdministratorLogin()); afterEach(() => { cy.task('queryDB', 'TRUNCATE #__privacy_consents'); - cy.task('queryDB', "DELETE FROM #__users WHERE name LIKE '%test user%'") - .then( () => { + cy.task('queryDB', "DELETE FROM #__users WHERE name LIKE '%test user%'").then(() => { cy.task('queryDB', 'DELETE FROM #__user_usergroup_map WHERE user_id NOT IN (SELECT id FROM #__users)'); }); - cy.get('.js-stools-btn-clear').click({ force: true }); }); From e0e92da5663181d5acb5c6b9f525212c99a0cb7f Mon Sep 17 00:00:00 2001 From: Robert Deutz Date: Fri, 18 Oct 2024 11:24:56 +0200 Subject: [PATCH 5/7] revert the #__privacy_consents to DELETE --- .../administrator/components/com_privacy/Consent.cy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/System/integration/administrator/components/com_privacy/Consent.cy.js b/tests/System/integration/administrator/components/com_privacy/Consent.cy.js index d469ad370a779..82e1136498e19 100644 --- a/tests/System/integration/administrator/components/com_privacy/Consent.cy.js +++ b/tests/System/integration/administrator/components/com_privacy/Consent.cy.js @@ -1,7 +1,7 @@ describe('Test in backend that the privacy consent component', () => { beforeEach(() => cy.doAdministratorLogin()); afterEach(() => { - cy.task('queryDB', 'TRUNCATE #__privacy_consents'); + cy.task('queryDB', 'DELETE FROM #__privacy_consents'); cy.task('queryDB', "DELETE FROM #__users WHERE name LIKE '%test user%'").then(() => { cy.task('queryDB', 'DELETE FROM #__user_usergroup_map WHERE user_id NOT IN (SELECT id FROM #__users)'); }); From c6d211ea2b37d0346475ac2f4f7dc93bddd81d9c Mon Sep 17 00:00:00 2001 From: Robert Deutz Date: Fri, 18 Oct 2024 11:26:27 +0200 Subject: [PATCH 6/7] Update tests/System/integration/administrator/components/com_privacy/Consent.cy.js Co-authored-by: Richard Fath --- .../administrator/components/com_privacy/Consent.cy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/System/integration/administrator/components/com_privacy/Consent.cy.js b/tests/System/integration/administrator/components/com_privacy/Consent.cy.js index 82e1136498e19..f47968c06ef57 100644 --- a/tests/System/integration/administrator/components/com_privacy/Consent.cy.js +++ b/tests/System/integration/administrator/components/com_privacy/Consent.cy.js @@ -1,7 +1,7 @@ describe('Test in backend that the privacy consent component', () => { beforeEach(() => cy.doAdministratorLogin()); afterEach(() => { - cy.task('queryDB', 'DELETE FROM #__privacy_consents'); + cy.task('queryDB', 'DELETE FROM #__privacy_consents'); cy.task('queryDB', "DELETE FROM #__users WHERE name LIKE '%test user%'").then(() => { cy.task('queryDB', 'DELETE FROM #__user_usergroup_map WHERE user_id NOT IN (SELECT id FROM #__users)'); }); From e8d1b92241cdb36f26b63b3fad0afa027c34c7a5 Mon Sep 17 00:00:00 2001 From: Martina Scholz <64533137+LadySolveig@users.noreply.github.com> Date: Mon, 21 Oct 2024 14:44:18 +0200 Subject: [PATCH 7/7] Move db cleanup task from afterEach to beforeEach hook (#18) --- .../administrator/components/com_privacy/Consent.cy.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/System/integration/administrator/components/com_privacy/Consent.cy.js b/tests/System/integration/administrator/components/com_privacy/Consent.cy.js index f47968c06ef57..55ddb589eac92 100644 --- a/tests/System/integration/administrator/components/com_privacy/Consent.cy.js +++ b/tests/System/integration/administrator/components/com_privacy/Consent.cy.js @@ -1,12 +1,12 @@ describe('Test in backend that the privacy consent component', () => { - beforeEach(() => cy.doAdministratorLogin()); - afterEach(() => { + beforeEach(() => { cy.task('queryDB', 'DELETE FROM #__privacy_consents'); cy.task('queryDB', "DELETE FROM #__users WHERE name LIKE '%test user%'").then(() => { cy.task('queryDB', 'DELETE FROM #__user_usergroup_map WHERE user_id NOT IN (SELECT id FROM #__users)'); }); - cy.get('.js-stools-btn-clear').click({ force: true }); + cy.doAdministratorLogin(); }); + afterEach(() => cy.get('.js-stools-btn-clear').click({ force: true })); it('can view privacy consents', () => { cy.db_enableExtension('0', 'plg_system_privacyconsent');