Skip to content
This repository has been archived by the owner on Feb 10, 2023. It is now read-only.

Commit

Permalink
tweak travis
Browse files Browse the repository at this point in the history
  • Loading branch information
xudafeng committed May 4, 2016
1 parent 2ac3db0 commit d133180
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion lib/macaca-chromedriver.js
Expand Up @@ -88,7 +88,7 @@ class ChromeDriver extends EventEmitter {
}

killAll() {
let cmd = `ps -ef | grep chromedriver | grep -v grep | grep -e '--port=${this.proxyPort}\\(\\s.*\\)\\?$' | awk '{ print $2 }' | xargs kill -15`;
let cmd = `ps -ef | grep chromedriver | grep -v grep | grep -e '--port=*\\(\\s.*\\)\\?$' | awk '{ print $2 }' | xargs kill -15`;

if (_.platform.isWindows) {
cmd = 'FOR /F \"usebackq tokens=5\" %a in (`netstat -nao ^| ' +
Expand Down
2 changes: 0 additions & 2 deletions lib/proxy.js
Expand Up @@ -23,8 +23,6 @@ class Proxy {
constructor(options) {
Object.assign(this, {
scheme: 'http',
proxyHost: '127.0.0.1',
proxyPort: 9515,
urlBase: 'wd/hub',
sessionId: null,
originSessionId: null
Expand Down
1 change: 1 addition & 0 deletions package.json
Expand Up @@ -24,6 +24,7 @@
},
"devDependencies": {
"co-mocha": "~1.1.2",
"detect-port": "^0.1.4",
"istanbul": "*",
"jshint": "*",
"pre-commit": "1.1.1",
Expand Down
7 changes: 6 additions & 1 deletion test/macaca-chromedriver.test.js
Expand Up @@ -14,14 +14,19 @@
'use strict';

var ChromeDriver = require('..');
var detectPort = require('detect-port');

describe('test', function() {
it('should be ok', function() {
ChromeDriver.should.be.ok;
});

it('should start success', function *(done) {
var chromedriver = new ChromeDriver();
var proxyPort = yield detectPort(9515);
console.log(`port: ${proxyPort}`);
var chromedriver = new ChromeDriver({
proxyPort: proxyPort
});

chromedriver.should.be.ok;

Expand Down

0 comments on commit d133180

Please sign in to comment.