Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
0a1535a9
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 搜索 >>
提交
0a1535a9
编写于
8月 08, 2016
作者:
D
Douglas Barbosa Alexandre
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Prefixes removed branches name with PR number when importing PR from GH
上级
44a196f8
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
51 addition
and
14 deletion
+51
-14
lib/gitlab/github_import/branch_formatter.rb
lib/gitlab/github_import/branch_formatter.rb
+0
-4
lib/gitlab/github_import/pull_request_formatter.rb
lib/gitlab/github_import/pull_request_formatter.rb
+14
-2
spec/lib/gitlab/github_import/branch_formatter_spec.rb
spec/lib/gitlab/github_import/branch_formatter_spec.rb
+0
-8
spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
+37
-0
未找到文件。
lib/gitlab/github_import/branch_formatter.rb
浏览文件 @
0a1535a9
...
...
@@ -7,10 +7,6 @@ module Gitlab
branch_exists?
&&
commit_exists?
end
def
name
ref
end
def
valid?
repo
.
present?
end
...
...
lib/gitlab/github_import/pull_request_formatter.rb
浏览文件 @
0a1535a9
module
Gitlab
module
GithubImport
class
PullRequestFormatter
<
BaseFormatter
delegate
:exists?
,
:
name
,
:project
,
:repo
,
:sha
,
to: :source_branch
,
prefix:
true
delegate
:exists?
,
:
name
,
:project
,
:repo
,
:sha
,
to: :target_branch
,
prefix:
true
delegate
:exists?
,
:
project
,
:ref
,
:repo
,
:sha
,
to: :source_branch
,
prefix:
true
delegate
:exists?
,
:
project
,
:ref
,
:repo
,
:sha
,
to: :target_branch
,
prefix:
true
def
attributes
{
...
...
@@ -40,10 +40,22 @@ module Gitlab
@source_branch
||=
BranchFormatter
.
new
(
project
,
raw_data
.
head
)
end
def
source_branch_name
@source_branch_name
||=
begin
source_branch_exists?
?
source_branch_ref
:
"pull/
#{
number
}
/
#{
source_branch_ref
}
"
end
end
def
target_branch
@target_branch
||=
BranchFormatter
.
new
(
project
,
raw_data
.
base
)
end
def
target_branch_name
@target_branch_name
||=
begin
target_branch_exists?
?
target_branch_ref
:
"pull/
#{
number
}
/
#{
target_branch_ref
}
"
end
end
private
def
assigned?
...
...
spec/lib/gitlab/github_import/branch_formatter_spec.rb
浏览文件 @
0a1535a9
...
...
@@ -32,14 +32,6 @@ describe Gitlab::GithubImport::BranchFormatter, lib: true do
end
end
describe
'#name'
do
it
'returns raw ref'
do
branch
=
described_class
.
new
(
project
,
double
(
raw
))
expect
(
branch
.
name
).
to
eq
'feature'
end
end
describe
'#repo'
do
it
'returns raw repo'
do
branch
=
described_class
.
new
(
project
,
double
(
raw
))
...
...
spec/lib/gitlab/github_import/pull_request_formatter_spec.rb
浏览文件 @
0a1535a9
...
...
@@ -9,6 +9,7 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
let
(
:source_branch
)
{
double
(
ref:
'feature'
,
repo:
source_repo
,
sha:
source_sha
)
}
let
(
:target_repo
)
{
repository
}
let
(
:target_branch
)
{
double
(
ref:
'master'
,
repo:
target_repo
,
sha:
target_sha
)
}
let
(
:removed_branch
)
{
double
(
ref:
'removed-branch'
,
repo:
source_repo
,
sha:
'2e5d3239642f9161dcbbc4b70a211a68e5e45e2b'
)
}
let
(
:octocat
)
{
double
(
id:
123456
,
login:
'octocat'
)
}
let
(
:created_at
)
{
DateTime
.
strptime
(
'2011-01-26T19:01:12Z'
)
}
let
(
:updated_at
)
{
DateTime
.
strptime
(
'2011-01-27T19:01:12Z'
)
}
...
...
@@ -165,6 +166,42 @@ describe Gitlab::GithubImport::PullRequestFormatter, lib: true do
end
end
describe
'#source_branch_name'
do
context
'when source branch exists'
do
let
(
:raw_data
)
{
double
(
base_data
)
}
it
'returns branch ref'
do
expect
(
pull_request
.
source_branch_name
).
to
eq
'feature'
end
end
context
'when source branch does not exist'
do
let
(
:raw_data
)
{
double
(
base_data
.
merge
(
head:
removed_branch
))
}
it
'prefixes branch name with pull request number'
do
expect
(
pull_request
.
source_branch_name
).
to
eq
'pull/1347/removed-branch'
end
end
end
describe
'#target_branch_name'
do
context
'when source branch exists'
do
let
(
:raw_data
)
{
double
(
base_data
)
}
it
'returns branch ref'
do
expect
(
pull_request
.
target_branch_name
).
to
eq
'master'
end
end
context
'when target branch does not exist'
do
let
(
:raw_data
)
{
double
(
base_data
.
merge
(
base:
removed_branch
))
}
it
'prefixes branch name with pull request number'
do
expect
(
pull_request
.
target_branch_name
).
to
eq
'pull/1347/removed-branch'
end
end
end
describe
'#valid?'
do
context
'when source, and target repos are not a fork'
do
let
(
:raw_data
)
{
double
(
base_data
)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录