Skip to content

Args #7

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.

Sign up for GitHub

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 2 commits into from
Apr 26, 2016
Merged

Args #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a780db9
args
nidhimj22 Apr 26, 2016
9b5ca9f
args
nidhimj22 Apr 26, 2016
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
32 changes: 16 additions & 16 deletions lib/Local.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,83 +81,83 @@ function Local(){
var value = options[key];

switch(key){
case 'key':
case '-key':
this.key = value;
break;

case 'v':
case '-v':
if(value)
this.verboseFlag = '-vvv';
break;

case 'force':
case '-force':
if(value)
this.forceFlag = '-force';
break;

case 'only':
case '-only':
if(value)
this.onlyFlag = '-only';
break;

case 'onlyAutomate':
case '-onlyAutomate':
if(value)
this.onlyAutomateFlag = '-onlyAutomate';
break;

case 'forcelocal':
case '-forcelocal':
if(value)
this.forceLocalFlag = '-forcelocal';
break;

case 'localIdentifier':
case '-localIdentifier':
if(value)
this.localIdentifierFlag = '-localIdentifier ' + value;
break;

case 'f':
case '-f':
if(value){
this.folderFlag = '-f';
this.folderPath = value;
}
break;

case 'proxyHost':
case '-proxyHost':
if(value)
this.proxyHost = '-proxyHost ' + value;
break;

case 'proxyPort':
case '-proxyPort':
if(value)
this.proxyPort = '-proxyPort ' + value;
break;

case 'proxyUser':
case '-proxyUser':
if(value)
this.proxyUser = '-proxyUser ' + value;
break;

case 'proxyPass':
case '-proxyPass':
if(value)
this.proxyPass = '-proxyPass ' + value;
break;

case 'forceproxy':
case '-forceproxy':
if(value)
this.forceProxyFlag = '-forceproxy';
break;

case 'hosts':
case '-hosts':
if(value)
this.hosts = value;
break;

case 'logfile':
case '-logfile':
if(value)
this.logfile = value;
break;

case 'binarypath':
case '-binarypath':
if(value)
this.binaryPath = value;
break;
Expand Down
16 changes: 3 additions & 13 deletions node-example.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,14 @@ var capabilities = {
}

var options = {
key: process.env.BROWSERSTACK_ACCESS_KEY,
'-key': process.env.BROWSERSTACK_ACCESS_KEY,
//hosts: [{
// name: 'localhost',
// port: 8080,
// sslFlag: 0
//}],
//f: __dirname,
//binaryPath: '/var/BrowserStackLocal',
//logfile: '/var/log/local.log',
//localIdentifier: identifier,
//verbose: true,
//proxyUser: '',
//proxyPass: '',
//proxyPort: 80,
//proxyHost: 'host',
//force: true,
//forcelocal: true,
//onlyAutomate: true
//'-f': __dirname,
//'-binaryPath': '/var/BrowserStackLocal'
};

// try {
Expand Down
36 changes: 18 additions & 18 deletions test/local.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ describe('Local', function () {

it('should have pid when running', function (done) {
this.timeout(600000);
bsLocal.start({ key: process.env.BROWSERSTACK_ACCESS_KEY }, function(){
bsLocal.start({ '-key': process.env.BROWSERSTACK_ACCESS_KEY }, function(){
expect(bsLocal.tunnel.pid).to.not.equal(0);
done();
});
Expand All @@ -21,19 +21,19 @@ describe('Local', function () {
it('should return is running properly', function (done) {
this.timeout(60000);
expect(bsLocal.isRunning()).to.not.equal(true);
bsLocal.start({ key: process.env.BROWSERSTACK_ACCESS_KEY }, function(){
bsLocal.start({ '-key': process.env.BROWSERSTACK_ACCESS_KEY }, function(){
expect(bsLocal.isRunning()).to.equal(true);
done();
});
});

it('should throw error on running multiple binary', function (done) {
this.timeout(60000);
bsLocal.start({ key: process.env.BROWSERSTACK_ACCESS_KEY }, function(){
bsLocal.start({ '-key': process.env.BROWSERSTACK_ACCESS_KEY }, function(){
bsLocal_2 = new browserstack.Local();
var tempLogPath = path.join(process.cwd(), 'log2.log');
try{
bsLocal_2.start({ key: process.env.BROWSERSTACK_ACCESS_KEY, logfile: tempLogPath }, function(){});
bsLocal_2.start({ '-key': process.env.BROWSERSTACK_ACCESS_KEY, '-logfile': tempLogPath }, function(){});
}
catch(err){
expect(err.toString().trim()).to.equal('LocalError: *** Error: Either another browserstack local client is running on your machine or some server is listening on port 45691');
Expand All @@ -44,71 +44,71 @@ describe('Local', function () {
});

it('should enable verbose', function (done) {
bsLocal.start({ key: process.env.BROWSERSTACK_ACCESS_KEY, onlyCommand: true, v: true }, function(){
bsLocal.start({ '-key': process.env.BROWSERSTACK_ACCESS_KEY, onlyCommand: true, '-v': true }, function(){
expect(bsLocal.getBinaryArgs().indexOf('-vvv')).to.not.equal(-1);
done();
});
});

it('should set folder testing', function (done) {
bsLocal.start({ key: process.env.BROWSERSTACK_ACCESS_KEY, onlyCommand: true, f: '/var/html' }, function(){
bsLocal.start({ '-key': process.env.BROWSERSTACK_ACCESS_KEY, onlyCommand: true, '-f': '/var/html' }, function(){
expect(bsLocal.getBinaryArgs().indexOf('-f')).to.not.equal(-1);
expect(bsLocal.getBinaryArgs().indexOf('/var/html')).to.not.equal(-1);
done();
});
});

it('should enable force', function (done) {
bsLocal.start({ key: process.env.BROWSERSTACK_ACCESS_KEY, onlyCommand: true, force: true }, function(){
bsLocal.start({ '-key': process.env.BROWSERSTACK_ACCESS_KEY, onlyCommand: true, '-force': true }, function(){
expect(bsLocal.getBinaryArgs().indexOf('-force')).to.not.equal(-1);
done();
});
});

it('should enable only', function (done) {
bsLocal.start({ key: process.env.BROWSERSTACK_ACCESS_KEY, onlyCommand: true, only: true }, function(){
bsLocal.start({ '-key': process.env.BROWSERSTACK_ACCESS_KEY, onlyCommand: true, '-only': true }, function(){
expect(bsLocal.getBinaryArgs().indexOf('-only')).to.not.equal(-1);
done();
});
});

it('should enable onlyAutomate', function (done) {
bsLocal.start({ key: process.env.BROWSERSTACK_ACCESS_KEY, onlyCommand: true, onlyAutomate: true }, function(){
bsLocal.start({ '-key': process.env.BROWSERSTACK_ACCESS_KEY, onlyCommand: true, '-onlyAutomate': true }, function(){
expect(bsLocal.getBinaryArgs().indexOf('-onlyAutomate')).to.not.equal(-1);
done();
});
});

it('should enable forcelocal', function (done) {
bsLocal.start({ key: process.env.BROWSERSTACK_ACCESS_KEY, onlyCommand: true, forcelocal: true }, function(){
bsLocal.start({ '-key': process.env.BROWSERSTACK_ACCESS_KEY, onlyCommand: true, '-forcelocal': true }, function(){
expect(bsLocal.getBinaryArgs().indexOf('-forcelocal')).to.not.equal(-1);
done();
});
});

it('should enable forceproxy', function (done) {
bsLocal.start({ key: process.env.BROWSERSTACK_ACCESS_KEY, onlyCommand: true, forceproxy: true }, function(){
bsLocal.start({ '-key': process.env.BROWSERSTACK_ACCESS_KEY, onlyCommand: true, '-forceproxy': true }, function(){
expect(bsLocal.getBinaryArgs().indexOf('-forceproxy')).to.not.equal(-1);
done();
});
});


it('should set localIdentifier', function (done) {
bsLocal.start({ key: process.env.BROWSERSTACK_ACCESS_KEY, onlyCommand: true, localIdentifier: 'abcdef' }, function(){
bsLocal.start({ '-key': process.env.BROWSERSTACK_ACCESS_KEY, onlyCommand: true, '-localIdentifier': 'abcdef' }, function(){
expect(bsLocal.getBinaryArgs().indexOf('-localIdentifier abcdef')).to.not.equal(-1);
done();
});
});

it('should set proxy', function (done) {
bsLocal.start({
key: process.env.BROWSERSTACK_ACCESS_KEY,
'-key': process.env.BROWSERSTACK_ACCESS_KEY,
onlyCommand: true,
proxyHost: 'localhost',
proxyPort: 8080,
proxyUser: 'user',
proxyPass: 'pass'
'-proxyHost': 'localhost',
'-proxyPort': 8080,
'-proxyUser': 'user',
'-proxyPass': 'pass'
}, function(){
expect(bsLocal.getBinaryArgs().indexOf('-proxyHost localhost')).to.not.equal(-1);
expect(bsLocal.getBinaryArgs().indexOf('-proxyPort 8080')).to.not.equal(-1);
Expand All @@ -119,7 +119,7 @@ describe('Local', function () {
});

it('should set hosts', function (done) {
bsLocal.start({ key: process.env.BROWSERSTACK_ACCESS_KEY, onlyCommand: true, hosts: 'localhost,8000,0' }, function(){
bsLocal.start({ '-key': process.env.BROWSERSTACK_ACCESS_KEY, onlyCommand: true, '-hosts': 'localhost,8000,0' }, function(){
expect(bsLocal.getBinaryArgs().indexOf('localhost,8000,0')).to.not.equal(-1);
done();
});
Expand Down