Commit 85f0229b authored by Z.J. van de Weg's avatar Z.J. van de Weg
Browse files

Fix inconsistent return type

parent 50f03b11bc25
......@@ -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
......
......@@ -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
......
......@@ -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')
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment