Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
cf002738
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,发现更多精彩内容 >>
提交
cf002738
编写于
5月 04, 2017
作者:
J
James Lopez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor a few things based on feedback
上级
78d05914
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
45 addition
and
48 deletion
+45
-48
app/controllers/admin/services_controller.rb
app/controllers/admin/services_controller.rb
+3
-1
app/models/service.rb
app/models/service.rb
+0
-10
app/services/projects/propagate_service.rb
app/services/projects/propagate_service.rb
+4
-4
app/workers/propagate_project_service_worker.rb
app/workers/propagate_project_service_worker.rb
+1
-1
spec/controllers/admin/services_controller_spec.rb
spec/controllers/admin/services_controller_spec.rb
+32
-0
spec/models/service_spec.rb
spec/models/service_spec.rb
+0
-27
spec/services/projects/propagate_service_spec.rb
spec/services/projects/propagate_service_spec.rb
+4
-4
spec/workers/propagate_project_service_worker_spec.rb
spec/workers/propagate_project_service_worker_spec.rb
+1
-1
未找到文件。
app/controllers/admin/services_controller.rb
浏览文件 @
cf002738
...
...
@@ -15,7 +15,9 @@ class Admin::ServicesController < Admin::ApplicationController
end
def
update
if
service
.
update_and_propagate
(
service_params
[
:service
])
if
service
.
update_attributes
(
service_params
[
:service
])
PropagateProjectServiceWorker
.
perform_async
(
service
.
id
)
if
service
.
active?
redirect_to
admin_application_settings_services_path
,
notice:
'Application settings saved successfully'
else
...
...
app/models/service.rb
浏览文件 @
cf002738
...
...
@@ -254,16 +254,6 @@ class Service < ActiveRecord::Base
service
end
def
update_and_propagate
(
service_params
)
return
false
unless
update_attributes
(
service_params
)
if
service_params
[
:active
]
PropagateProjectServiceWorker
.
perform_async
(
id
)
end
true
end
private
def
cache_project_has_external_issue_tracker
...
...
app/services/projects/propagate_service.rb
浏览文件 @
cf002738
...
...
@@ -2,15 +2,15 @@ module Projects
class
PropagateService
BATCH_SIZE
=
100
def
self
.
propagate
!
(
*
args
)
new
(
*
args
).
propagate
!
def
self
.
propagate
(
*
args
)
new
(
*
args
).
propagate
end
def
initialize
(
template
)
@template
=
template
end
def
propagate
!
def
propagate
return
unless
@template
&
.
active
Rails
.
logger
.
info
(
"Propagating services for template
#{
@template
.
id
}
"
)
...
...
@@ -28,7 +28,7 @@ module Projects
batch
.
each
{
|
project_id
|
create_from_template
(
project_id
)
}
break
if
batch
.
count
<
BATCH_SIZE
break
if
batch
.
size
<
BATCH_SIZE
offset
+=
BATCH_SIZE
end
...
...
app/workers/propagate_project_service_worker.rb
浏览文件 @
cf002738
...
...
@@ -10,7 +10,7 @@ class PropagateProjectServiceWorker
def
perform
(
template_id
)
return
unless
try_obtain_lease_for
(
template_id
)
Projects
::
PropagateService
.
propagate
!
(
Service
.
find_by
(
id:
template_id
))
Projects
::
PropagateService
.
propagate
(
Service
.
find_by
(
id:
template_id
))
end
private
...
...
spec/controllers/admin/services_controller_spec.rb
浏览文件 @
cf002738
...
...
@@ -23,4 +23,36 @@ describe Admin::ServicesController do
end
end
end
describe
"#update"
do
let
(
:project
)
{
create
(
:empty_project
)
}
let!
(
:service
)
do
RedmineService
.
create
(
project:
project
,
active:
false
,
template:
true
,
properties:
{
project_url:
'http://abc'
,
issues_url:
'http://abc'
,
new_issue_url:
'http://abc'
}
)
end
it
'updates the service params successfully and calls the propagation worker'
do
expect
(
PropagateProjectServiceWorker
).
to
receive
(
:perform_async
).
with
(
service
.
id
)
put
:update
,
id:
service
.
id
,
service:
{
active:
true
}
expect
(
response
).
to
have_http_status
(
302
)
end
it
'updates the service params successfully'
do
expect
(
PropagateProjectServiceWorker
).
not_to
receive
(
:perform_async
)
put
:update
,
id:
service
.
id
,
service:
{
properties:
{}
}
expect
(
response
).
to
have_http_status
(
302
)
end
end
end
spec/models/service_spec.rb
浏览文件 @
cf002738
...
...
@@ -254,31 +254,4 @@ describe Service, models: true do
end
end
end
describe
"#update_and_propagate"
do
let
(
:project
)
{
create
(
:empty_project
)
}
let!
(
:service
)
do
RedmineService
.
create
(
project:
project
,
active:
false
,
properties:
{
project_url:
'http://abc'
,
issues_url:
'http://abc'
,
new_issue_url:
'http://abc'
}
)
end
it
'updates the service params successfully and calls the propagation worker'
do
expect
(
PropagateProjectServiceWorker
).
to
receive
(
:perform_async
).
with
(
service
.
id
)
expect
(
service
.
update_and_propagate
(
active:
true
)).
to
be
true
end
it
'updates the service params successfully'
do
expect
(
PropagateProjectServiceWorker
).
not_to
receive
(
:perform_async
)
expect
(
service
.
update_and_propagate
(
properties:
{})).
to
be
true
end
end
end
spec/services/projects/propagate_service_spec.rb
浏览文件 @
cf002738
...
...
@@ -18,7 +18,7 @@ describe Projects::PropagateService, services: true do
let!
(
:project
)
{
create
(
:empty_project
)
}
it
'creates services for projects'
do
expect
{
described_class
.
propagate
!
(
service_template
)
}.
expect
{
described_class
.
propagate
(
service_template
)
}.
to
change
{
Service
.
count
}.
by
(
1
)
end
...
...
@@ -36,7 +36,7 @@ describe Projects::PropagateService, services: true do
Service
.
build_from_template
(
project
.
id
,
other_service
).
save!
expect
{
described_class
.
propagate
!
(
service_template
)
}.
expect
{
described_class
.
propagate
(
service_template
)
}.
to
change
{
Service
.
count
}.
by
(
1
)
end
...
...
@@ -55,12 +55,12 @@ describe Projects::PropagateService, services: true do
Service
.
build_from_template
(
project
.
id
,
service_template
).
save!
Service
.
build_from_template
(
project
.
id
,
other_service
).
save!
expect
{
described_class
.
propagate
!
(
service_template
)
}.
expect
{
described_class
.
propagate
(
service_template
)
}.
not_to
change
{
Service
.
count
}
end
it
'creates the service containing the template attributes'
do
described_class
.
propagate
!
(
service_template
)
described_class
.
propagate
(
service_template
)
service
=
Service
.
find_by
(
type:
service_template
.
type
,
template:
false
)
...
...
spec/workers/propagate_project_service_worker_spec.rb
浏览文件 @
cf002738
...
...
@@ -21,7 +21,7 @@ describe PropagateProjectServiceWorker do
describe
'#perform'
do
it
'calls the propagate service with the template'
do
expect
(
Projects
::
PropagateService
).
to
receive
(
:propagate
!
).
with
(
service_template
)
expect
(
Projects
::
PropagateService
).
to
receive
(
:propagate
).
with
(
service_template
)
subject
.
perform
(
service_template
.
id
)
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录