Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Five-菜鸟级
echarts
提交
24eff674
E
echarts
项目概览
Five-菜鸟级
/
echarts
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
echarts
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
24eff674
编写于
9月 11, 2019
作者:
P
pissang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
test: fix expected/actual screenshot path bug.
上级
ea2c006f
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
10 addition
and
10 deletion
+10
-10
test/runTest/cli.js
test/runTest/cli.js
+10
-10
未找到文件。
test/runTest/cli.js
浏览文件 @
24eff674
...
...
@@ -73,7 +73,7 @@ function replaceEChartsVersion(interceptedRequest, version) {
}
}
async
function
takeScreenshot
(
page
,
fullPage
,
fileUrl
,
desc
,
version
,
minor
)
{
async
function
takeScreenshot
(
page
,
fullPage
,
fileUrl
,
desc
,
isExpected
,
minor
)
{
let
screenshotName
=
testNameFromFile
(
fileUrl
);
if
(
desc
)
{
screenshotName
+=
'
-
'
+
slugify
(
desc
,
{
replacement
:
'
-
'
,
lower
:
true
});
...
...
@@ -81,7 +81,7 @@ async function takeScreenshot(page, fullPage, fileUrl, desc, version, minor) {
if
(
minor
)
{
screenshotName
+=
'
-
'
+
minor
;
}
let
screenshotPrefix
=
version
?
'
expected
'
:
'
actual
'
;
let
screenshotPrefix
=
isExpected
?
'
expected
'
:
'
actual
'
;
fse
.
ensureDirSync
(
path
.
join
(
__dirname
,
getScreenshotDir
()));
let
screenshotPath
=
path
.
join
(
__dirname
,
`
${
getScreenshotDir
()}
/
${
screenshotName
}
-
${
screenshotPrefix
}
.png`
);
await
page
.
screenshot
({
...
...
@@ -92,7 +92,7 @@ async function takeScreenshot(page, fullPage, fileUrl, desc, version, minor) {
return
{
screenshotName
,
screenshotPath
};
}
async
function
runActions
(
page
,
testOpt
,
version
,
screenshots
)
{
async
function
runActions
(
page
,
testOpt
,
isExpected
,
screenshots
)
{
let
timeline
=
new
Timeline
(
page
);
let
actions
;
try
{
...
...
@@ -114,10 +114,10 @@ async function runActions(page, testOpt, version, screenshots) {
let
count
=
0
;
async
function
_innerTakeScreenshot
()
{
const
desc
=
action
.
desc
||
action
.
name
;
const
{
screenshotName
,
screenshotPath
}
=
await
takeScreenshot
(
page
,
false
,
testOpt
.
fileUrl
,
desc
,
version
,
count
++
);
const
{
screenshotName
,
screenshotPath
}
=
await
takeScreenshot
(
page
,
false
,
testOpt
.
fileUrl
,
desc
,
isExpected
,
count
++
);
screenshots
.
push
({
screenshotName
,
desc
,
screenshotPath
});
}
await
timeline
.
runAction
(
action
,
_innerTakeScreenshot
,
playbackSpeed
);
await
timeline
.
runAction
(
action
,
_innerTakeScreenshot
,
playbackSpeed
);
if
(
count
===
0
)
{
await
waitTime
(
200
);
...
...
@@ -131,7 +131,7 @@ async function runActions(page, testOpt, version, screenshots) {
timeline
.
stop
();
}
async
function
runTestPage
(
browser
,
testOpt
,
version
,
runtimeCode
)
{
async
function
runTestPage
(
browser
,
testOpt
,
version
,
runtimeCode
,
isExpected
)
{
const
fileUrl
=
testOpt
.
fileUrl
;
const
screenshots
=
[];
const
logs
=
[];
...
...
@@ -164,10 +164,10 @@ async function runTestPage(browser, testOpt, version, runtimeCode) {
// Final shot.
await
page
.
mouse
.
move
(
0
,
0
);
let
desc
=
'
Full Shot
'
;
const
{
screenshotName
,
screenshotPath
}
=
await
takeScreenshot
(
page
,
true
,
fileUrl
,
desc
,
version
);
const
{
screenshotName
,
screenshotPath
}
=
await
takeScreenshot
(
page
,
true
,
fileUrl
,
desc
,
isExpected
);
screenshots
.
push
({
screenshotName
,
desc
,
screenshotPath
});
await
runActions
(
page
,
testOpt
,
version
,
screenshots
);
await
runActions
(
page
,
testOpt
,
isExpected
,
screenshots
);
}
catch
(
e
)
{
console
.
error
(
e
);
...
...
@@ -192,8 +192,8 @@ async function writePNG(diffPNG, diffPath) {
async
function
runTest
(
browser
,
testOpt
,
runtimeCode
,
expectedVersion
,
actualVersion
)
{
testOpt
.
status
===
'
running
'
;
const
expectedResult
=
await
runTestPage
(
browser
,
testOpt
,
expectedVersion
,
runtimeCode
);
const
actualResult
=
await
runTestPage
(
browser
,
testOpt
,
actualVersion
,
runtimeCode
);
const
expectedResult
=
await
runTestPage
(
browser
,
testOpt
,
expectedVersion
,
runtimeCode
,
true
);
const
actualResult
=
await
runTestPage
(
browser
,
testOpt
,
actualVersion
,
runtimeCode
,
false
);
// sortScreenshots(expectedResult.screenshots);
// sortScreenshots(actualResult.screenshots);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录