From a99638cff1493ce21490c6c7ab60e83e50ff5773 Mon Sep 17 00:00:00 2001 From: Petar Basic Date: Mon, 10 Jul 2023 08:57:20 +0200 Subject: [PATCH 1/4] LDP-2196: Test checking if contentpool site. --- tests/helpers/test-methods.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/helpers/test-methods.js b/tests/helpers/test-methods.js index 6c07b79..65d78cc 100644 --- a/tests/helpers/test-methods.js +++ b/tests/helpers/test-methods.js @@ -80,6 +80,8 @@ module.exports = { */ isContentpoolSite: async () => { const INSTALL_EXTENSIONS = process.env.LDP_INSTALL_EXTENSIONS ? process.env.LDP_INSTALL_EXTENSIONS : ''; + console.log('LDP_INSTALL_EXTENSIONS=' + process.env.LDP_INSTALL_EXTENSIONS); + console.log('INSTALL_EXTENSIONS=' + INSTALL_EXTENSIONS); return INSTALL_EXTENSIONS.includes('ldp_cp'); }, /** From 9682d9be8641c2eb6c4b008d7e701a323ede54c9 Mon Sep 17 00:00:00 2001 From: Petar Basic Date: Thu, 13 Jul 2023 12:59:10 +0200 Subject: [PATCH 2/4] LDP-2196: Make sure iscontentpoolsite helper works in case of empty extensions. --- tests/helpers/test-methods.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/helpers/test-methods.js b/tests/helpers/test-methods.js index 65d78cc..2e3a58a 100644 --- a/tests/helpers/test-methods.js +++ b/tests/helpers/test-methods.js @@ -80,9 +80,7 @@ module.exports = { */ isContentpoolSite: async () => { const INSTALL_EXTENSIONS = process.env.LDP_INSTALL_EXTENSIONS ? process.env.LDP_INSTALL_EXTENSIONS : ''; - console.log('LDP_INSTALL_EXTENSIONS=' + process.env.LDP_INSTALL_EXTENSIONS); - console.log('INSTALL_EXTENSIONS=' + INSTALL_EXTENSIONS); - return INSTALL_EXTENSIONS.includes('ldp_cp'); + return INSTALL_EXTENSIONS === '' ? false : INSTALL_EXTENSIONS.includes('ldp_cp'); }, /** * Checks if given ldp extensions are enabled. From 82a9afe16e86080a7dd36ab6071262cd4be69cc2 Mon Sep 17 00:00:00 2001 From: petarbasic <52317999+petarbasic@users.noreply.github.com> Date: Fri, 14 Jul 2023 10:36:19 +0200 Subject: [PATCH 3/4] Update test-methods.js --- tests/helpers/test-methods.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/helpers/test-methods.js b/tests/helpers/test-methods.js index 2e3a58a..27a76e3 100644 --- a/tests/helpers/test-methods.js +++ b/tests/helpers/test-methods.js @@ -80,6 +80,8 @@ module.exports = { */ isContentpoolSite: async () => { const INSTALL_EXTENSIONS = process.env.LDP_INSTALL_EXTENSIONS ? process.env.LDP_INSTALL_EXTENSIONS : ''; + console.log('LDP_INSTALL_EXTENSIONS=' + process.env.LDP_INSTALL_EXTENSIONS); + console.log('INSTALL_EXTENSIONS=' + INSTALL_EXTENSIONS); return INSTALL_EXTENSIONS === '' ? false : INSTALL_EXTENSIONS.includes('ldp_cp'); }, /** From c11205618c15f42de3e31eb1c93209121e10e7d6 Mon Sep 17 00:00:00 2001 From: petarbasic <52317999+petarbasic@users.noreply.github.com> Date: Fri, 14 Jul 2023 15:52:34 +0200 Subject: [PATCH 4/4] Update test-methods.js --- tests/helpers/test-methods.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/helpers/test-methods.js b/tests/helpers/test-methods.js index 27a76e3..2e3a58a 100644 --- a/tests/helpers/test-methods.js +++ b/tests/helpers/test-methods.js @@ -80,8 +80,6 @@ module.exports = { */ isContentpoolSite: async () => { const INSTALL_EXTENSIONS = process.env.LDP_INSTALL_EXTENSIONS ? process.env.LDP_INSTALL_EXTENSIONS : ''; - console.log('LDP_INSTALL_EXTENSIONS=' + process.env.LDP_INSTALL_EXTENSIONS); - console.log('INSTALL_EXTENSIONS=' + INSTALL_EXTENSIONS); return INSTALL_EXTENSIONS === '' ? false : INSTALL_EXTENSIONS.includes('ldp_cp'); }, /**