Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
9739e45a
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
9739e45a
编写于
11月 16, 2018
作者:
M
Mike Greiling
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix broken karma specs
上级
47774152
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
13 addition
and
6 deletion
+13
-6
spec/javascripts/performance_bar/components/detailed_metric_spec.js
...cripts/performance_bar/components/detailed_metric_spec.js
+1
-1
spec/javascripts/vue_mr_widget/components/mr_widget_rebase_spec.js
...scripts/vue_mr_widget/components/mr_widget_rebase_spec.js
+5
-2
spec/javascripts/vue_mr_widget/components/states/mr_widget_missing_branch_spec.js
...widget/components/states/mr_widget_missing_branch_spec.js
+1
-1
spec/javascripts/vue_mr_widget/components/states/mr_widget_nothing_to_merge_spec.js
...dget/components/states/mr_widget_nothing_to_merge_spec.js
+3
-1
spec/javascripts/vue_mr_widget/components/states/mr_widget_wip_spec.js
...pts/vue_mr_widget/components/states/mr_widget_wip_spec.js
+3
-1
未找到文件。
spec/javascripts/performance_bar/components/detailed_metric_spec.js
浏览文件 @
9739e45a
...
...
@@ -67,7 +67,7 @@ describe('detailedMetric', () => {
vm
.
$el
.
querySelectorAll
(
'
.performance-bar-modal td:nth-child(3)
'
)
.
forEach
((
request
,
index
)
=>
{
expect
(
request
.
innerText
).
to
Contain
(
requestDetails
[
index
].
request
);
expect
(
request
.
innerText
).
to
Equal
(
requestDetails
[
index
].
request
);
});
});
...
...
spec/javascripts/vue_mr_widget/components/mr_widget_rebase_spec.js
浏览文件 @
9739e45a
...
...
@@ -44,7 +44,10 @@ describe('Merge request widget rebase component', () => {
.
textContent
.
trim
();
expect
(
text
).
toContain
(
'
Fast-forward merge is not possible.
'
);
expect
(
text
).
toContain
(
'
Rebase the source branch onto the target branch or merge target
'
);
expect
(
text
.
replace
(
/
\s\s
+/g
,
'
'
)).
toContain
(
'
Rebase the source branch onto the target branch or merge target
'
,
);
expect
(
text
).
toContain
(
'
branch into source branch to allow this merge request to be merged.
'
);
});
...
...
@@ -78,7 +81,7 @@ describe('Merge request widget rebase component', () => {
expect
(
text
).
toContain
(
'
Fast-forward merge is not possible.
'
);
expect
(
text
).
toContain
(
'
Rebase the source branch onto
'
);
expect
(
text
).
toContain
(
'
foo
'
);
expect
(
text
).
toContain
(
'
to allow this merge request to be merged.
'
);
expect
(
text
.
replace
(
/
\s\s
+/g
,
'
'
)
).
toContain
(
'
to allow this merge request to be merged.
'
);
});
});
...
...
spec/javascripts/vue_mr_widget/components/states/mr_widget_missing_branch_spec.js
浏览文件 @
9739e45a
...
...
@@ -33,7 +33,7 @@ describe('MRWidgetMissingBranch', () => {
expect
(
el
.
classList
.
contains
(
'
mr-widget-body
'
)).
toBeTruthy
();
expect
(
el
.
querySelector
(
'
button
'
).
getAttribute
(
'
disabled
'
)).
toBeTruthy
();
expect
(
content
).
toContain
(
'
source branch does not exist.
'
);
expect
(
content
.
replace
(
/
\s\s
+/g
,
'
'
)
).
toContain
(
'
source branch does not exist.
'
);
expect
(
content
).
toContain
(
'
Please restore it or use a different source branch
'
);
});
});
...
...
spec/javascripts/vue_mr_widget/components/states/mr_widget_nothing_to_merge_spec.js
浏览文件 @
9739e45a
...
...
@@ -19,7 +19,9 @@ describe('NothingToMerge', () => {
"
Currently there are no changes in this merge request's source branch
"
,
);
expect
(
vm
.
$el
.
innerText
).
toContain
(
'
Please push new commits or use a different branch.
'
);
expect
(
vm
.
$el
.
innerText
.
replace
(
/
\s\s
+/g
,
'
'
)).
toContain
(
'
Please push new commits or use a different branch.
'
,
);
});
it
(
'
should not show new blob link if there is no link available
'
,
()
=>
{
...
...
spec/javascripts/vue_mr_widget/components/states/mr_widget_wip_spec.js
浏览文件 @
9739e45a
...
...
@@ -85,7 +85,9 @@ describe('Wip', () => {
expect
(
el
.
innerText
).
toContain
(
'
This is a Work in Progress
'
);
expect
(
el
.
querySelector
(
'
button
'
).
getAttribute
(
'
disabled
'
)).
toBeTruthy
();
expect
(
el
.
querySelector
(
'
button
'
).
innerText
).
toContain
(
'
Merge
'
);
expect
(
el
.
querySelector
(
'
.js-remove-wip
'
).
innerText
).
toContain
(
'
Resolve WIP status
'
);
expect
(
el
.
querySelector
(
'
.js-remove-wip
'
).
innerText
.
replace
(
/
\s\s
+/g
,
'
'
)).
toContain
(
'
Resolve WIP status
'
,
);
});
it
(
'
should not show removeWIP button is user cannot update MR
'
,
done
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录