Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
9b9cbb4a
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,发现更多精彩内容 >>
未验证
提交
9b9cbb4a
编写于
7月 13, 2018
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixed test to correctly text relative URLs
doesnt add query param if source & target projects match
上级
246ac064
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
32 addition
and
13 deletion
+32
-13
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue
.../vue_merge_request_widget/components/mr_widget_header.vue
+5
-6
spec/javascripts/vue_mr_widget/components/mr_widget_header_spec.js
...scripts/vue_mr_widget/components/mr_widget_header_spec.js
+27
-7
未找到文件。
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.vue
浏览文件 @
9b9cbb4a
<
script
>
import
tooltip
from
'
~/vue_shared/directives/tooltip
'
;
import
{
n__
}
from
'
~/locale
'
;
import
{
webIDEUrl
}
from
'
~/lib/utils/url_utility
'
;
import
{
mergeUrlParams
,
webIDEUrl
}
from
'
~/lib/utils/url_utility
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
clipboardButton
from
'
~/vue_shared/components/clipboard_button.vue
'
;
...
...
@@ -43,11 +43,10 @@ export default {
return
this
.
isBranchTitleLong
(
this
.
mr
.
targetBranch
);
},
webIdePath
()
{
return
webIDEUrl
(
`/
${
this
.
mr
.
sourceProjectFullPath
}
/merge_requests/
${
this
.
mr
.
iid
}
?target_project=
${
this
.
mr
.
targetProjectFullPath
}
`
,
);
return
mergeUrlParams
({
target_project
:
this
.
mr
.
sourceProjectFullPath
!==
this
.
mr
.
targetProjectFullPath
?
this
.
mr
.
targetProjectFullPath
:
''
,
},
webIDEUrl
(
`/
${
this
.
mr
.
sourceProjectFullPath
}
/merge_requests/
${
this
.
mr
.
iid
}
`
));
},
},
methods
:
{
...
...
spec/javascripts/vue_mr_widget/components/mr_widget_header_spec.js
浏览文件 @
9b9cbb4a
...
...
@@ -150,19 +150,39 @@ describe('MRWidgetHeader', () => {
expect
(
button
.
textContent
.
trim
()).
toEqual
(
'
Open in Web IDE
'
);
expect
(
button
.
getAttribute
(
'
href
'
)).
toEqual
(
'
/-/ide/project/root/gitlab-ce/merge_requests/1?target_project=gitlab-org
/
gitlab-ce
'
,
'
/-/ide/project/root/gitlab-ce/merge_requests/1?target_project=gitlab-org
%2F
gitlab-ce
'
,
);
});
it
(
'
renders web ide button with relative URL
'
,
()
=>
{
it
(
'
renders web ide button with blank query string if target & source project branch
'
,
done
=>
{
vm
.
mr
.
targetProjectFullPath
=
'
root/gitlab-ce
'
;
vm
.
$nextTick
(()
=>
{
const
button
=
vm
.
$el
.
querySelector
(
'
.js-web-ide
'
);
expect
(
button
.
textContent
.
trim
()).
toEqual
(
'
Open in Web IDE
'
);
expect
(
button
.
getAttribute
(
'
href
'
)).
toEqual
(
'
/-/ide/project/root/gitlab-ce/merge_requests/1?target_project=
'
,
);
done
();
});
});
it
(
'
renders web ide button with relative URL
'
,
done
=>
{
gon
.
relative_url_root
=
'
/gitlab
'
;
vm
.
mr
.
iid
=
2
;
const
button
=
vm
.
$el
.
querySelector
(
'
.js-web-ide
'
);
vm
.
$nextTick
(()
=>
{
const
button
=
vm
.
$el
.
querySelector
(
'
.js-web-ide
'
);
expect
(
button
.
textContent
.
trim
()).
toEqual
(
'
Open in Web IDE
'
);
expect
(
button
.
getAttribute
(
'
href
'
)).
toEqual
(
'
/-/ide/project/root/gitlab-ce/merge_requests/1?target_project=gitlab-org/gitlab-ce
'
,
);
expect
(
button
.
textContent
.
trim
()).
toEqual
(
'
Open in Web IDE
'
);
expect
(
button
.
getAttribute
(
'
href
'
)).
toEqual
(
'
/gitlab/-/ide/project/root/gitlab-ce/merge_requests/2?target_project=gitlab-org%2Fgitlab-ce
'
,
);
done
();
});
});
it
(
'
renders download dropdown with links
'
,
()
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录