Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
3cc806ee
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,发现更多精彩内容 >>
提交
3cc806ee
编写于
4月 12, 2017
作者:
S
Simon Knox
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
tests for success and failure of deleting branch from MR page
上级
81c920f1
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
54 addition
and
1 deletion
+54
-1
app/assets/javascripts/merged_buttons.js
app/assets/javascripts/merged_buttons.js
+3
-1
spec/javascripts/fixtures/merge_requests.rb
spec/javascripts/fixtures/merge_requests.rb
+7
-0
spec/javascripts/merged_buttons_spec.js
spec/javascripts/merged_buttons_spec.js
+44
-0
未找到文件。
app/assets/javascripts/merged_buttons.js
浏览文件 @
3cc806ee
/* eslint-disable func-names, space-before-function-paren, no-var, prefer-rest-params, wrap-iife, max-len */
import
'
~/lib/utils/url_utility
'
;
(
function
()
{
this
.
MergedButtons
=
(
function
()
{
function
MergedButtons
()
{
...
...
@@ -31,7 +33,7 @@
};
MergedButtons
.
prototype
.
removeBranchSuccess
=
function
()
{
return
location
.
reload
();
gl
.
utils
.
refreshCurrentPage
();
};
MergedButtons
.
prototype
.
removeBranchError
=
function
()
{
...
...
spec/javascripts/fixtures/merge_requests.rb
浏览文件 @
3cc806ee
...
...
@@ -7,6 +7,7 @@ describe Projects::MergeRequestsController, '(JavaScript fixtures)', type: :cont
let
(
:namespace
)
{
create
(
:namespace
,
name:
'frontend-fixtures'
)}
let
(
:project
)
{
create
(
:project
,
namespace:
namespace
,
path:
'merge-requests-project'
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
:with_diffs
,
source_project:
project
,
target_project:
project
,
description:
'- [ ] Task List Item'
)
}
let
(
:merged_merge_request
)
{
create
(
:merge_request
,
:merged
,
source_project:
project
,
target_project:
project
)
}
let
(
:pipeline
)
do
create
(
:ci_pipeline
,
...
...
@@ -32,6 +33,12 @@ describe Projects::MergeRequestsController, '(JavaScript fixtures)', type: :cont
render_merge_request
(
example
.
description
,
merge_request
)
end
it
'merge_requests/merged_merge_request.html.raw'
do
|
example
|
allow_any_instance_of
(
MergeRequest
).
to
receive
(
:source_branch_exists?
).
and_return
(
true
)
allow_any_instance_of
(
MergeRequest
).
to
receive
(
:can_remove_source_branch?
).
and_return
(
true
)
render_merge_request
(
example
.
description
,
merged_merge_request
)
end
private
def
render_merge_request
(
fixture_file_name
,
merge_request
)
...
...
spec/javascripts/merged_buttons_spec.js
0 → 100644
浏览文件 @
3cc806ee
/* global MergedButtons */
import
'
~/merged_buttons
'
;
describe
(
'
MergedButtons
'
,
()
=>
{
const
fixturesPath
=
'
merge_requests/merged_merge_request.html.raw
'
;
preloadFixtures
(
fixturesPath
);
beforeEach
(()
=>
{
loadFixtures
(
fixturesPath
);
this
.
mergedButtons
=
new
MergedButtons
();
this
.
$removeBranchWidget
=
$
(
'
.remove_source_branch_widget:not(.failed)
'
);
this
.
$removeBranchProgress
=
$
(
'
.remove_source_branch_in_progress
'
);
this
.
$removeBranchFailed
=
$
(
'
.remove_source_branch_widget.failed
'
);
this
.
$removeBranchButton
=
$
(
'
.remove_source_branch
'
);
});
describe
(
'
removeSourceBranch
'
,
()
=>
{
it
(
'
shows loader
'
,
()
=>
{
$
(
'
.remove_source_branch
'
).
trigger
(
'
click
'
);
expect
(
this
.
$removeBranchProgress
).
toBeVisible
();
expect
(
this
.
$removeBranchWidget
).
not
.
toBeVisible
();
});
});
describe
(
'
removeBranchSuccess
'
,
()
=>
{
it
(
'
refreshes page when branch removed
'
,
()
=>
{
spyOn
(
gl
.
utils
,
'
refreshCurrentPage
'
).
and
.
stub
();
const
response
=
{
status
:
200
};
this
.
$removeBranchButton
.
trigger
(
'
ajax:success
'
,
response
,
'
xhr
'
);
expect
(
gl
.
utils
.
refreshCurrentPage
).
toHaveBeenCalled
();
});
});
describe
(
'
removeBranchError
'
,
()
=>
{
it
(
'
shows error message
'
,
()
=>
{
const
response
=
{
status
:
500
};
this
.
$removeBranchButton
.
trigger
(
'
ajax:error
'
,
response
,
'
xhr
'
);
expect
(
this
.
$removeBranchFailed
).
toBeVisible
();
expect
(
this
.
$removeBranchProgress
).
not
.
toBeVisible
();
expect
(
this
.
$removeBranchWidget
).
not
.
toBeVisible
();
});
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录