Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
85f0229b
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,发现更多精彩内容 >>
提交
85f0229b
编写于
12月 23, 2016
作者:
Z
Z.J. van de Weg
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix inconsistent return type
上级
b60de9c0
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
11 addition
and
11 deletion
+11
-11
app/controllers/projects/mattermosts_controller.rb
app/controllers/projects/mattermosts_controller.rb
+4
-1
app/models/project_services/mattermost_slash_commands_service.rb
...els/project_services/mattermost_slash_commands_service.rb
+2
-2
lib/mattermost/client.rb
lib/mattermost/client.rb
+2
-2
spec/controllers/projects/mattermosts_controller_spec.rb
spec/controllers/projects/mattermosts_controller_spec.rb
+2
-2
spec/models/project_services/mattermost_slash_commands_service_spec.rb
...roject_services/mattermost_slash_commands_service_spec.rb
+1
-4
未找到文件。
app/controllers/projects/mattermosts_controller.rb
浏览文件 @
85f0229b
...
@@ -34,7 +34,10 @@ class Projects::MattermostsController < Projects::ApplicationController
...
@@ -34,7 +34,10 @@ class Projects::MattermostsController < Projects::ApplicationController
end
end
def
teams
def
teams
@teams
||=
@service
.
list_teams
(
current_user
)
@teams
||=
begin
teams
,
error_message
=
@service
.
list_teams
(
current_user
)
error_message
?
error_message
:
teams
end
end
end
def
service
def
service
...
...
app/models/project_services/mattermost_slash_commands_service.rb
浏览文件 @
85f0229b
...
@@ -30,8 +30,8 @@ class MattermostSlashCommandsService < ChatSlashCommandsService
...
@@ -30,8 +30,8 @@ class MattermostSlashCommandsService < ChatSlashCommandsService
def
list_teams
(
user
)
def
list_teams
(
user
)
Mattermost
::
Team
.
new
(
user
).
all
Mattermost
::
Team
.
new
(
user
).
all
rescue
Mattermost
::
Error
=>
e
rescue
Mattermost
::
Error
[
[],
e
.
message
]
[]
end
end
private
private
...
...
lib/mattermost/client.rb
浏览文件 @
85f0229b
...
@@ -27,12 +27,12 @@ module Mattermost
...
@@ -27,12 +27,12 @@ module Mattermost
end
end
def
json_response
(
response
)
def
json_response
(
response
)
json_response
=
JSON
.
parse
(
response
.
body
)
unless
response
.
success?
unless
response
.
success?
raise
Mattermost
::
ClientError
.
new
(
json_response
[
'message'
]
||
'Undefined error'
)
raise
Mattermost
::
ClientError
.
new
(
json_response
[
'message'
]
||
'Undefined error'
)
end
end
json_response
=
JSON
.
parse
(
response
.
body
)
json_response
json_response
rescue
JSON
::
JSONError
rescue
JSON
::
JSONError
raise
Mattermost
::
ClientError
.
new
(
'Cannot parse response'
)
raise
Mattermost
::
ClientError
.
new
(
'Cannot parse response'
)
...
...
spec/controllers/projects/mattermosts_controller_spec.rb
浏览文件 @
85f0229b
...
@@ -13,13 +13,13 @@ describe Projects::MattermostsController do
...
@@ -13,13 +13,13 @@ describe Projects::MattermostsController do
before
do
before
do
allow_any_instance_of
(
MattermostSlashCommandsService
).
allow_any_instance_of
(
MattermostSlashCommandsService
).
to
receive
(
:list_teams
).
and_return
([])
to
receive
(
:list_teams
).
and_return
([])
end
it
'accepts the request'
do
get
(
:new
,
get
(
:new
,
namespace_id:
project
.
namespace
.
to_param
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
.
to_param
)
project_id:
project
.
to_param
)
end
it
'accepts the request'
do
expect
(
response
).
to
have_http_status
(
200
)
expect
(
response
).
to
have_http_status
(
200
)
end
end
end
end
...
...
spec/models/project_services/mattermost_slash_commands_service_spec.rb
浏览文件 @
85f0229b
...
@@ -113,10 +113,7 @@ describe MattermostSlashCommandsService, :models do
...
@@ -113,10 +113,7 @@ describe MattermostSlashCommandsService, :models do
end
end
it
'shows error messages'
do
it
'shows error messages'
do
teams
,
message
=
subject
expect
(
subject
).
to
eq
([])
expect
(
teams
).
to
be_empty
expect
(
message
).
to
eq
(
'Failed to get team list.'
)
end
end
end
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录