Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
1a0e54b3
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,发现更多精彩内容 >>
提交
1a0e54b3
编写于
2月 03, 2017
作者:
Z
Z.J. van de Weg
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add tests for Mattermost team creation
上级
297dc701
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
72 addition
and
31 deletion
+72
-31
app/controllers/groups_controller.rb
app/controllers/groups_controller.rb
+1
-0
app/models/chat_team.rb
app/models/chat_team.rb
+5
-0
app/services/groups/create_service.rb
app/services/groups/create_service.rb
+3
-1
app/workers/mattermost/create_team_worker.rb
app/workers/mattermost/create_team_worker.rb
+10
-15
lib/mattermost/client.rb
lib/mattermost/client.rb
+1
-1
lib/mattermost/team.rb
lib/mattermost/team.rb
+16
-2
spec/models/chat_team_spec.rb
spec/models/chat_team_spec.rb
+1
-1
spec/services/groups/create_service_spec.rb
spec/services/groups/create_service_spec.rb
+13
-4
spec/workers/mattermost/create_team_worker_spec.rb
spec/workers/mattermost/create_team_worker_spec.rb
+22
-7
未找到文件。
app/controllers/groups_controller.rb
浏览文件 @
1a0e54b3
...
...
@@ -143,6 +143,7 @@ class GroupsController < Groups::ApplicationController
:share_with_group_lock
,
:visibility_level
,
:parent_id
:create_chat_team
]
end
...
...
app/models/chat_team.rb
0 → 100644
浏览文件 @
1a0e54b3
class
ChatTeam
<
ActiveRecord
::
Base
validates
:team_id
,
presence:
true
belongs_to
:namespace
end
app/services/groups/create_service.rb
浏览文件 @
1a0e54b3
...
...
@@ -5,6 +5,8 @@ module Groups
end
def
execute
create_chat_team
=
params
.
delete
(
:create_chat_team
)
@group
=
Group
.
new
(
params
)
unless
Gitlab
::
VisibilityLevel
.
allowed_for?
(
current_user
,
params
[
:visibility_level
])
...
...
@@ -23,7 +25,7 @@ module Groups
@group
.
save
@group
.
add_owner
(
current_user
)
if
params
[
:create_chat_team
]
&&
Gitlab
.
config
.
mattermost
.
enabled
if
create_chat_team
&&
Gitlab
.
config
.
mattermost
.
enabled
Mattermost
::
CreateTeamWorker
.
perform_async
(
@group
.
id
,
current_user
.
id
)
end
...
...
app/workers/mattermost/create_team_worker.rb
浏览文件 @
1a0e54b3
...
...
@@ -3,26 +3,21 @@ module Mattermost
include
Sidekiq
::
Worker
include
DedicatedSidekiqQueue
sidekiq_options
retry:
5
# Add 5 seconds so the first retry isn't 1 second later
sidekiq_retry_in
do
|
count
|
5
+
5
**
n
end
def
perform
(
group_id
,
current_user_id
,
options
=
{})
@
group
=
Group
.
find
(
group_id
)
group
=
Group
.
find
(
group_id
)
current_user
=
User
.
find
(
current_user_id
)
options
=
team_params
.
merge
(
options
)
# The user that creates the team will be Team Admin
response
=
Mattermost
::
Team
.
new
(
current_user
).
create
(
options
)
ChatTeam
.
create!
(
namespace:
@group
,
name:
response
[
'name'
],
team_id:
response
[
'id'
])
end
private
response
=
Mattermost
::
Team
.
new
(
current_user
).
create
(
group
,
options
)
def
team_params
{
name:
@group
.
path
[
0
..
59
],
display_name:
@group
.
name
[
0
..
59
],
type:
@group
.
public?
?
'O'
:
'I'
# Open vs Invite-only
}
ChatTeam
.
create
(
namespace:
group
,
name:
response
[
'name'
],
team_id:
response
[
'id'
])
end
end
end
lib/mattermost/client.rb
浏览文件 @
1a0e54b3
...
...
@@ -26,7 +26,7 @@ module Mattermost
def
session_get
(
path
,
options
=
{})
with_session
do
|
session
|
get
(
session
,
path
,
options
)
get
(
session
,
path
,
options
)
end
end
...
...
lib/mattermost/team.rb
浏览文件 @
1a0e54b3
...
...
@@ -5,8 +5,22 @@ module Mattermost
session_get
(
'/api/v3/teams/all'
)
end
def
create
(
params
)
session_post
(
'/api/v3/teams/create'
,
body:
params
.
to_json
)
# Creates a team on the linked Mattermost instance, the team admin will be the
# `current_user` passed to the Mattermost::Client instance
def
create
(
group
,
params
)
session_post
(
'/api/v3/teams/create'
,
body:
new_team_params
(
group
,
params
).
to_json
)
end
private
MATTERMOST_TEAM_LENGTH_MAX
=
59
def
new_team_params
(
group
,
options
)
{
name:
group
.
path
[
0
..
MATTERMOST_TEAM_LENGTH_MAX
],
display_name:
group
.
name
[
0
..
MATTERMOST_TEAM_LENGTH_MAX
],
type:
group
.
public?
?
'O'
:
'I'
# Open vs Invite-only
}.
merge
(
options
)
end
end
end
spec/models/chat_team_spec.rb
浏览文件 @
1a0e54b3
...
...
@@ -2,7 +2,7 @@ require 'spec_helper'
describe
ChatTeam
,
type: :model
do
# Associations
it
{
is_expected
.
to
belong_to
(
:
group
)
}
it
{
is_expected
.
to
belong_to
(
:
namespace
)
}
# Fields
it
{
is_expected
.
to
respond_to
(
:name
)
}
...
...
spec/services/groups/create_service_spec.rb
浏览文件 @
1a0e54b3
...
...
@@ -4,11 +4,11 @@ describe Groups::CreateService, '#execute', services: true do
let!
(
:user
)
{
create
(
:user
)
}
let!
(
:group_params
)
{
{
path:
"group_path"
,
visibility_level:
Gitlab
::
VisibilityLevel
::
PUBLIC
}
}
subject
{
service
.
execute
}
describe
'visibility level restrictions'
do
let!
(
:service
)
{
described_class
.
new
(
user
,
group_params
)
}
subject
{
service
.
execute
}
context
"create groups without restricted visibility level"
do
it
{
is_expected
.
to
be_persisted
}
end
...
...
@@ -24,8 +24,6 @@ describe Groups::CreateService, '#execute', services: true do
let!
(
:group
)
{
create
(
:group
)
}
let!
(
:service
)
{
described_class
.
new
(
user
,
group_params
.
merge
(
parent_id:
group
.
id
))
}
subject
{
service
.
execute
}
context
'as group owner'
do
before
{
group
.
add_owner
(
user
)
}
...
...
@@ -40,4 +38,15 @@ describe Groups::CreateService, '#execute', services: true do
end
end
end
describe
'creating a mattermost team'
do
let!
(
:params
)
{
group_params
.
merge
(
create_chat_team:
true
)
}
let!
(
:service
)
{
described_class
.
new
(
user
,
params
)
}
it
'queues a background job'
do
expect
(
Mattermost
::
CreateTeamWorker
).
to
receive
(
:perform_async
)
subject
end
end
end
spec/workers/mattermost/create_team_worker_spec.rb
浏览文件 @
1a0e54b3
...
...
@@ -7,15 +7,30 @@ describe Mattermost::CreateTeamWorker do
describe
'.perform'
do
subject
{
described_class
.
new
.
perform
(
group
.
id
,
admin
.
id
)
}
before
do
allow_any_instance_of
(
Mattermost
::
Team
).
to
receive
(
:create
).
with
(
name:
"path"
,
display_name:
"name"
,
type:
"O"
).
and_return
(
'name'
=>
'my team'
,
'id'
=>
'sjfkdlwkdjfwlkfjwf'
)
context
'succesfull request to mattermost'
do
before
do
allow_any_instance_of
(
Mattermost
::
Team
).
to
receive
(
:create
).
with
(
group
,
{}).
and_return
(
'name'
=>
'my team'
,
'id'
=>
'sjfkdlwkdjfwlkfjwf'
)
end
it
'creates a new chat team'
do
expect
{
subject
}.
to
change
{
ChatTeam
.
count
}.
from
(
0
).
to
(
1
)
end
end
it
'creates a new chat team'
do
expect
{
subject
}.
to
change
{
ChatTeam
.
count
}.
from
(
0
).
to
(
1
)
context
'connection trouble'
do
before
do
allow_any_instance_of
(
Mattermost
::
Team
).
to
receive
(
:create
).
with
(
group
,
{}).
and_raise
(
Mattermost
::
ClientError
.
new
(
'Undefined error'
))
end
it
'does not rescue the error'
do
expect
{
subject
}.
to
raise_error
(
Mattermost
::
ClientError
)
end
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录