Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
591bf92c
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,体验更适合开发者的 AI 搜索 >>
提交
591bf92c
编写于
2月 22, 2016
作者:
I
Iuri de Silvio
提交者:
Rémy Coutable
3月 07, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix bug where Bitbucket `closed` issues were imported as `opened`
上级
903aa7c9
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
90 addition
and
1 deletion
+90
-1
CHANGELOG
CHANGELOG
+1
-0
lib/gitlab/bitbucket_import/importer.rb
lib/gitlab/bitbucket_import/importer.rb
+1
-1
spec/lib/gitlab/bitbucket_import/importer_spec.rb
spec/lib/gitlab/bitbucket_import/importer_spec.rb
+88
-0
未找到文件。
CHANGELOG
浏览文件 @
591bf92c
...
...
@@ -12,6 +12,7 @@ v 8.6.0 (unreleased)
- Add support for cross-project label references
- Update documentation to reflect Guest role not being enforced on internal projects
- Allow search for logged out users
- Fix bug where Bitbucket `closed` issues were imported as `opened` (Iuri de Silvio)
- Don't show Issues/MRs from archived projects in Groups view
- Increase the notes polling timeout over time (Roberto Dip)
- Show labels in dashboard and group milestone views
...
...
lib/gitlab/bitbucket_import/importer.rb
浏览文件 @
591bf92c
...
...
@@ -76,7 +76,7 @@ module Gitlab
project
.
issues
.
create!
(
description:
body
,
title:
issue
[
"title"
],
state:
%w(resolved invalid duplicate wontfix)
.
include?
(
issue
[
"status"
])
?
'closed'
:
'opened'
,
state:
%w(resolved invalid duplicate wontfix
closed
)
.
include?
(
issue
[
"status"
])
?
'closed'
:
'opened'
,
author_id:
gl_user_id
(
project
,
reporter
)
)
end
...
...
spec/lib/gitlab/bitbucket_import/importer_spec.rb
0 → 100644
浏览文件 @
591bf92c
require
'spec_helper'
describe
Gitlab
::
BitbucketImport
::
Importer
,
lib:
true
do
before
do
Gitlab
.
config
.
omniauth
.
providers
<<
OpenStruct
.
new
(
app_id:
"asd123"
,
app_secret:
"asd123"
,
name:
"bitbucket"
)
end
let
(
:statuses
)
do
[
"open"
,
"resolved"
,
"on hold"
,
"invalid"
,
"duplicate"
,
"wontfix"
,
"closed"
# undocumented status
]
end
let
(
:sample_issues_statuses
)
do
issues
=
[]
statuses
.
map
.
with_index
do
|
status
,
index
|
issues
<<
{
local_id:
index
,
status:
status
,
title:
"Issue
#{
index
}
"
,
content:
"Some content to issue
#{
index
}
"
}
end
issues
end
let
(
:project_identifier
)
{
'namespace/repo'
}
let
(
:data
)
do
{
bb_session:
{
bitbucket_access_token:
"123456"
,
bitbucket_access_token_secret:
"secret"
}
}
end
let
(
:project
)
do
create
(
:project
,
import_source:
project_identifier
,
import_data:
ProjectImportData
.
new
(
data:
data
)
)
end
let
(
:importer
)
{
Gitlab
::
BitbucketImport
::
Importer
.
new
(
project
)
}
let
(
:issues_statuses_sample_data
)
do
{
count:
sample_issues_statuses
.
count
,
issues:
sample_issues_statuses
}
end
context
'issues statuses'
do
before
do
stub_request
(
:get
,
"https://bitbucket.org/api/1.0/repositories/
#{
project_identifier
}
"
).
to_return
(
status:
200
,
body:
{
has_issues:
true
}.
to_json
)
stub_request
(
:get
,
"https://bitbucket.org/api/1.0/repositories/
#{
project_identifier
}
/issues?limit=50&sort=utc_created_on&start=0"
).
to_return
(
status:
200
,
body:
issues_statuses_sample_data
.
to_json
)
sample_issues_statuses
.
each_with_index
do
|
issue
,
index
|
stub_request
(
:get
,
"https://bitbucket.org/api/1.0/repositories/
#{
project_identifier
}
/issues/
#{
issue
[
:local_id
]
}
/comments"
).
to_return
(
status:
200
,
body:
[{
author_info:
{
username:
"username"
},
utc_created_on:
index
}].
to_json
)
end
end
it
'map statuses to open or closed'
do
importer
.
execute
expect
(
project
.
issues
.
where
(
state:
"closed"
).
size
).
to
eq
(
5
)
expect
(
project
.
issues
.
where
(
state:
"opened"
).
size
).
to
eq
(
2
)
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录