Skip to content

G
gitlab-ce
Commit 36bfc6c5 authored by Illya Klymov's avatar Illya Klymov
Browse files
Options

Merge branch '16119-revert-automatic-transitions' into 'master' 

Revert "Support automatic transitions of Jira issues"

See merge request gitlab-org/gitlab!54807
parents dafe094a e9e790bf
Show whitespace changes
Inline Side-by-side
Showing with 81 additions and 379 deletions
app/assets/javascripts/integrations/edit/components/jira_trigger_fields.vue
View file @ 36bfc6c5
<script>
import {
GlFormGroup,
GlFormCheckbox,
GlFormRadio,
GlFormInput,
GlLink,
GlSprintf,
} from '@gitlab/ui';
import { GlFormGroup, GlFormCheckbox, GlFormRadio } from '@gitlab/ui';
import { mapGetters } from 'vuex';
import { helpPagePath } from '~/helpers/help_page_helper';
import { s__ } from '~/locale';
import eventHub from '../event_hub';
const commentDetailOptions = [
{
......@@ -27,41 +18,12 @@ const commentDetailOptions = [
},
];
const ISSUE_TRANSITION_AUTO = 'auto';
const ISSUE_TRANSITION_CUSTOM = 'custom';
const issueTransitionOptions = [
{
value: ISSUE_TRANSITION_AUTO,
label: s__('JiraService|Move to Done'),
help: s__(
'JiraService|Automatically transitions Jira issues to the "Done" category. %{linkStart}Learn more%{linkEnd}',
),
link: helpPagePath('user/project/integrations/jira.html', {
anchor: 'automatic-issue-transitions',
}),
},
{
value: ISSUE_TRANSITION_CUSTOM,
label: s__('JiraService|Use custom transitions'),
help: s__(
'JiraService|Set a custom final state by using transition IDs. %{linkStart}Learn about transition IDs%{linkEnd}',
),
link: helpPagePath('user/project/integrations/jira.html', {
anchor: 'custom-issue-transitions',
}),
},
];
export default {
name: 'JiraTriggerFields',
components: {
GlFormGroup,
GlFormCheckbox,
GlFormRadio,
GlFormInput,
GlLink,
GlSprintf,
},
props: {
initialTriggerCommit: {
......@@ -81,52 +43,21 @@ export default {
required: false,
default: 'standard',
},
initialJiraIssueTransitionId: {
type: String,
required: false,
default: '',
},
},
data() {
return {
validated: false,
triggerCommit: this.initialTriggerCommit,
triggerMergeRequest: this.initialTriggerMergeRequest,
enableComments: this.initialEnableComments,
commentDetail: this.initialCommentDetail,
jiraIssueTransitionId: this.initialJiraIssueTransitionId,
issueTransitionMode: this.initialJiraIssueTransitionId.length
? ISSUE_TRANSITION_CUSTOM
: ISSUE_TRANSITION_AUTO,
commentDetailOptions,
issueTransitionOptions,
};
},
computed: {
...mapGetters(['isInheriting']),
showTriggerSettings() {
showEnableComments() {
return this.triggerCommit || this.triggerMergeRequest;
},
validIssueTransitionId() {
return !this.validated || this.jiraIssueTransitionId.length > 0;
},
},
created() {
eventHub.$on('validateForm', this.validateForm);
},
beforeDestroy() {
eventHub.$off('validateForm', this.validateForm);
},
methods: {
validateForm() {
this.validated = true;
},
showCustomIssueTransitions(currentOption) {
return (
this.issueTransitionMode === ISSUE_TRANSITION_CUSTOM &&
currentOption === ISSUE_TRANSITION_CUSTOM
);
},
},
};
</script>
......@@ -158,7 +89,7 @@ export default {
</gl-form-group>
<gl-form-group
v-show="showTriggerSettings"
v-show="showEnableComments"
:label="s__('Integrations|Comment settings:')"
label-for="service[comment_on_event_enabled]"
class="gl-pl-6"
......@@ -175,7 +106,7 @@ export default {
</gl-form-group>
<gl-form-group
v-show="showTriggerSettings && enableComments"
v-show="showEnableComments && enableComments"
:label="s__('Integrations|Comment detail:')"
label-for="service[comment_detail]"
class="gl-pl-9"
......@@ -195,51 +126,5 @@ export default {
</template>
</gl-form-radio>
</gl-form-group>
<gl-form-group
v-show="showTriggerSettings"
:label="s__('JiraService|Transition Jira issues to their final state:')"
class="gl-pl-6"
data-testid="issue-transition-settings"
>
<input type="hidden" name="service[jira_issue_transition_id]" value="" />
<gl-form-radio
v-for="issueTransitionOption in issueTransitionOptions"
:key="issueTransitionOption.value"
v-model="issueTransitionMode"
:value="issueTransitionOption.value"
:disabled="isInheriting"
:data-qa-selector="`service_issue_transition_mode_${issueTransitionOption.value}`"
>
{{ issueTransitionOption.label }}
<template v-if="showCustomIssueTransitions(issueTransitionOption.value)">
<gl-form-input
v-model="jiraIssueTransitionId"
name="service[jira_issue_transition_id]"
type="text"
class="gl-my-3"
data-qa-selector="service_jira_issue_transition_id_field"
:placeholder="s__('JiraService|For example, 12, 24')"
:disabled="isInheriting"
:required="true"
:state="validIssueTransitionId"
/>
<span class="invalid-feedback">
{{ s__('This field is required.') }}
</span>
</template>
<template #help>
<gl-sprintf :message="issueTransitionOption.help">
<template #link="{ content }">
<gl-link :href="issueTransitionOption.link" target="_blank">{{ content }}</gl-link>
</template>
</gl-sprintf>
</template>
</gl-form-radio>
</gl-form-group>
</div>
</template>
app/assets/javascripts/integrations/edit/index.js
View file @ 36bfc6c5
......@@ -28,7 +28,6 @@ function parseDatasetToProps(data) {
testPath,
resetPath,
vulnerabilitiesIssuetype,
jiraIssueTransitionId,
...booleanAttributes
} = data;
const {
......@@ -60,7 +59,6 @@ function parseDatasetToProps(data) {
initialTriggerMergeRequest: mergeRequestEvents,
initialEnableComments: enableComments,
initialCommentDetail: commentDetail,
initialJiraIssueTransitionId: jiraIssueTransitionId,
},
jiraIssuesProps: {
showJiraIssuesIntegration,
......
app/helpers/services_helper.rb
View file @ 36bfc6c5
......@@ -86,7 +86,7 @@ module ServicesHelper
end
def integration_form_data(integration, group: nil)
form_data = {
{
id: integration.id,
show_active: integration.show_active_box?.to_s,
activated: (integration.active || integration.new_record?).to_s,
......@@ -106,12 +106,6 @@ module ServicesHelper
test_path: scoped_test_integration_path(integration),
reset_path: scoped_reset_integration_path(integration, group: group)
}
if integration.is_a?(JiraService)
form_data[:jira_issue_transition_id] = integration.jira_issue_transition_id
end
form_data
end
def trigger_events_for_service(integration)
......
app/models/project_services/jira_service.rb
View file @ 36bfc6c5
......@@ -124,11 +124,15 @@ class JiraService < IssueTrackerService
end
def fields
transition_id_help_path = help_page_path('user/project/integrations/jira', anchor: 'obtaining-a-transition-id')
transition_id_help_link_start = '<a href="%{transition_id_help_path}" target="_blank" rel="noopener noreferrer">'.html_safe % { transition_id_help_path: transition_id_help_path }
[
{ type: 'text', name: 'url', title: s_('JiraService|Web URL'), placeholder: 'https://jira.example.com', required: true },
{ type: 'text', name: 'api_url', title: s_('JiraService|Jira API URL'), placeholder: s_('JiraService|If different from Web URL') },
{ type: 'text', name: 'username', title: s_('JiraService|Username or Email'), placeholder: s_('JiraService|Use a username for server version and an email for cloud version'), required: true },
{ type: 'password', name: 'password', title: s_('JiraService|Password or API token'), placeholder: s_('JiraService|Use a password for server version and an API token for cloud version'), required: true }
{ type: 'password', name: 'password', title: s_('JiraService|Password or API token'), placeholder: s_('JiraService|Use a password for server version and an API token for cloud version'), required: true },
{ type: 'text', name: 'jira_issue_transition_id', title: s_('JiraService|Jira workflow transition IDs'), placeholder: s_('JiraService|For example, 12, 24'), help: s_('JiraService|Set transition IDs for Jira workflow transitions. %{link_start}Learn more%{link_end}'.html_safe % { link_start: transition_id_help_link_start, link_end: '</a>'.html_safe }) }
]
end
......@@ -155,19 +159,17 @@ class JiraService < IssueTrackerService
# support any events.
end
def find_issue(issue_key, rendered_fields: false, transitions: false)
expands = []
expands << 'renderedFields' if rendered_fields
expands << 'transitions' if transitions
options = { expand: expands.join(',') } if expands.any?
def find_issue(issue_key, rendered_fields: false)
options = {}
options = options.merge(expand: 'renderedFields') if rendered_fields
jira_request { client.Issue.find(issue_key, options || {}) }
jira_request { client.Issue.find(issue_key, options) }
end
def close_issue(entity, external_issue, current_user)
issue = find_issue(external_issue.iid, transitions: automatic_issue_transitions?)
issue = find_issue(external_issue.iid)
return if issue.nil? || has_resolution?(issue)
return if issue.nil? || has_resolution?(issue) || !jira_issue_transition_id.present?
commit_id = case entity
when Commit then entity.id
......@@ -258,27 +260,12 @@ class JiraService < IssueTrackerService
end
end
def automatic_issue_transitions?
jira_issue_transition_id.blank?
end
# jira_issue_transition_id can have multiple values split by , or ;
# the issue is transitioned at the order given by the user
# if any transition fails it will log the error message and stop the transition sequence
def transition_issue(issue)
return transition_issue_to_done(issue) if automatic_issue_transitions?
jira_issue_transition_id.scan(Gitlab::Regex.jira_transition_id_regex).all? do |transition_id|
transition_issue_to_id(issue, transition_id)
end
end
def transition_issue_to_id(issue, transition_id)
issue.transitions.build.save!(
transition: { id: transition_id }
)
true
jira_issue_transition_id.scan(Gitlab::Regex.jira_transition_id_regex).each do |transition_id|
issue.transitions.build.save!(transition: { id: transition_id })
rescue => error
log_error(
"Issue transition failed",
......@@ -289,21 +276,8 @@ class JiraService < IssueTrackerService
},
client_url: client_url
)
false
end
def transition_issue_to_done(issue)
transitions = issue.transitions rescue []
transition = transitions.find do |transition|
status = transition&.to&.statusCategory
status && status['key'] == 'done'
return false
end
return false unless transition
transition_issue_to_id(issue, transition.id)
end
def log_usage(action, user)
......
changelogs/unreleased/16119-jira-issue-transition-automatic.yml deleted 100644 → 0
View file @ dafe094a
---
title: Support automatic transitions of Jira issues
merge_request: 53760
author:
type: changed
doc/api/services.md
View file @ 36bfc6c5
......@@ -814,7 +814,7 @@ Parameters:
| `username` | string | yes | The username of the user created to be used with GitLab/Jira. |
| `password` | string | yes | The password of the user created to be used with GitLab/Jira. |
| `active` | boolean | no | Activates or deactivates the service. Defaults to false (deactivated). |
| `jira_issue_transition_id` | string | no | The ID of one or more transitions to move issues to a closed state. Read [custom issue transitions](../user/project/integrations/jira.md#custom-issue-transitions) for details. Defaults to a blank string, which enables [automatic issue transitions](../user/project/integrations/jira.md#automatic-issue-transitions). |
| `jira_issue_transition_id` | string | no | The ID of a transition that moves issues to a closed state. You can find this number under the Jira workflow administration (**Administration > Issues > Workflows**) by selecting **View** under **Operations** of the desired workflow of your project. The ID of each state can be found inside the parenthesis of each transition name under the transitions ID column. By default, this ID is set to `2`. |
| `commit_events` | boolean | false | Enable notifications for commit events |
| `merge_requests_events` | boolean | false | Enable notifications for merge request events |
| `comment_on_event_enabled` | boolean | false | Enable comments inside Jira issues on each GitLab event (commit / merge request) |
......
doc/user/project/integrations/jira.md
View file @ 36bfc6c5
......@@ -106,6 +106,8 @@ To enable the Jira integration in a project:
1. To include a comment on the Jira issue when the above reference is made in GitLab, select
**Enable comments**.
1. Select the **Comment detail**: **Standard** or **All details**.
1. Enter the further details on the page as described in the following table.
| Field | Description |
......@@ -114,6 +116,7 @@ To enable the Jira integration in a project:
| `Jira API URL` | The base URL to the Jira instance API. Web URL value is used if not set. For example, `https://jira-api.example.com`. Leave this field blank (or use the same value of `Web URL`) if using **Jira on Atlassian cloud**. |
| `Username or Email` | Created in [configure Jira](#configure-jira) step. Use `username` for **Jira Server** or `email` for **Jira on Atlassian cloud**. |
| `Password/API token` | Created in [configure Jira](#configure-jira) step. Use `password` for **Jira Server** or `API token` for **Jira on Atlassian cloud**. |
| `Jira workflow transition IDs` | Required for closing Jira issues via commits or merge requests. These are the IDs of transitions in Jira that move issues to a particular state. (See [Obtaining a transition ID](#obtaining-a-transition-id).) If you insert multiple transition IDs separated by `,` or `;`, the issue is moved to each state, one after another, using the given order. In GitLab 13.6 and earlier, field was called `Transition ID`. |
1. To enable users to view Jira issues inside the GitLab project, select **Enable Jira issues** and
enter a Jira project key. **(PREMIUM)**
......@@ -135,19 +138,10 @@ To enable the Jira integration in a project:
Your GitLab project can now interact with all Jira projects in your instance and the project now
displays a Jira link that opens the Jira project.
#### Automatic issue transitions
When you [close a Jira issues with a trigger word](../issues/managing_issues.md#closing-issues-automatically),
GitLab by default transitions the issue to the next available status with a category of "Done".
#### Custom issue transitions
For advanced workflows you can specify custom Jira transition IDs. If you insert multiple transition IDs separated by `,` or `;`, the issue is moved to each state, one after another, using the given order.
To see the transition IDs on Jira Cloud, edit a workflow in the **Text** view.
The transition IDs display in the **Transitions** column.
#### Obtaining a transition ID
On Jira Server you can get the transition IDs in either of the following ways:
In the most recent Jira user interface, you can no longer see transition IDs in the workflow
administration UI. You can get the ID you need in either of the following ways:
1. By using the API, with a request like `https://yourcompany.atlassian.net/rest/api/2/issue/ISSUE-123/transitions`
using an issue that is in the appropriate "open" state
......
locale/gitlab.pot
View file @ 36bfc6c5
......@@ -16921,9 +16921,6 @@ msgstr ""
msgid "JiraService|An error occurred while fetching issue list"
msgstr ""
msgid "JiraService|Automatically transitions Jira issues to the \"Done\" category. %{linkStart}Learn more%{linkEnd}"
msgstr ""
msgid "JiraService|Define the type of Jira issue to create from a vulnerability."
msgstr ""
......@@ -16978,7 +16975,7 @@ msgstr ""
msgid "JiraService|Jira project key"
msgstr ""
msgid "JiraService|Move to Done"
msgid "JiraService|Jira workflow transition IDs"
msgstr ""
msgid "JiraService|Not all data may be displayed here. To view more details or make changes to this issue, go to %{linkStart}Jira%{linkEnd}."
......@@ -16999,7 +16996,7 @@ msgstr ""
msgid "JiraService|Select issue type"
msgstr ""
msgid "JiraService|Set a custom final state by using transition IDs. %{linkStart}Learn about transition IDs%{linkEnd}"
msgid "JiraService|Set transition IDs for Jira workflow transitions. %{link_start}Learn more%{link_end}"
msgstr ""
msgid "JiraService|Sign in to GitLab.com to get started."
......@@ -17011,18 +17008,12 @@ msgstr ""
msgid "JiraService|This issue is synchronized with Jira"
msgstr ""
msgid "JiraService|Transition Jira issues to their final state:"
msgstr ""
msgid "JiraService|Use a password for server version and an API token for cloud version"
msgstr ""
msgid "JiraService|Use a username for server version and an email for cloud version"
msgstr ""
msgid "JiraService|Use custom transitions"
msgstr ""
msgid "JiraService|Username or Email"
msgstr ""
......
qa/qa/page/project/settings/services/jira.rb
View file @ 36bfc6c5
......@@ -10,12 +10,7 @@ module QA
element :service_url_field, ':data-qa-selector="`${fieldId}_field`"' # rubocop:disable QA/ElementWithPattern
element :service_username_field, ':data-qa-selector="`${fieldId}_field`"' # rubocop:disable QA/ElementWithPattern
element :service_password_field, ':data-qa-selector="`${fieldId}_field`"' # rubocop:disable QA/ElementWithPattern
end
view 'app/assets/javascripts/integrations/edit/components/jira_trigger_fields.vue' do
element :service_issue_transition_mode_auto, ':data-qa-selector="`service_issue_transition_mode_${issueTransitionOption.value}`"' # rubocop:disable QA/ElementWithPattern
element :service_issue_transition_mode_custom, ':data-qa-selector="`service_issue_transition_mode_${issueTransitionOption.value}`"' # rubocop:disable QA/ElementWithPattern
element :service_jira_issue_transition_id_field
element :service_jira_issue_transition_id_field, ':data-qa-selector="`${fieldId}_field`"' # rubocop:disable QA/ElementWithPattern
end
view 'app/assets/javascripts/integrations/edit/components/integration_form.vue' do
......@@ -28,9 +23,7 @@ module QA
set_jira_server_url(url)
set_username(Runtime::Env.jira_admin_username)
set_password(Runtime::Env.jira_admin_password)
use_custom_transitions
set_transition_ids('11,21,31,41')
set_transaction_ids('11,21,31,41')
click_save_changes_button
wait_until(reload: false) do
......@@ -52,16 +45,8 @@ module QA
fill_element(:service_password_field, password)
end
def use_automatic_transitions
click_element :service_issue_transition_mode_auto
end
def use_custom_transitions
click_element :service_issue_transition_mode_custom
end
def set_transition_ids(transition_ids)
fill_element(:service_jira_issue_transition_id_field, transition_ids)
def set_transaction_ids(transaction_ids)
fill_element(:service_jira_issue_transition_id_field, transaction_ids)
end
def click_save_changes_button
......
spec/features/projects/services/user_activates_jira_spec.rb
View file @ 36bfc6c5
......@@ -6,14 +6,12 @@ RSpec.describe 'User activates Jira', :js do
include_context 'project service activation'
include_context 'project service Jira context'
before do
server_info = { key: 'value' }.to_json
stub_request(:get, test_url).to_return(body: server_info)
end
describe 'user tests Jira Service' do
context 'when Jira connection test succeeds' do
before do
server_info = { key: 'value' }.to_json
stub_request(:get, test_url).with(basic_auth: %w(username password)).to_return(body: server_info)
visit_project_integration('Jira')
fill_form
click_test_then_save_integration(expect_test_to_fail: false)
......@@ -83,40 +81,4 @@ RSpec.describe 'User activates Jira', :js do
end
end
end
describe 'issue transition settings' do
it 'shows validation errors' do
visit_project_integration('Jira')
expect(page).to have_field('Move to Done', checked: true)
fill_form
choose 'Use custom transitions'
click_save_integration
within '[data-testid="issue-transition-settings"]' do
expect(page).to have_content('This field is required.')
end
fill_in 'service[jira_issue_transition_id]', with: '1, 2, 3'
click_save_integration
expect(page).to have_content('Jira settings saved and active.')
expect(project.reload.jira_service.jira_issue_transition_id).to eq('1, 2, 3')
end
it 'clears the transition IDs when using automatic transitions' do
create(:jira_service, project: project, jira_issue_transition_id: '1, 2, 3')
visit_project_integration('Jira')
expect(page).to have_field('Use custom transitions', checked: true)
expect(page).to have_field('service[jira_issue_transition_id]', with: '1, 2, 3')
choose 'Move to Done'
click_save_integration
expect(page).to have_content('Jira settings saved and active.')
expect(project.reload.jira_service.jira_issue_transition_id).to eq('')
end
end
end
spec/frontend/integrations/edit/components/jira_trigger_fields_spec.js
View file @ 36bfc6c5
......@@ -30,21 +30,14 @@ describe('JiraTriggerFields', () => {
const findCommentSettings = () => wrapper.find('[data-testid="comment-settings"]');
const findCommentDetail = () => wrapper.find('[data-testid="comment-detail"]');
const findCommentSettingsCheckbox = () => findCommentSettings().find(GlFormCheckbox);
const findIssueTransitionSettings = () =>
wrapper.find('[data-testid="issue-transition-settings"]');
const findIssueTransitionModeRadios = () =>
findIssueTransitionSettings().findAll('input[type="radio"]');
const findIssueTransitionIdsField = () =>
wrapper.find('input[type="text"][name="service[jira_issue_transition_id]"]');
describe('template', () => {
describe('initialTriggerCommit and initialTriggerMergeRequest are false', () => {
it('does not show trigger settings', () => {
it('does not show comment settings', () => {
createComponent();
expect(findCommentSettings().isVisible()).toBe(false);
expect(findCommentDetail().isVisible()).toBe(false);
expect(findIssueTransitionSettings().isVisible()).toBe(false);
});
});
......@@ -55,10 +48,9 @@ describe('JiraTriggerFields', () => {
});
});
it('shows trigger settings', () => {
it('shows comment settings', () => {
expect(findCommentSettings().isVisible()).toBe(true);
expect(findCommentDetail().isVisible()).toBe(false);
expect(findIssueTransitionSettings().isVisible()).toBe(true);
});
// As per https://vuejs.org/v2/guide/forms.html#Checkbox-1,
......@@ -81,14 +73,13 @@ describe('JiraTriggerFields', () => {
});
describe('initialTriggerMergeRequest is true', () => {
it('shows trigger settings', () => {
it('shows comment settings', () => {
createComponent({
initialTriggerMergeRequest: true,
});
expect(findCommentSettings().isVisible()).toBe(true);
expect(findCommentDetail().isVisible()).toBe(false);
expect(findIssueTransitionSettings().isVisible()).toBe(true);
});
});
......@@ -104,41 +95,7 @@ describe('JiraTriggerFields', () => {
});
});
describe('initialJiraIssueTransitionId is not set', () => {
it('uses automatic transitions', () => {
createComponent({
initialTriggerCommit: true,
});
const [radio1, radio2] = findIssueTransitionModeRadios().wrappers;
expect(radio1.element.checked).toBe(true);
expect(radio2.element.checked).toBe(false);
expect(findIssueTransitionIdsField().exists()).toBe(false);
});
});
describe('initialJiraIssueTransitionId is set', () => {
it('uses custom transitions', () => {
createComponent({
initialJiraIssueTransitionId: '1, 2, 3',
initialTriggerCommit: true,
});
const [radio1, radio2] = findIssueTransitionModeRadios().wrappers;
expect(radio1.element.checked).toBe(false);
expect(radio2.element.checked).toBe(true);
const field = findIssueTransitionIdsField();
expect(field.isVisible()).toBe(true);
expect(field.element).toMatchObject({
type: 'text',
value: '1, 2, 3',
});
});
});
it('disables input fields if inheriting', () => {
it('disables checkboxes and radios if inheriting', () => {
createComponent(
{
initialTriggerCommit: true,
......@@ -147,8 +104,12 @@ describe('JiraTriggerFields', () => {
true,
);
wrapper.findAll('[type=text], [type=checkbox], [type=radio]').wrappers.forEach((input) => {
expect(input.attributes('disabled')).toBe('disabled');
wrapper.findAll('[type=checkbox]').wrappers.forEach((checkbox) => {
expect(checkbox.attributes('disabled')).toBe('disabled');
});
wrapper.findAll('[type=radio]').wrappers.forEach((radio) => {
expect(radio.attributes('disabled')).toBe('disabled');
});
});
});
......
spec/helpers/services_helper_spec.rb
View file @ 36bfc6c5
......@@ -27,26 +27,17 @@ RSpec.describe ServicesHelper do
]
end
let(:jira_fields) { %i[jira_issue_transition_id] }
subject { helper.integration_form_data(integration) }
context 'Slack service' do
let(:integration) { build(:slack_service) }
it { is_expected.to include(*fields) }
it { is_expected.not_to include(*jira_fields) }
specify do
expect(subject[:reset_path]).to eq(helper.scoped_reset_integration_path(integration))
end
end
context 'Jira service' do
let(:integration) { build(:jira_service) }
it { is_expected.to include(*fields, *jira_fields) }
end
end
describe '#scoped_reset_integration_path' do
......
spec/models/project_services/jira_service_spec.rb
View file @ 36bfc6c5
......@@ -82,8 +82,11 @@ RSpec.describe JiraService do
subject(:fields) { service.fields }
it 'returns custom fields' do
expect(fields.pluck(:name)).to eq(%w[url api_url username password])
it 'includes transition help link' do
transition_id_field = fields.find { |field| field[:name] == 'jira_issue_transition_id' }
expect(transition_id_field[:title]).to eq('Jira workflow transition IDs')
expect(transition_id_field[:help]).to include('/help/user/project/integrations/jira')
end
end
......@@ -457,10 +460,10 @@ RSpec.describe JiraService do
end
context 'with options' do
let(:issue_url) { "#{url}/rest/api/2/issue/#{issue_key}?expand=renderedFields,transitions" }
let(:issue_url) { "#{url}/rest/api/2/issue/#{issue_key}?expand=renderedFields" }
it 'calls the Jira API with the options to get the issue' do
jira_service.find_issue(issue_key, rendered_fields: true, transitions: true)
jira_service.find_issue(issue_key, rendered_fields: true)
expect(WebMock).to have_requested(:get, issue_url)
end
......@@ -502,7 +505,7 @@ RSpec.describe JiraService do
allow(closed_issue).to receive(:resolution).and_return(true)
allow(JIRA::Resource::Issue).to receive(:find).and_return(open_issue, closed_issue)
allow_any_instance_of(JIRA::Resource::Issue).to receive(:key).and_return(issue_key)
allow_any_instance_of(JIRA::Resource::Issue).to receive(:key).and_return('JIRA-123')
allow(JIRA::Resource::Remotelink).to receive(:all).and_return([])
WebMock.stub_request(:get, issue_url).with(basic_auth: %w(jira-username jira-password))
......@@ -661,49 +664,6 @@ RSpec.describe JiraService do
).once
end
context 'when using automatic issue transitions' do
let(:transitions) do
[
{ id: '1' },
{ id: '2', to: { statusCategory: { key: 'new' } } },
{ id: '3', to: { statusCategory: { key: 'done' } } },
{ id: '4', to: { statusCategory: { key: 'done' } } }
]
end
before do
allow(jira_service).to receive_messages(jira_issue_transition_id: '')
close_issue
end
it 'uses the next transition with a status category of done' do
expect(WebMock).to have_requested(:post, transitions_url).with(
body: /"id":"3"/
).once
end
context 'when no done transition is available' do
let(:transitions) do
[
{ id: '1', to: { statusCategory: { key: 'new' } } }
]
end
it 'does not attempt to transition' do
expect(WebMock).not_to have_requested(:post, transitions_url)
end
end
context 'when no valid transitions are returned' do
let(:transitions) { 'foo' }
it 'does not attempt to transition' do
expect(WebMock).not_to have_requested(:post, transitions_url)
end
end
end
context 'when using multiple transition ids' do
before do
allow(jira_service).to receive_messages(jira_issue_transition_id: '1,2,3')
......
spec/services/merge_requests/merge_service_spec.rb
View file @ 36bfc6c5
......@@ -166,6 +166,20 @@ RSpec.describe MergeRequests::MergeService do
service.execute(merge_request)
end
context 'when jira_issue_transition_id is not present' do
before do
allow_any_instance_of(JIRA::Resource::Issue).to receive(:resolution).and_return(nil)
end
it 'does not close issue' do
jira_tracker.update!(jira_issue_transition_id: nil)
expect_any_instance_of(JiraService).not_to receive(:transition_issue)
service.execute(merge_request)
end
end
context 'wrong issue markdown' do
it 'does not close issues on Jira issue tracker' do
jira_issue = ExternalIssue.new('#JIRA-123', project)
......
spec/support/shared_contexts/project_service_jira_context.rb
View file @ 36bfc6c5
# frozen_string_literal: true
RSpec.shared_context 'project service Jira context' do
let(:url) { 'https://jira.example.com' }
let(:test_url) { 'https://jira.example.com/rest/api/2/serverInfo' }
let(:url) { 'http://jira.example.com' }
let(:test_url) { 'http://jira.example.com/rest/api/2/serverInfo' }
def fill_form(disable: false)
click_active_checkbox if disable
......@@ -10,5 +10,6 @@ RSpec.shared_context 'project service Jira context' do
fill_in 'service_url', with: url
fill_in 'service_username', with: 'username'
fill_in 'service_password', with: 'password'
fill_in 'service_jira_issue_transition_id', with: '25'
end
end
spec/support/shared_contexts/project_service_shared_context.rb
View file @ 36bfc6c5
......@@ -15,11 +15,8 @@ RSpec.shared_context 'project service activation' do
def visit_project_integration(name)
visit_project_integrations
within('#content-body') do
click_link(name)
end
end
def click_active_checkbox
find('input[name="service[active]"]').click
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7