From a45e69d03c917836d042ec18ed211d40aa90282f Mon Sep 17 00:00:00 2001 From: "Rodolfo Liberado (BEYONDSOFT CONSULTING INC)" Date: Wed, 6 Mar 2024 11:26:37 -0300 Subject: [PATCH 1/4] Chromium browser first unit tests --- test/browserHelper.test.js | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/test/browserHelper.test.js b/test/browserHelper.test.js index 99121a3a..a8be0586 100644 --- a/test/browserHelper.test.js +++ b/test/browserHelper.test.js @@ -8,10 +8,15 @@ suite('browserHelper', function () { const currentSystem = process.platform; const chrome = 'chrome'; const edge = 'edge'; + const chromium = 'chromium'; const url = 'http://localhost:8000/index.html'; + + const chromiumPathArg = process.argv.find(arg => arg.startsWith('--chromiumpath=')); + const chromiumPath = chromiumPathArg ? chromiumPathArg.split('=')[1] : undefined; + test('Will get Chrome browser target with argument correctly for each system', async () => { - const browserInfo = await browser.getBrowser(chrome, undefined, url); + const browserInfo = await browser.getBrowser(chrome, undefined, undefined, url); switch (currentSystem) { case 'win32': assert.strictEqual(browserInfo.includes('chrome'), true); @@ -32,7 +37,7 @@ suite('browserHelper', function () { }); test('Will get Edge browser target with argument correctly for each system', async () => { - const browserInfo = await browser.getBrowser(edge, undefined, url); + const browserInfo = await browser.getBrowser(edge, undefined, undefined, url); switch (currentSystem) { case 'win32': assert.equal(browserInfo.includes('msedge'), true); @@ -52,6 +57,23 @@ suite('browserHelper', function () { } }); + test('Will get Chromium browser target with argument correctly for each system', async () => { + const browserInfo = await browser.getBrowser(chromium, undefined, chromiumPath, url); + switch (currentSystem) { + case 'win32': + assert.strictEqual(browserInfo.includes(chromiumPath), true); + break; + case 'darwin': + assert.strictEqual(browserInfo.includes('chromium'), true); + assert.strictEqual(browserInfo.includes(url), true); + break; + case 'linux': + assert.strictEqual(browserInfo.includes('chromium-browser'), true); + assert.strictEqual(browserInfo.includes(url), true); + break; + } + }); + test('Should return without browser info if Showbrowser argument is set to false', async () => { var opts = {}; opts.target = chrome; From b4d06641e552049230b6200d9e17a9a83231eabf Mon Sep 17 00:00:00 2001 From: "Rodolfo Liberado (BEYONDSOFT CONSULTING INC)" Date: Mon, 11 Mar 2024 11:45:49 -0300 Subject: [PATCH 2/4] chromiumPath argument validation update --- test/browserHelper.test.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/test/browserHelper.test.js b/test/browserHelper.test.js index a8be0586..ca7eda78 100644 --- a/test/browserHelper.test.js +++ b/test/browserHelper.test.js @@ -14,9 +14,8 @@ suite('browserHelper', function () { const chromiumPathArg = process.argv.find(arg => arg.startsWith('--chromiumpath=')); const chromiumPath = chromiumPathArg ? chromiumPathArg.split('=')[1] : undefined; - test('Will get Chrome browser target with argument correctly for each system', async () => { - const browserInfo = await browser.getBrowser(chrome, undefined, undefined, url); + const browserInfo = await browser.getBrowser(chrome, undefined, url, undefined); switch (currentSystem) { case 'win32': assert.strictEqual(browserInfo.includes('chrome'), true); @@ -37,7 +36,7 @@ suite('browserHelper', function () { }); test('Will get Edge browser target with argument correctly for each system', async () => { - const browserInfo = await browser.getBrowser(edge, undefined, undefined, url); + const browserInfo = await browser.getBrowser(edge, undefined, url, undefined); switch (currentSystem) { case 'win32': assert.equal(browserInfo.includes('msedge'), true); @@ -58,10 +57,12 @@ suite('browserHelper', function () { }); test('Will get Chromium browser target with argument correctly for each system', async () => { - const browserInfo = await browser.getBrowser(chromium, undefined, chromiumPath, url); + const browserInfo = await browser.getBrowser(chromium, undefined, url, chromiumPath); switch (currentSystem) { case 'win32': - assert.strictEqual(browserInfo.includes(chromiumPath), true); + if(chromiumPath){ + assert.strictEqual(browserInfo.includes(chromiumPath), true); + } break; case 'darwin': assert.strictEqual(browserInfo.includes('chromium'), true); From a4a4972204c22a58bc8290bef357bfa5067f0df5 Mon Sep 17 00:00:00 2001 From: "Rodolfo Liberado (BEYONDSOFT CONSULTING INC)" Date: Tue, 12 Mar 2024 15:03:53 -0300 Subject: [PATCH 3/4] chromiumPath modification --- test/browserHelper.test.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/test/browserHelper.test.js b/test/browserHelper.test.js index ca7eda78..58f8d96e 100644 --- a/test/browserHelper.test.js +++ b/test/browserHelper.test.js @@ -10,9 +10,7 @@ suite('browserHelper', function () { const edge = 'edge'; const chromium = 'chromium'; const url = 'http://localhost:8000/index.html'; - - const chromiumPathArg = process.argv.find(arg => arg.startsWith('--chromiumpath=')); - const chromiumPath = chromiumPathArg ? chromiumPathArg.split('=')[1] : undefined; + const chromiumPath = 'chromium'; test('Will get Chrome browser target with argument correctly for each system', async () => { const browserInfo = await browser.getBrowser(chrome, undefined, url, undefined); @@ -60,15 +58,15 @@ suite('browserHelper', function () { const browserInfo = await browser.getBrowser(chromium, undefined, url, chromiumPath); switch (currentSystem) { case 'win32': - if(chromiumPath){ - assert.strictEqual(browserInfo.includes(chromiumPath), true); - } + assert.strictEqual(browserInfo.includes(chromiumPath), true); break; case 'darwin': + assert.strictEqual(browserInfo.includes(chromiumPath), true); assert.strictEqual(browserInfo.includes('chromium'), true); assert.strictEqual(browserInfo.includes(url), true); break; case 'linux': + assert.strictEqual(browserInfo.includes(chromiumPath), true); assert.strictEqual(browserInfo.includes('chromium-browser'), true); assert.strictEqual(browserInfo.includes(url), true); break; From fdd9e2635bd37b07c5db37d32fc2877f407e5873 Mon Sep 17 00:00:00 2001 From: "Rodolfo Liberado (BEYONDSOFT CONSULTING INC)" Date: Thu, 14 Mar 2024 09:27:11 -0300 Subject: [PATCH 4/4] Url validation fix --- test/browserHelper.test.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/browserHelper.test.js b/test/browserHelper.test.js index 58f8d96e..bf529c84 100644 --- a/test/browserHelper.test.js +++ b/test/browserHelper.test.js @@ -59,16 +59,17 @@ suite('browserHelper', function () { switch (currentSystem) { case 'win32': assert.strictEqual(browserInfo.includes(chromiumPath), true); + assert.strictEqual(browserInfo.includes(url), false); break; case 'darwin': assert.strictEqual(browserInfo.includes(chromiumPath), true); assert.strictEqual(browserInfo.includes('chromium'), true); - assert.strictEqual(browserInfo.includes(url), true); + assert.strictEqual(browserInfo.includes(url), false); break; case 'linux': assert.strictEqual(browserInfo.includes(chromiumPath), true); assert.strictEqual(browserInfo.includes('chromium-browser'), true); - assert.strictEqual(browserInfo.includes(url), true); + assert.strictEqual(browserInfo.includes(url), false); break; } });