From e176083ae2c809af484f79dfc0b8f4d918dc2402 Mon Sep 17 00:00:00 2001 From: "Zhuohuan LI (CARPE DIEM)" Date: Tue, 30 Aug 2016 02:47:18 +0800 Subject: [PATCH] code clean --- src/puppet-web/browser.js | 5 ++--- test/puppet-web/browser.spec.js | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/puppet-web/browser.js b/src/puppet-web/browser.js index 4fbb934d..5dced40d 100644 --- a/src/puppet-web/browser.js +++ b/src/puppet-web/browser.js @@ -54,8 +54,7 @@ class Browser extends EventEmitter { }) } - open(url) { - url = url || 'https://wx.qq.com' + open(url = 'https://wx.qq.com') { log.verbose('PuppetWebBrowser', `open(${url})`) // TODO: set a timer to guard driver.get timeout, then retry 3 times 201607 @@ -324,7 +323,7 @@ this.onResourceRequested = function(request, net) { */ // if (cookie.expiry) { cookie.expiry = cookie.expiry * 1000 /* XXX: be aware of new version of webdriver */} - log.silly('PuppetWebBrowser', 'addCookies("%s")', JSON.stringify(cookie)) + log.silly('PuppetWebBrowser', 'addCookies(%s)', JSON.stringify(cookie)) return this.driver.manage() // this is old webdriver format diff --git a/test/puppet-web/browser.spec.js b/test/puppet-web/browser.spec.js index da81dd36..e1e1dd9e 100644 --- a/test/puppet-web/browser.spec.js +++ b/test/puppet-web/browser.spec.js @@ -60,6 +60,7 @@ test('Browser class cookie smoking tests', async t => { const cookies0 = cookies.filter(c => { return RegExp(EXPECTED_COOKIES[0].name).test(c.name) }) t.is(cookies0[0].name, EXPECTED_COOKIES[0].name, 'getCookies() should filter out the cookie named wechaty0') const cookies1 = cookies.filter(c => { return RegExp(EXPECTED_COOKIES[1].name).test(c.name) }) + t.truthy(cookies1, 'should get cookies1') t.is(cookies1[0].name, EXPECTED_COOKIES[1].name, 'getCookies() should filter out the cookie named wechaty1') await b.open() -- GitLab