Commit 88e06925 authored by Alexandru Croitor's avatar Alexandru Croitor

Rename jira_integration FF to match licensed feature

Replace jira_integration FF check with jira_issues_integration licenced
feature flag, so that we have a single FF for the feature.
parent 1810dfb3
......@@ -53,7 +53,7 @@ export default {
return this.type === 'jira';
},
showJiraIssuesFields() {
return this.isJira && this.glFeatures.jiraIntegration;
return this.isJira && this.glFeatures.jiraIssuesIntegration;
},
},
};
......
......@@ -36,7 +36,7 @@ function mountIssuableListRootApp() {
}
function mountIssuablesListApp() {
if (!gon.features?.vueIssuablesList && !gon.features?.jiraIntegration) {
if (!gon.features?.vueIssuablesList && !gon.features?.jiraIssuesIntegration) {
return;
}
......
......@@ -13,7 +13,7 @@ class Projects::ServicesController < Projects::ApplicationController
before_action :redirect_deprecated_prometheus_service, only: [:update]
before_action only: :edit do
push_frontend_feature_flag(:integration_form_refactor, default_enabled: true)
push_frontend_feature_flag(:jira_integration, @project)
push_frontend_feature_flag(:jira_issues_integration, @project, { default_enabled: true })
end
respond_to :html
......
......@@ -11,7 +11,7 @@ module Projects
before_action :check_feature_enabled!
before_action do
push_frontend_feature_flag(:jira_integration, project)
push_frontend_feature_flag(:jira_issues_integration, project, { default_enabled: true })
end
rescue_from ::Projects::Integrations::Jira::IssuesFinder::IntegrationError, with: :render_integration_error
......
......@@ -88,17 +88,17 @@ describe('IntegrationForm', () => {
expect(findJiraTriggerFields().exists()).toBe(true);
});
describe('featureFlag jiraIntegration is false', () => {
describe('featureFlag jiraIssuesIntegration is false', () => {
it('does not render JiraIssuesFields', () => {
createComponent({ type: 'jira' }, { jiraIntegration: false });
createComponent({ type: 'jira' }, { jiraIssuesIntegration: false });
expect(findJiraIssuesFields().exists()).toBe(false);
});
});
describe('featureFlag jiraIntegration is true', () => {
describe('featureFlag jiraIssuesIntegration is true', () => {
it('renders JiraIssuesFields', () => {
createComponent({ type: 'jira' }, { jiraIntegration: true });
createComponent({ type: 'jira' }, { jiraIssuesIntegration: true });
expect(findJiraIssuesFields().exists()).toBe(true);
});
......
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