diff --git a/package.json b/package.json index 459add68ad569c499ac25ecf50277f30a0a322da..a8b28513c64fa1e838942a659fef4e1cda3b8259 100755 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "lint": "npm run eslint && npm run tslint", "eslint": "eslint \"{bin,example,src,test}/**/*.js\"", "tslint": "tslint \"{bin,example,src,test}/**/*.ts\" && tsc --noEmit", - "pretest": "npm run lint && npm run clean && npm run build", + "pretest": "npm run clean && npm run lint && npm run build", "sloc": "sloc bin example src test index.ts --details --format cli-table --keys total,source,comment && sloc bin example src test index.ts", "test": "npm run test:chrome", "posttest": "npm run clean && npm run sloc", diff --git a/src/puppet-web/browser.ts b/src/puppet-web/browser.ts index 080bf89d42e0ab6b074eb95d27ee6f1359e05c02..ff94b1b6520c334219b8ec0ba074658202dba393 100644 --- a/src/puppet-web/browser.ts +++ b/src/puppet-web/browser.ts @@ -51,8 +51,6 @@ export class Browser extends EventEmitter { public toString() { return `Browser({head:${this.setting.head})` } public async init(): Promise { - // this.targetState('open') - // this.currentState('opening') this.state.target('open') this.state.current('open', false) @@ -61,11 +59,7 @@ export class Browser extends EventEmitter { const jumpUrl = 'https://wx.qq.com/zh_CN/htmledition/v2/images/webwxgeticon.jpg' try { - // await this.initDriver() await this.driver.init() - - // this.live = true - await this.open(jumpUrl) await this.loadCookie() .catch(e => { // fail safe @@ -75,16 +69,15 @@ export class Browser extends EventEmitter { ) }) await this.open() + /** * when open url, there could happen a quit() call. * should check here: if we are in `close` target state, we should clean up */ - // if (this.targetState() !== 'open') { if (this.state.target() !== 'open') { - throw new Error('init() finished but found state.target() is not open. quit().') + throw new Error('init() finished but found state.target() is changed to close. has to quit().') } - // this.currentState('open') this.state.current('open') return diff --git a/src/puppet-web/firer.spec.ts b/src/puppet-web/firer.spec.ts index 6e63ee42a47be98c1564def4522f91a447f562fb..fa6f60e95b9856213d5ca08674c075da94181239 100644 --- a/src/puppet-web/firer.spec.ts +++ b/src/puppet-web/firer.spec.ts @@ -19,7 +19,7 @@ test('Firer smoking test', t => { t.true(true, 'should be true') }) -test('Firer.checkFriendConfirm', t => { +test('Firer.parseFriendConfirm', t => { const contentList = [ [ 'You have added 李卓桓 as your WeChat contact. Start chatting!' @@ -41,7 +41,7 @@ test('Firer.checkFriendConfirm', t => { t.false(result, 'should be falsy for other msg') }) -test('Firer.checkRoomJoin', t => { +test('Firer.parseRoomJoin', t => { const contentList: [string, string, string[]][] = [ [ `You've invited "李卓桓" to the group chat` @@ -83,7 +83,7 @@ test('Firer.checkRoomJoin', t => { }, Error, 'should throws if message is not expected') }) -test('Firer.checkRoomLeave', t => { +test('Firer.parseRoomLeave', t => { const contentList = [ [ `You removed "Bruce LEE" from the group chat` @@ -107,7 +107,7 @@ test('Firer.checkRoomLeave', t => { }, Error, 'should throw if message is not expected') }) -test('Firer.checkRoomTopic', t => { +test('Firer.parseRoomTopic', t => { const contentList = [ [ `"李卓桓.PreAngel" changed the group name to "ding"`