Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
.Veneno.
wechaty
提交
fa319851
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,发现更多精彩内容 >>
提交
fa319851
编写于
7月 06, 2016
作者:
Huan (李卓桓)
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add timeout for ding socket test
上级
b7da4146
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
14 addition
and
10 deletion
+14
-10
src/puppet-web-bridge.js
src/puppet-web-bridge.js
+1
-0
test/puppet-web-spec.js
test/puppet-web-spec.js
+13
-10
未找到文件。
src/puppet-web-bridge.js
浏览文件 @
fa319851
...
@@ -198,6 +198,7 @@ class Bridge {
...
@@ -198,6 +198,7 @@ class Bridge {
const
wechatyScript
=
`return Wechaty.
${
wechatyFunc
}
.apply(undefined,
${
argsDecoded
}
)`
const
wechatyScript
=
`return Wechaty.
${
wechatyFunc
}
.apply(undefined,
${
argsDecoded
}
)`
// log.silly('PuppetWebBridge', 'proxyWechaty(%s, ...args) %s', wechatyFunc, wechatyScript)
// log.silly('PuppetWebBridge', 'proxyWechaty(%s, ...args) %s', wechatyFunc, wechatyScript)
return
this
.
execute
(
'
return typeof Wechaty === "undefined"
'
)
return
this
.
execute
(
'
return typeof Wechaty === "undefined"
'
)
.
then
(
noWechaty
=>
{
.
then
(
noWechaty
=>
{
if
(
noWechaty
)
{
if
(
noWechaty
)
{
...
...
test/puppet-web-spec.js
浏览文件 @
fa319851
...
@@ -35,13 +35,11 @@ test('PuppetWeb smoke testing', function(t) {
...
@@ -35,13 +35,11 @@ test('PuppetWeb smoke testing', function(t) {
yield
p1
yield
p1
const
p2
=
new
Promise
((
resolve
)
=>
{
const
p2
=
new
Promise
((
resolve
)
=>
{
pw
.
once
(
'
logout
'
,
r
=>
{
pw
.
once
(
'
logout
'
,
r
=>
process
.
nextTick
(()
=>
{
// wait to next tick for pw clean logined user status
process
.
nextTick
(()
=>
{
// wait to next tick for pw clean logined user status
// log.verbose('TestPuppetWeb', 'on(logout) received %s, islogined: %s', r, pw.logined())
// log.verbose('TestPuppetWeb', 'on(logout) received %s, islogined: %s', r, pw.logined())
t
.
equal
(
pw
.
logined
()
,
false
,
'
should be logouted after logout event
'
)
t
.
equal
(
pw
.
logined
()
,
false
,
'
should be logouted after logout event
'
)
resolve
()
resolve
()
}))
})
})
})
})
pw
.
server
.
emit
(
'
logout
'
)
pw
.
server
.
emit
(
'
logout
'
)
yield
p2
yield
p2
...
@@ -69,11 +67,11 @@ log.level = 'silly'
...
@@ -69,11 +67,11 @@ log.level = 'silly'
const
ret
=
yield
dingSocket
(
pw
.
server
)
const
ret
=
yield
dingSocket
(
pw
.
server
)
t
.
equal
(
ret
,
EXPECTED_DING_DATA
,
'
should got EXPECTED_DING_DATA after resolved dingSocket()
'
)
t
.
equal
(
ret
,
EXPECTED_DING_DATA
,
'
should got EXPECTED_DING_DATA after resolved dingSocket()
'
)
})
})
.
catch
(
e
=>
{
// Reject
.
catch
(
e
=>
{
// Reject
log
.
warn
(
'
TestPuppetWeb
'
,
'
error: %s
'
,
e
)
log
.
warn
(
'
TestPuppetWeb
'
,
'
error: %s
'
,
e
)
t
.
fail
(
e
)
t
.
fail
(
e
)
})
})
.
then
(
r
=>
{
// Finally
.
then
(
r
=>
{
// Finally
pw
.
quit
()
pw
.
quit
()
.
then
(
t
.
end
)
.
then
(
t
.
end
)
...
@@ -89,6 +87,11 @@ log.level = 'info'
...
@@ -89,6 +87,11 @@ log.level = 'info'
let
totalTime
=
0
let
totalTime
=
0
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
log
.
verbose
(
'
TestPuppetWeb
'
,
'
dingSocket()
'
)
log
.
verbose
(
'
TestPuppetWeb
'
,
'
dingSocket()
'
)
setTimeout
(
_
=>
{
reject
(
'
no response timeout after
'
+
2
*
maxTime
)
},
2
*
maxTime
)
return
testDing
()
return
testDing
()
function
testDing
()
{
function
testDing
()
{
...
@@ -119,9 +122,9 @@ test('Puppet Web Self Message Identification', function(t) {
...
@@ -119,9 +122,9 @@ test('Puppet Web Self Message Identification', function(t) {
t
.
ok
(
p
,
'
should instantiated a PuppetWeb
'
)
t
.
ok
(
p
,
'
should instantiated a PuppetWeb
'
)
const
EXPECTED_USER_ID
=
'
zixia
'
const
EXPECTED_USER_ID
=
'
zixia
'
p
.
userId
=
EXPECTED_USER_ID
const
m
=
new
Message
()
const
m
=
new
Message
()
m
.
set
(
'
from
'
,
EXPECTED_USER_ID
)
m
.
set
(
'
from
'
,
EXPECTED_USER_ID
)
p
.
userId
=
EXPECTED_USER_ID
t
.
ok
(
p
.
self
(
m
),
'
should identified self for message which from is self
'
)
t
.
ok
(
p
.
self
(
m
),
'
should identified self for message which from is self
'
)
t
.
end
()
t
.
end
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录