提交 08563b3a 编写于 作者: Huan (李卓桓)'s avatar Huan (李卓桓)

code clean

上级 c1ed0917
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
"lint": "npm run eslint && npm run tslint", "lint": "npm run eslint && npm run tslint",
"eslint": "eslint \"{bin,example,src,test}/**/*.js\"", "eslint": "eslint \"{bin,example,src,test}/**/*.js\"",
"tslint": "tslint \"{bin,example,src,test}/**/*.ts\" && tsc --noEmit", "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", "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", "test": "npm run test:chrome",
"posttest": "npm run clean && npm run sloc", "posttest": "npm run clean && npm run sloc",
......
...@@ -51,8 +51,6 @@ export class Browser extends EventEmitter { ...@@ -51,8 +51,6 @@ export class Browser extends EventEmitter {
public toString() { return `Browser({head:${this.setting.head})` } public toString() { return `Browser({head:${this.setting.head})` }
public async init(): Promise<void> { public async init(): Promise<void> {
// this.targetState('open')
// this.currentState('opening')
this.state.target('open') this.state.target('open')
this.state.current('open', false) this.state.current('open', false)
...@@ -61,11 +59,7 @@ export class Browser extends EventEmitter { ...@@ -61,11 +59,7 @@ export class Browser extends EventEmitter {
const jumpUrl = 'https://wx.qq.com/zh_CN/htmledition/v2/images/webwxgeticon.jpg' const jumpUrl = 'https://wx.qq.com/zh_CN/htmledition/v2/images/webwxgeticon.jpg'
try { try {
// await this.initDriver()
await this.driver.init() await this.driver.init()
// this.live = true
await this.open(jumpUrl) await this.open(jumpUrl)
await this.loadCookie() await this.loadCookie()
.catch(e => { // fail safe .catch(e => { // fail safe
...@@ -75,16 +69,15 @@ export class Browser extends EventEmitter { ...@@ -75,16 +69,15 @@ export class Browser extends EventEmitter {
) )
}) })
await this.open() await this.open()
/** /**
* when open url, there could happen a quit() call. * when open url, there could happen a quit() call.
* should check here: if we are in `close` target state, we should clean up * should check here: if we are in `close` target state, we should clean up
*/ */
// if (this.targetState() !== 'open') {
if (this.state.target() !== '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') this.state.current('open')
return return
......
...@@ -19,7 +19,7 @@ test('Firer smoking test', t => { ...@@ -19,7 +19,7 @@ test('Firer smoking test', t => {
t.true(true, 'should be true') t.true(true, 'should be true')
}) })
test('Firer.checkFriendConfirm', t => { test('Firer.parseFriendConfirm', t => {
const contentList = [ const contentList = [
[ [
'You have added 李卓桓 as your WeChat contact. Start chatting!' 'You have added 李卓桓 as your WeChat contact. Start chatting!'
...@@ -41,7 +41,7 @@ test('Firer.checkFriendConfirm', t => { ...@@ -41,7 +41,7 @@ test('Firer.checkFriendConfirm', t => {
t.false(result, 'should be falsy for other msg') t.false(result, 'should be falsy for other msg')
}) })
test('Firer.checkRoomJoin', t => { test('Firer.parseRoomJoin', t => {
const contentList: [string, string, string[]][] = [ const contentList: [string, string, string[]][] = [
[ [
`You've invited "李卓桓" to the group chat` `You've invited "李卓桓" to the group chat`
...@@ -83,7 +83,7 @@ test('Firer.checkRoomJoin', t => { ...@@ -83,7 +83,7 @@ test('Firer.checkRoomJoin', t => {
}, Error, 'should throws if message is not expected') }, Error, 'should throws if message is not expected')
}) })
test('Firer.checkRoomLeave', t => { test('Firer.parseRoomLeave', t => {
const contentList = [ const contentList = [
[ [
`You removed "Bruce LEE" from the group chat` `You removed "Bruce LEE" from the group chat`
...@@ -107,7 +107,7 @@ test('Firer.checkRoomLeave', t => { ...@@ -107,7 +107,7 @@ test('Firer.checkRoomLeave', t => {
}, Error, 'should throw if message is not expected') }, Error, 'should throw if message is not expected')
}) })
test('Firer.checkRoomTopic', t => { test('Firer.parseRoomTopic', t => {
const contentList = [ const contentList = [
[ [
`"李卓桓.PreAngel" changed the group name to "ding"` `"李卓桓.PreAngel" changed the group name to "ding"`
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册