diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-20 11:45:08 +0300 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-20 11:45:08 +0300 |
commit | 439c63365f196badda401be0f8517ec9a561b99a (patch) | |
tree | 078cb92cce28fc91fceec63c9d79e1ce52b0ab67 /spec/views | |
parent | bce962a87c9aa76b63f96b1c7ce302ba233ea68e (diff) | |
parent | 2ee197086a87d22c9203c9a3642f9db6d40f54c4 (diff) |
Merge branch 'issue_25542' into 'master'
Improve JIRA event descriptions
Closes #25542
See merge request gitlab-org/gitlab-ce!17811
Diffstat (limited to 'spec/views')
-rw-r--r-- | spec/views/projects/services/_form.haml_spec.rb | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/spec/views/projects/services/_form.haml_spec.rb b/spec/views/projects/services/_form.haml_spec.rb new file mode 100644 index 00000000000..85167bca115 --- /dev/null +++ b/spec/views/projects/services/_form.haml_spec.rb @@ -0,0 +1,46 @@ +require 'spec_helper' + +describe 'projects/services/_form' do + let(:project) { create(:redmine_project) } + let(:user) { create(:admin) } + + before do + assign(:project, project) + + allow(controller).to receive(:current_user).and_return(user) + + allow(view).to receive_messages(current_user: user, + can?: true, + current_application_settings: Gitlab::CurrentSettings.current_application_settings) + end + + context 'commit_events and merge_request_events' do + before do + assign(:service, project.redmine_service) + end + + it 'display merge_request_events and commit_events descriptions' do + allow(RedmineService).to receive(:supported_events).and_return(%w(commit merge_request)) + + render + + expect(rendered).to have_content('Event will be triggered when a commit is created/updated') + expect(rendered).to have_content('Event will be triggered when a merge request is created/updated/merged') + end + + context 'when service is JIRA' do + let(:project) { create(:jira_project) } + + before do + assign(:service, project.jira_service) + end + + it 'display merge_request_events and commit_events descriptions' do + render + + expect(rendered).to have_content('JIRA comments will be created when an issue gets referenced in a commit.') + expect(rendered).to have_content('JIRA comments will be created when an issue gets referenced in a merge request.') + end + end + end +end |