Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
一杯枸杞茶ya
csdn-workflow
提交
34f55649
C
csdn-workflow
项目概览
一杯枸杞茶ya
/
csdn-workflow
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
csdn-workflow
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
34f55649
编写于
6月 22, 2021
作者:
T
Tomas Vik
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor: MR can be from a fork or the same project
上级
7c2f2ed4
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
31 addition
and
2 deletion
+31
-2
src/data_providers/items/mr_item_model.test.ts
src/data_providers/items/mr_item_model.test.ts
+22
-2
src/data_providers/items/mr_item_model.ts
src/data_providers/items/mr_item_model.ts
+5
-0
src/test_utils/entities.ts
src/test_utils/entities.ts
+2
-0
src/types.d.ts
src/types.d.ts
+2
-0
未找到文件。
src/data_providers/items/mr_item_model.test.ts
浏览文件 @
34f55649
import
*
as
vscode
from
'
vscode
'
;
import
{
MrItemModel
}
from
'
./mr_item_model
'
;
import
{
mr
,
repository
}
from
'
../../test_utils/entities
'
;
import
{
mr
}
from
'
../../test_utils/entities
'
;
import
{
discussionOnDiff
,
noteOnDiffTextSnippet
,
...
...
@@ -9,6 +9,7 @@ import {
import
{
CommentingRangeProvider
}
from
'
../../review/commenting_range_provider
'
;
import
{
createWrappedRepository
}
from
'
../../test_utils/create_wrapped_repository
'
;
import
{
fromReviewUri
}
from
'
../../review/review_uri
'
;
import
{
WrappedRepository
}
from
'
../../git/wrapped_repository
'
;
const
createCommentControllerMock
=
vscode
.
comments
.
createCommentController
as
jest
.
Mock
;
...
...
@@ -18,6 +19,7 @@ describe('MrItemModel', () => {
let
canUserCommentOnMr
=
false
;
let
commentController
:
any
;
let
gitLabService
:
any
;
let
repository
:
WrappedRepository
;
const
createCommentThreadMock
=
jest
.
fn
();
...
...
@@ -27,7 +29,7 @@ describe('MrItemModel', () => {
getMrDiff
:
jest
.
fn
().
mockResolvedValue
({
diffs
:
[]
}),
canUserCommentOnMr
:
jest
.
fn
(
async
()
=>
canUserCommentOnMr
),
};
const
repository
=
createWrappedRepository
({
repository
=
createWrappedRepository
({
gitLabService
,
});
item
=
new
MrItemModel
(
mr
,
repository
);
...
...
@@ -45,6 +47,24 @@ describe('MrItemModel', () => {
createCommentThreadMock
.
mockReset
();
});
describe
(
'
MR item context
'
,
()
=>
{
it
(
'
should return return correct context when MR comes from the same project
'
,
()
=>
{
item
=
new
MrItemModel
(
{
...
mr
,
source_project_id
:
1234
,
target_project_id
:
1234
},
repository
,
);
expect
(
item
.
getTreeItem
().
contextValue
).
toBe
(
'
mr-item-from-same-project
'
);
});
it
(
'
should return return correct context when MR comes from a fork
'
,
()
=>
{
item
=
new
MrItemModel
(
{
...
mr
,
source_project_id
:
5678
,
target_project_id
:
1234
},
repository
,
);
expect
(
item
.
getTreeItem
().
contextValue
).
toBe
(
'
mr-item-from-fork
'
);
});
});
it
(
'
should add comment thread to VS Code
'
,
async
()
=>
{
await
item
.
getChildren
();
expect
(
createCommentControllerMock
).
toBeCalledWith
(
...
...
src/data_providers/items/mr_item_model.ts
浏览文件 @
34f55649
...
...
@@ -58,6 +58,7 @@ export class MrItemModel extends ItemModel {
if
(
author
.
avatar_url
)
{
item
.
iconPath
=
vscode
.
Uri
.
parse
(
author
.
avatar_url
);
}
item
.
contextValue
=
`mr-item-from-
${
this
.
isFromFork
?
'
fork
'
:
'
same-project
'
}
`
;
return
item
;
}
...
...
@@ -121,4 +122,8 @@ export class MrItemModel extends ItemModel {
);
});
}
get
isFromFork
():
boolean
{
return
this
.
mr
.
target_project_id
!==
this
.
mr
.
source_project_id
;
}
}
src/test_utils/entities.ts
浏览文件 @
34f55649
...
...
@@ -30,6 +30,8 @@ export const mr: RestMr = {
full
:
'
gitlab-org/gitlab!2000
'
,
},
sha
:
'
69ad609e8891b8aa3db85a35cd2c5747705bd76a
'
,
source_project_id
:
9999
,
target_project_id
:
9999
,
};
export
const
diffFile
:
RestDiffFile
=
{
...
...
src/types.d.ts
浏览文件 @
34f55649
...
...
@@ -23,6 +23,8 @@ interface RestIssuable {
interface
RestMr
extends
RestIssuable
{
sha
:
string
;
source_project_id
:
number
;
target_project_id
:
number
;
}
interface
RestMrVersion
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录