Skip to content

Test agnostic with cli #215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/helpers/capabilityHelper.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const caps = (bsConfig, zip) => {
if (bsConfig.browsers) {
bsConfig.browsers.forEach((element) => {
osBrowser = element.os + "-" + element.browser;
osAndBrowser = element.os + " / " + Utils.capitalizeFirstLetter(element.browser);
osAndBrowser = (element.os) ? element.os : "Any OS" + " / " + Utils.capitalizeFirstLetter(element.browser);
element.versions.forEach((version) => {
osBrowserArray.push(osBrowser + version);
browsersList.push(`${osAndBrowser} (${version})`);
Expand Down
2 changes: 1 addition & 1 deletion bin/helpers/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -891,7 +891,7 @@ exports.setBrowsers = async (bsConfig, args) => {
browsersList.forEach((browser)=>{
let browserHash = {}
let osBrowserDetails = browser.split(':')
browserHash['os'] = osBrowserDetails[1].trim()
if (!this.isUndefined(osBrowserDetails[1])) browserHash['os'] = osBrowserDetails[1].trim()
let browserDetails = osBrowserDetails[0].split('@')
browserHash['browser'] = browserDetails[0].trim()
browserHash['versions'] = []
Expand Down
55 changes: 55 additions & 0 deletions test/unit/bin/helpers/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -2502,6 +2502,61 @@ describe('utils', () => {
await utils.setBrowsers(bsConfig, args);
expect(bsConfig.browsers).to.be.eql(browserResult);
});
it('the args browser should not return exception if os is empty string', async () => {
let bsConfig = {
browsers: [
{
browser: 'chrome',
os: 'Windows 10',
versions: ['latest', 'latest-1'],
},
{
browser: 'chrome',
os: 'Windows 10',
versions: ['latest', 'latest-1'],
},
],
};
let browserResult = [
{
browser: 'chrome',
os: '',
versions: ['latest-1'],
}
];
let args = {
browser: 'chrome@latest-1:',
};
await utils.setBrowsers(bsConfig, args)
expect(bsConfig.browsers).to.be.eql(browserResult);
});
it('the args browser should not return exception if os is nil', async () => {
let bsConfig = {
browsers: [
{
browser: 'chrome',
os: 'Windows 10',
versions: ['latest', 'latest-1'],
},
{
browser: 'chrome',
os: 'Windows 10',
versions: ['latest', 'latest-1'],
},
],
};
let browserResult = [
{
browser: 'chrome',
versions: ['latest-1'],
}
];
let args = {
browser: 'chrome@latest-1',
};
await utils.setBrowsers(bsConfig, args)
expect(bsConfig.browsers).to.be.eql(browserResult);
});
it('the args browser should throw an error in case of exception raised', async () => {
let bsConfig = {
browsers: [
Expand Down