Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
f9729659
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,发现更多精彩内容 >>
提交
f9729659
编写于
2月 18, 2013
作者:
A
Andrew8xx8
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Issuable consern uses StateMachine now
上级
8db3920c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
2 addition
and
74 deletion
+2
-74
app/models/concerns/issuable.rb
app/models/concerns/issuable.rb
+2
-11
spec/models/concerns/issuable_spec.rb
spec/models/concerns/issuable_spec.rb
+0
-1
spec/models/issue_spec.rb
spec/models/issue_spec.rb
+0
-31
spec/models/merge_request_spec.rb
spec/models/merge_request_spec.rb
+0
-31
未找到文件。
app/models/concerns/issuable.rb
浏览文件 @
f9729659
...
@@ -17,10 +17,9 @@ module Issuable
...
@@ -17,10 +17,9 @@ module Issuable
validates
:project
,
presence:
true
validates
:project
,
presence:
true
validates
:author
,
presence:
true
validates
:author
,
presence:
true
validates
:title
,
presence:
true
,
length:
{
within:
0
..
255
}
validates
:title
,
presence:
true
,
length:
{
within:
0
..
255
}
validates
:closed
,
inclusion:
{
in:
[
true
,
false
]
}
scope
:opened
,
->
{
w
here
(
closed:
false
)
}
scope
:opened
,
->
{
w
ith_state
(
:opened
)
}
scope
:closed
,
->
{
w
here
(
closed:
true
)
}
scope
:closed
,
->
{
w
ith_state
(
:closed
)
}
scope
:of_group
,
->
(
group
)
{
where
(
project_id:
group
.
project_ids
)
}
scope
:of_group
,
->
(
group
)
{
where
(
project_id:
group
.
project_ids
)
}
scope
:of_user_team
,
->
(
team
)
{
where
(
project_id:
team
.
project_ids
,
assignee_id:
team
.
member_ids
)
}
scope
:of_user_team
,
->
(
team
)
{
where
(
project_id:
team
.
project_ids
,
assignee_id:
team
.
member_ids
)
}
scope
:assigned
,
->
(
u
)
{
where
(
assignee_id:
u
.
id
)}
scope
:assigned
,
->
(
u
)
{
where
(
assignee_id:
u
.
id
)}
...
@@ -62,14 +61,6 @@ module Issuable
...
@@ -62,14 +61,6 @@ module Issuable
assignee_id_changed?
assignee_id_changed?
end
end
def
is_being_closed?
closed_changed?
&&
closed
end
def
is_being_reopened?
closed_changed?
&&
!
closed
end
#
#
# Votes
# Votes
#
#
...
...
spec/models/concerns/issuable_spec.rb
浏览文件 @
f9729659
...
@@ -15,7 +15,6 @@ describe Issue, "Issuable" do
...
@@ -15,7 +15,6 @@ describe Issue, "Issuable" do
it
{
should
validate_presence_of
(
:author
)
}
it
{
should
validate_presence_of
(
:author
)
}
it
{
should
validate_presence_of
(
:title
)
}
it
{
should
validate_presence_of
(
:title
)
}
it
{
should
ensure_length_of
(
:title
).
is_at_least
(
0
).
is_at_most
(
255
)
}
it
{
should
ensure_length_of
(
:title
).
is_at_least
(
0
).
is_at_most
(
255
)
}
it
{
should
ensure_inclusion_of
(
:closed
).
in_array
([
true
,
false
])
}
end
end
describe
"Scope"
do
describe
"Scope"
do
...
...
spec/models/issue_spec.rb
浏览文件 @
f9729659
...
@@ -43,35 +43,4 @@ describe Issue do
...
@@ -43,35 +43,4 @@ describe Issue do
subject
.
is_being_reassigned?
.
should
be_false
subject
.
is_being_reassigned?
.
should
be_false
end
end
end
end
describe
'#is_being_closed?'
do
it
'returns true if the closed attribute has changed and is now true'
do
subject
.
closed
=
true
subject
.
is_being_closed?
.
should
be_true
end
it
'returns false if the closed attribute has changed and is now false'
do
issue
=
create
(
:closed_issue
)
issue
.
closed
=
false
issue
.
is_being_closed?
.
should
be_false
end
it
'returns false if the closed attribute has not changed'
do
subject
.
is_being_closed?
.
should
be_false
end
end
describe
'#is_being_reopened?'
do
it
'returns true if the closed attribute has changed and is now false'
do
issue
=
create
(
:closed_issue
)
issue
.
closed
=
false
issue
.
is_being_reopened?
.
should
be_true
end
it
'returns false if the closed attribute has changed and is now true'
do
subject
.
closed
=
true
subject
.
is_being_reopened?
.
should
be_false
end
it
'returns false if the closed attribute has not changed'
do
subject
.
is_being_reopened?
.
should
be_false
end
end
end
end
spec/models/merge_request_spec.rb
浏览文件 @
f9729659
...
@@ -62,35 +62,4 @@ describe MergeRequest do
...
@@ -62,35 +62,4 @@ describe MergeRequest do
subject
.
is_being_reassigned?
.
should
be_false
subject
.
is_being_reassigned?
.
should
be_false
end
end
end
end
describe
'#is_being_closed?'
do
it
'returns true if the closed attribute has changed and is now true'
do
subject
.
closed
=
true
subject
.
is_being_closed?
.
should
be_true
end
it
'returns false if the closed attribute has changed and is now false'
do
merge_request
=
create
(
:closed_merge_request
)
merge_request
.
closed
=
false
merge_request
.
is_being_closed?
.
should
be_false
end
it
'returns false if the closed attribute has not changed'
do
subject
.
is_being_closed?
.
should
be_false
end
end
describe
'#is_being_reopened?'
do
it
'returns true if the closed attribute has changed and is now false'
do
merge_request
=
create
(
:closed_merge_request
)
merge_request
.
closed
=
false
merge_request
.
is_being_reopened?
.
should
be_true
end
it
'returns false if the closed attribute has changed and is now true'
do
subject
.
closed
=
true
subject
.
is_being_reopened?
.
should
be_false
end
it
'returns false if the closed attribute has not changed'
do
subject
.
is_being_reopened?
.
should
be_false
end
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录