Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
ae62fc05
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,发现更多精彩内容 >>
提交
ae62fc05
编写于
4月 06, 2017
作者:
A
Alfredo Sumaran
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes failing spec
上级
0dd3ce62
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
1 deletion
+16
-1
app/assets/javascripts/merge_request_tabs.js
app/assets/javascripts/merge_request_tabs.js
+2
-0
spec/javascripts/merge_request_tabs_spec.js
spec/javascripts/merge_request_tabs_spec.js
+14
-1
未找到文件。
app/assets/javascripts/merge_request_tabs.js
浏览文件 @
ae62fc05
...
...
@@ -90,6 +90,7 @@ import './flash';
.
on
(
'
click
'
,
this
.
clickTab
);
}
// Used in tests
unbindEvents
()
{
$
(
document
)
.
off
(
'
shown.bs.tab
'
,
'
.merge-request-tabs a[data-toggle="tab"]
'
,
this
.
tabShown
)
...
...
@@ -103,6 +104,7 @@ import './flash';
if
(
this
.
commitPipelinesTable
)
{
document
.
querySelector
(
'
#commit-pipeline-table-view
'
)
.
removeChild
(
this
.
commitPipelinesTable
.
$el
);
this
.
commitPipelinesTable
.
$destroy
();
}
}
...
...
spec/javascripts/merge_request_tabs_spec.js
浏览文件 @
ae62fc05
...
...
@@ -39,7 +39,8 @@ require('vendor/jquery.scrollTo');
});
afterEach
(
function
()
{
this
.
class
.
destroy
();
this
.
class
.
unbindEvents
();
this
.
class
.
destroyPipelinesView
();
});
describe
(
'
#activateTab
'
,
function
()
{
...
...
@@ -65,6 +66,7 @@ require('vendor/jquery.scrollTo');
expect
(
$
(
'
#diffs
'
)).
toHaveClass
(
'
active
'
);
});
});
describe
(
'
#opensInNewTab
'
,
function
()
{
var
tabUrl
;
var
windowTarget
=
'
_blank
'
;
...
...
@@ -116,6 +118,7 @@ require('vendor/jquery.scrollTo');
stopImmediatePropagation
:
function
()
{}
});
});
it
(
'
opens page tab in a new browser tab with Cmd+Click - Mac
'
,
function
()
{
spyOn
(
window
,
'
open
'
).
and
.
callFake
(
function
(
url
,
name
)
{
expect
(
url
).
toEqual
(
tabUrl
);
...
...
@@ -129,6 +132,7 @@ require('vendor/jquery.scrollTo');
stopImmediatePropagation
:
function
()
{}
});
});
it
(
'
opens page tab in a new browser tab with Middle-click - Mac/PC
'
,
function
()
{
spyOn
(
window
,
'
open
'
).
and
.
callFake
(
function
(
url
,
name
)
{
expect
(
url
).
toEqual
(
tabUrl
);
...
...
@@ -149,6 +153,7 @@ require('vendor/jquery.scrollTo');
spyOn
(
$
,
'
ajax
'
).
and
.
callFake
(
function
()
{});
this
.
subject
=
this
.
class
.
setCurrentAction
;
});
it
(
'
changes from commits
'
,
function
()
{
setLocation
({
pathname
:
'
/foo/bar/merge_requests/1/commits
'
...
...
@@ -156,13 +161,16 @@ require('vendor/jquery.scrollTo');
expect
(
this
.
subject
(
'
notes
'
)).
toBe
(
'
/foo/bar/merge_requests/1
'
);
expect
(
this
.
subject
(
'
diffs
'
)).
toBe
(
'
/foo/bar/merge_requests/1/diffs
'
);
});
it
(
'
changes from diffs
'
,
function
()
{
setLocation
({
pathname
:
'
/foo/bar/merge_requests/1/diffs
'
});
expect
(
this
.
subject
(
'
notes
'
)).
toBe
(
'
/foo/bar/merge_requests/1
'
);
expect
(
this
.
subject
(
'
commits
'
)).
toBe
(
'
/foo/bar/merge_requests/1/commits
'
);
});
it
(
'
changes from diffs.html
'
,
function
()
{
setLocation
({
pathname
:
'
/foo/bar/merge_requests/1/diffs.html
'
...
...
@@ -170,6 +178,7 @@ require('vendor/jquery.scrollTo');
expect
(
this
.
subject
(
'
notes
'
)).
toBe
(
'
/foo/bar/merge_requests/1
'
);
expect
(
this
.
subject
(
'
commits
'
)).
toBe
(
'
/foo/bar/merge_requests/1/commits
'
);
});
it
(
'
changes from notes
'
,
function
()
{
setLocation
({
pathname
:
'
/foo/bar/merge_requests/1
'
...
...
@@ -177,6 +186,7 @@ require('vendor/jquery.scrollTo');
expect
(
this
.
subject
(
'
diffs
'
)).
toBe
(
'
/foo/bar/merge_requests/1/diffs
'
);
expect
(
this
.
subject
(
'
commits
'
)).
toBe
(
'
/foo/bar/merge_requests/1/commits
'
);
});
it
(
'
includes search parameters and hash string
'
,
function
()
{
setLocation
({
pathname
:
'
/foo/bar/merge_requests/1/diffs
'
,
...
...
@@ -185,6 +195,7 @@ require('vendor/jquery.scrollTo');
});
expect
(
this
.
subject
(
'
show
'
)).
toBe
(
'
/foo/bar/merge_requests/1?view=parallel#L15-35
'
);
});
it
(
'
replaces the current history state
'
,
function
()
{
var
newState
;
setLocation
({
...
...
@@ -197,6 +208,7 @@ require('vendor/jquery.scrollTo');
},
document
.
title
,
newState
);
}
});
it
(
'
treats "show" like "notes"
'
,
function
()
{
setLocation
({
pathname
:
'
/foo/bar/merge_requests/1/commits
'
...
...
@@ -207,6 +219,7 @@ require('vendor/jquery.scrollTo');
describe
(
'
#tabShown
'
,
()
=>
{
beforeEach
(
function
()
{
spyOn
(
$
,
'
ajax
'
).
and
.
callFake
(
function
()
{});
loadFixtures
(
'
merge_requests/merge_request_with_task_list.html.raw
'
);
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录