Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
b24316b2
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,发现更多精彩内容 >>
未验证
提交
b24316b2
编写于
11月 20, 2018
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Added a test for open merge request files
上级
ac8895b7
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
28 addition
and
4 deletion
+28
-4
app/assets/javascripts/ide/stores/actions/file.js
app/assets/javascripts/ide/stores/actions/file.js
+1
-1
spec/javascripts/ide/stores/actions/merge_request_spec.js
spec/javascripts/ide/stores/actions/merge_request_spec.js
+27
-3
未找到文件。
app/assets/javascripts/ide/stores/actions/file.js
浏览文件 @
b24316b2
...
...
@@ -74,7 +74,7 @@ export const getFileData = (
const
normalizedHeaders
=
normalizeHeaders
(
headers
);
setPageTitle
(
decodeURI
(
normalizedHeaders
[
'
PAGE-TITLE
'
]));
commit
(
types
.
SET_FILE_DATA
,
{
data
,
file
});
if
(
data
)
commit
(
types
.
SET_FILE_DATA
,
{
data
,
file
});
if
(
openFile
)
commit
(
types
.
TOGGLE_FILE_OPEN
,
path
);
if
(
makeFileActive
)
dispatch
(
'
setFileActive
'
,
path
);
commit
(
types
.
TOGGLE_LOADING
,
{
entry
:
file
});
...
...
spec/javascripts/ide/stores/actions/merge_request_spec.js
浏览文件 @
b24316b2
...
...
@@ -262,16 +262,28 @@ describe('IDE store merge request actions', () => {
bar
:
{},
};
spyOn
(
store
,
'
dispatch
'
).
and
.
callFake
(
type
=>
{
const
originalDispatch
=
store
.
dispatch
;
spyOn
(
store
,
'
dispatch
'
).
and
.
callFake
((
type
,
payload
)
=>
{
switch
(
type
)
{
case
'
getMergeRequestData
'
:
return
Promise
.
resolve
(
testMergeRequest
);
case
'
getMergeRequestChanges
'
:
return
Promise
.
resolve
(
testMergeRequestChanges
);
default
:
case
'
getFiles
'
:
case
'
getMergeRequestVersions
'
:
case
'
getBranchData
'
:
case
'
setFileMrChange
'
:
return
Promise
.
resolve
();
default
:
return
originalDispatch
(
type
,
payload
);
}
});
spyOn
(
service
,
'
getFileData
'
).
and
.
callFake
(()
=>
Promise
.
resolve
({
headers
:
{},
}),
);
});
it
(
'
dispatch actions for merge request data
'
,
done
=>
{
...
...
@@ -303,7 +315,17 @@ describe('IDE store merge request actions', () => {
});
it
(
'
updates activity bar view and gets file data, if changes are found
'
,
done
=>
{
testMergeRequestChanges
.
changes
=
[{
new_path
:
'
foo
'
},
{
new_path
:
'
bar
'
}];
store
.
state
.
entries
.
foo
=
{
url
:
'
test
'
,
};
store
.
state
.
entries
.
bar
=
{
url
:
'
test
'
,
};
testMergeRequestChanges
.
changes
=
[
{
new_path
:
'
foo
'
,
path
:
'
foo
'
},
{
new_path
:
'
bar
'
,
path
:
'
bar
'
},
];
openMergeRequest
(
store
,
mr
)
.
then
(()
=>
{
...
...
@@ -324,6 +346,8 @@ describe('IDE store merge request actions', () => {
openFile
:
true
,
});
});
expect
(
store
.
state
.
openFiles
.
length
).
toBe
(
testMergeRequestChanges
.
changes
.
length
);
})
.
then
(
done
)
.
catch
(
done
.
fail
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录