Commit 8bcc911b authored by Luke "Jared" Bennett's avatar Luke "Jared" Bennett

Added error message and test

parent 85f0229b
= content_for :flash_message do
.alert.alert-danger= @teams if @teams.is_a?(String)
%p %p
You aren’t a member of any team on the Mattermost instance at You aren’t a member of any team on the Mattermost instance at
%strong= Gitlab.config.mattermost.host %strong= Gitlab.config.mattermost.host
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
.inline.pull-right .inline.pull-right
= custom_icon('mattermost_logo', size: 48) = custom_icon('mattermost_logo', size: 48)
%h3 Install Mattermost Command %h3 Install Mattermost Command
- if @teams.empty? - if @teams.is_a?(String) || @teams.empty?
= render 'no_teams' = render 'no_teams'
- else - else
= render 'team_selection' = render 'team_selection'
...@@ -99,6 +99,15 @@ feature 'Setup Mattermost slash commands', feature: true do ...@@ -99,6 +99,15 @@ feature 'Setup Mattermost slash commands', feature: true do
expect(select_element.all('option').count).to eq(3) expect(select_element.all('option').count).to eq(3)
end end
it 'shows an error alert with the error message if there is an error requesting teams' do
allow_any_instance_of(MattermostSlashCommandsService).to receive(:list_teams) { 'test mattermost error message' }
click_link 'Add to Mattermost'
expect(page).to have_selector('.alert')
expect(page).to have_content('test mattermost error message')
end
def stub_teams(count: 0) def stub_teams(count: 0)
teams = create_teams(count) teams = create_teams(count)
......
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