Commit 2393d30d authored by Z.J. van de Weg's avatar Z.J. van de Weg

Fix rubocop errors [ci skip]

parent e9c14918
......@@ -24,13 +24,13 @@ class MattermostSlashCommandsService < ChatSlashCommandsService
create(command(params))
update(active: true, token: token) if token
rescue => Mattermost::Error => e
false, e.message
rescue Mattermost::Error => e
[false, e.message]
end
def list_teams(user)
Mattermost::Team.new(user).all
rescue => Mattermost::Error => e
rescue Mattermost::Error
[]
end
......
......@@ -34,7 +34,7 @@ module Mattermost
end
json_response
rescue JSON::JSONError => e
rescue JSON::JSONError
raise ClientError('Cannot parse response')
end
end
......
......@@ -41,7 +41,6 @@ feature 'Setup Mattermost slash commands', feature: true do
end
end
describe 'mattermost service is not enabled' do
before do
allow(Gitlab.config.mattermost).to receive(:enabled).and_return(false)
......
......@@ -10,13 +10,13 @@ describe MattermostSlashCommandsService, :models do
before do
allow_any_instance_of(Mattermost::Session).to
receive(:with_session).and_yield
receive(:with_session).and_yield
end
subject do
service.configure!(user, team_id: 'abc',
trigger: 'gitlab', url: 'http://trigger.url',
icon_url: 'http://icon.url/icon.png')
trigger: 'gitlab', url: 'http://trigger.url',
icon_url: 'http://icon.url/icon.png')
end
context 'the requests succeeds' do
......
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