Merge branch 'zj-mattermost-slash-config' of gitlab.com:gitlab-org/gitlab-ce into zj-mattermost-slash-config
This commit is contained in:
commit
e9c14918e5
|
@ -4,7 +4,9 @@
|
|||
%hr
|
||||
= form_for(:mattermost, method: :post, url: namespace_project_mattermost_path(@project.namespace, @project)) do |f|
|
||||
%h4 Team
|
||||
%p Select or create the team where the slash commands will be used in
|
||||
%p
|
||||
= @teams.one? ? 'The team' : 'Select the team'
|
||||
where the slash commands will be used in
|
||||
- selected_id = @teams.keys.first if @teams.one?
|
||||
= f.select(:team_id, mattermost_teams_options(@teams), {}, { class: 'form-control', selected: "#{selected_id}", disabled: @teams.one? })
|
||||
.help-block
|
||||
|
@ -22,8 +24,9 @@
|
|||
%p Choose the word that will trigger commands
|
||||
= f.text_field(:trigger, value: @project.path, class: 'form-control')
|
||||
.help-block
|
||||
%p Trigger word must be unique, and cannot begin with a slash or contain any spaces. Use the word that works best for your team.
|
||||
%p Fill in the word that works best for your team.
|
||||
%p
|
||||
Trigger word must be unique, and can't begin with a slash or contain any spaces.
|
||||
Use the word that works best for your team.
|
||||
%p
|
||||
Suggestions:
|
||||
%code= 'gitlab'
|
||||
|
|
|
@ -32,49 +32,19 @@ feature 'Setup Mattermost slash commands', feature: true do
|
|||
end
|
||||
|
||||
describe 'mattermost service is enabled' do
|
||||
let(:info) { find('.services-installation-info') }
|
||||
|
||||
before do
|
||||
Gitlab.config.mattermost.enabled = true
|
||||
allow(Gitlab.config.mattermost).to receive(:enabled).and_return(true)
|
||||
end
|
||||
|
||||
it 'shows the correct mattermost url' do
|
||||
expect(page).to have_content Gitlab.config.mattermost.host
|
||||
end
|
||||
|
||||
describe 'mattermost service is active' do
|
||||
before do
|
||||
service.active = true
|
||||
end
|
||||
|
||||
it 'shows that mattermost is active' do
|
||||
expect(info).to have_content 'Installed'
|
||||
expect(info).not_to have_content 'Not installed'
|
||||
end
|
||||
|
||||
it 'shows the edit mattermost button' do
|
||||
expect(info).to have_button 'Edit Mattermost'
|
||||
end
|
||||
end
|
||||
|
||||
describe 'mattermost service is not active' do
|
||||
before do
|
||||
service.active = false
|
||||
end
|
||||
|
||||
it 'shows that mattermost is not active' do
|
||||
expect(info).to have_content 'Not installed'
|
||||
end
|
||||
|
||||
it 'shows the add to mattermost button' do
|
||||
expect(info).to have_button 'Add to Mattermost'
|
||||
end
|
||||
it 'shows the add to mattermost button' do
|
||||
expect(page).to have_link 'Add to Mattermost'
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
describe 'mattermost service is not enabled' do
|
||||
before do
|
||||
Gitlab.config.mattermost.enabled = false
|
||||
allow(Gitlab.config.mattermost).to receive(:enabled).and_return(false)
|
||||
end
|
||||
|
||||
it 'shows the correct trigger url' do
|
||||
|
|
Loading…
Reference in New Issue