Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
.Veneno.
wechaty
提交
d8854edb
W
wechaty
项目概览
.Veneno.
/
wechaty
与 Fork 源项目一致
Fork自
wechaty / wechaty
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
W
wechaty
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d8854edb
编写于
11月 12, 2016
作者:
Huan (李卓桓)
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
log for
https://travis-ci.org/wechaty/wechaty/jobs/175324931#L1385
上级
07011098
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
17 addition
and
4 deletion
+17
-4
src/puppet-web/bridge.ts
src/puppet-web/bridge.ts
+13
-0
test/webdriver.spec.ts
test/webdriver.spec.ts
+4
-4
未找到文件。
src/puppet-web/bridge.ts
浏览文件 @
d8854edb
...
@@ -86,6 +86,8 @@ export class Bridge {
...
@@ -86,6 +86,8 @@ export class Bridge {
}
}
public
getInjectio
():
string
{
public
getInjectio
():
string
{
log
.
verbose
(
'
PuppetWebBridge
'
,
'
getInjectio()
'
)
const
fs
=
require
(
'
fs
'
)
const
fs
=
require
(
'
fs
'
)
const
path
=
require
(
'
path
'
)
const
path
=
require
(
'
path
'
)
...
@@ -350,6 +352,13 @@ export class Bridge {
...
@@ -350,6 +352,13 @@ export class Bridge {
* Proxy Call to Wechaty in Bridge
* Proxy Call to Wechaty in Bridge
*/
*/
public
async
proxyWechaty
(
wechatyFunc
,
...
args
):
Promise
<
any
>
{
public
async
proxyWechaty
(
wechatyFunc
,
...
args
):
Promise
<
any
>
{
log
.
verbose
(
'
PuppetWebBridge
'
,
'
proxyWechaty(%s, %s)
'
,
wechatyFunc
,
args
?
args
.
join
(
'
,
'
)
:
''
)
const
argsEncoded
=
new
Buffer
(
const
argsEncoded
=
new
Buffer
(
encodeURIComponent
(
encodeURIComponent
(
JSON
.
stringify
(
args
)
JSON
.
stringify
(
args
)
...
@@ -414,6 +423,8 @@ export class Bridge {
...
@@ -414,6 +423,8 @@ export class Bridge {
* call REAL browser excute for other methods
* call REAL browser excute for other methods
*/
*/
public
execute
(
script
,
...
args
):
Promise
<
any
>
{
public
execute
(
script
,
...
args
):
Promise
<
any
>
{
log
.
verbose
(
'
PuppetWebBridge
'
,
'
execute()
'
)
if
(
!
this
.
puppet
||
!
this
.
puppet
.
browser
)
{
if
(
!
this
.
puppet
||
!
this
.
puppet
.
browser
)
{
return
Promise
.
reject
(
new
Error
(
'
execute(): no puppet or no puppet.browser in bridge
'
))
return
Promise
.
reject
(
new
Error
(
'
execute(): no puppet or no puppet.browser in bridge
'
))
}
}
...
@@ -436,6 +447,8 @@ export class Bridge {
...
@@ -436,6 +447,8 @@ export class Bridge {
}
}
public
ding
(
data
):
Promise
<
any
>
{
public
ding
(
data
):
Promise
<
any
>
{
log
.
verbose
(
'
PuppetWebBridge
'
,
'
ding(%s)
'
,
data
)
return
this
.
proxyWechaty
(
'
ding
'
,
data
)
return
this
.
proxyWechaty
(
'
ding
'
,
data
)
.
catch
(
e
=>
{
.
catch
(
e
=>
{
log
.
error
(
'
PuppetWebBridge
'
,
'
ding(%s) exception: %s
'
,
data
,
e
.
message
)
log
.
error
(
'
PuppetWebBridge
'
,
'
ding(%s) exception: %s
'
,
data
,
e
.
message
)
...
...
test/webdriver.spec.ts
浏览文件 @
d8854edb
...
@@ -34,13 +34,13 @@ test.serial('WebDriver process create & quit test', async t => {
...
@@ -34,13 +34,13 @@ test.serial('WebDriver process create & quit test', async t => {
await
browser
.
open
()
await
browser
.
open
()
t
.
pass
(
'
should open successful
'
)
t
.
pass
(
'
should open successful
'
)
let
pids
=
await
browser
.
getBrowserPid
s
()
let
pids
=
await
browser
.
getBrowserPid
List
()
t
.
truthy
(
pids
.
length
>
0
,
'
should exist browser process after b.open()
'
)
t
.
truthy
(
pids
.
length
>
0
,
'
should exist browser process after b.open()
'
)
await
browser
.
quit
()
await
browser
.
quit
()
t
.
pass
(
'
quited
'
)
t
.
pass
(
'
quited
'
)
pids
=
await
browser
.
getBrowserPid
s
()
pids
=
await
browser
.
getBrowserPid
List
()
t
.
is
(
pids
.
length
,
0
,
'
no driver process after quit
'
)
t
.
is
(
pids
.
length
,
0
,
'
no driver process after quit
'
)
})
})
...
@@ -54,7 +54,7 @@ test.serial('WebDriver smoke testing', async t => {
...
@@ -54,7 +54,7 @@ test.serial('WebDriver smoke testing', async t => {
let
driver
// for help function `execute`
let
driver
// for help function `execute`
const
m
=
(
await
browser
.
getBrowserPid
s
()).
length
const
m
=
(
await
browser
.
getBrowserPid
List
()).
length
t
.
is
(
m
,
0
,
'
should has no browser process before get()
'
)
t
.
is
(
m
,
0
,
'
should has no browser process before get()
'
)
driver
=
await
browser
.
driver
.
init
()
driver
=
await
browser
.
driver
.
init
()
...
@@ -66,7 +66,7 @@ test.serial('WebDriver smoke testing', async t => {
...
@@ -66,7 +66,7 @@ test.serial('WebDriver smoke testing', async t => {
await
driver
.
get
(
'
https://wx.qq.com/
'
)
await
driver
.
get
(
'
https://wx.qq.com/
'
)
t
.
pass
(
'
should open wx.qq.com
'
)
t
.
pass
(
'
should open wx.qq.com
'
)
const
n
=
(
await
browser
.
getBrowserPid
s
()).
length
const
n
=
(
await
browser
.
getBrowserPid
List
()).
length
t
.
truthy
(
n
>
0
,
'
should exist browser process after get()
'
)
t
.
truthy
(
n
>
0
,
'
should exist browser process after get()
'
)
const
retAdd
=
await
driverExecute
(
'
return 1+1
'
)
const
retAdd
=
await
driverExecute
(
'
return 1+1
'
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录