Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
adedf5831412
Commit
85f0229b
authored
Dec 23, 2016
by
Z.J. van de Weg
Browse files
Fix inconsistent return type
parent
50f03b11bc25
Changes
5
Hide whitespace changes
Inline
Side-by-side
app/controllers/projects/mattermosts_controller.rb
View file @
adedf583
...
...
@@ -34,7 +34,10 @@ def configure_params
end
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
def
service
...
...
app/models/project_services/mattermost_slash_commands_service.rb
View file @
adedf583
...
...
@@ -30,8 +30,8 @@ def configure(user, params)
def
list_teams
(
user
)
Mattermost
::
Team
.
new
(
user
).
all
rescue
Mattermost
::
Error
=>
e
[
[],
e
.
message
]
rescue
Mattermost
::
Error
[]
end
private
...
...
lib/mattermost/client.rb
View file @
adedf583
...
...
@@ -27,12 +27,12 @@ def json_post(path, options = {})
end
def
json_response
(
response
)
json_response
=
JSON
.
parse
(
response
.
body
)
unless
response
.
success?
raise
Mattermost
::
ClientError
.
new
(
json_response
[
'message'
]
||
'Undefined error'
)
end
json_response
=
JSON
.
parse
(
response
.
body
)
json_response
rescue
JSON
::
JSONError
raise
Mattermost
::
ClientError
.
new
(
'Cannot parse response'
)
...
...
spec/controllers/projects/mattermosts_controller_spec.rb
View file @
adedf583
...
...
@@ -13,13 +13,13 @@
before
do
allow_any_instance_of
(
MattermostSlashCommandsService
).
to
receive
(
:list_teams
).
and_return
([])
end
it
'accepts the request'
do
get
(
:new
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
.
to_param
)
end
it
'accepts the request'
do
expect
(
response
).
to
have_http_status
(
200
)
end
end
...
...
spec/models/project_services/mattermost_slash_commands_service_spec.rb
View file @
adedf583
...
...
@@ -113,10 +113,7 @@
end
it
'shows error messages'
do
teams
,
message
=
subject
expect
(
teams
).
to
be_empty
expect
(
message
).
to
eq
(
'Failed to get team list.'
)
expect
(
subject
).
to
eq
([])
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment