Commit 6bc457c1 authored by Tim Zallmann's avatar Tim Zallmann

Merge branch '34532-remove-epic_new_issue-feature-flag' into 'master'

Removed epic_new_issue feature flag references

See merge request gitlab-org/gitlab!23643
parents ee30f8f8 3755555f
...@@ -67,9 +67,6 @@ export default { ...@@ -67,9 +67,6 @@ export default {
disableContents() { disableContents() {
return this.itemAddInProgress || this.itemCreateInProgress; return this.itemAddInProgress || this.itemCreateInProgress;
}, },
createIssueEnabled() {
return gon.features && gon.features.epicNewIssue;
},
visibleForm() { visibleForm() {
if (this.showAddItemForm) { if (this.showAddItemForm) {
return FORM_SLOTS.addItem; return FORM_SLOTS.addItem;
...@@ -169,7 +166,6 @@ export default { ...@@ -169,7 +166,6 @@ export default {
> >
<related-items-tree-header :class="{ 'border-bottom-0': itemsFetchResultEmpty }"> <related-items-tree-header :class="{ 'border-bottom-0': itemsFetchResultEmpty }">
<issue-actions-split-button <issue-actions-split-button
v-if="createIssueEnabled"
slot="issueActions" slot="issueActions"
class="ml-1" class="ml-1"
@showAddIssueForm="showAddIssueForm" @showAddIssueForm="showAddIssueForm"
......
...@@ -19,7 +19,6 @@ class Groups::EpicsController < Groups::ApplicationController ...@@ -19,7 +19,6 @@ class Groups::EpicsController < Groups::ApplicationController
before_action do before_action do
push_frontend_feature_flag(:roadmap_graphql, @group) push_frontend_feature_flag(:roadmap_graphql, @group)
push_frontend_feature_flag(:vue_issuable_epic_sidebar, @group) push_frontend_feature_flag(:vue_issuable_epic_sidebar, @group)
push_frontend_feature_flag(:epic_new_issue, @group, default_enabled: true)
end end
def index def index
......
...@@ -40,10 +40,6 @@ describe 'Epic Issues', :js do ...@@ -40,10 +40,6 @@ describe 'Epic Issues', :js do
wait_for_requests wait_for_requests
end end
before do
stub_feature_flags(epic_new_issue: false)
end
context 'when user is not a group member of a public group' do context 'when user is not a group member of a public group' do
before do before do
visit_epic visit_epic
...@@ -58,7 +54,7 @@ describe 'Epic Issues', :js do ...@@ -58,7 +54,7 @@ describe 'Epic Issues', :js do
end end
it 'user cannot add new issues to the epic' do it 'user cannot add new issues to the epic' do
expect(page).not_to have_selector('.related-items-tree-container .js-add-issues-button') expect(page).not_to have_selector('.related-items-tree-container .js-issue-actions-split-button > button:first-child')
end end
it 'user cannot add new epics to the epic' do it 'user cannot add new epics to the epic' do
...@@ -71,7 +67,7 @@ describe 'Epic Issues', :js do ...@@ -71,7 +67,7 @@ describe 'Epic Issues', :js do
let(:issue_invalid) { create(:issue) } let(:issue_invalid) { create(:issue) }
let(:epic_to_add) { create(:epic, group: group) } let(:epic_to_add) { create(:epic, group: group) }
def add_issues(references, button_selector: '.js-add-issues-button') def add_issues(references, button_selector: '.js-issue-actions-split-button > button:first-child')
find(".related-items-tree-container #{button_selector}").click find(".related-items-tree-container #{button_selector}").click
find('.related-items-tree-container .js-add-issuable-form-input').set(references) find('.related-items-tree-container .js-add-issuable-form-input').set(references)
# When adding long references, for some reason the input gets stuck # When adding long references, for some reason the input gets stuck
...@@ -230,23 +226,16 @@ describe 'Epic Issues', :js do ...@@ -230,23 +226,16 @@ describe 'Epic Issues', :js do
end end
end end
context 'with epic_new_issue feature flag enabled' do it 'user can add new issues to the epic' do
before do references = "#{issue_to_add.to_reference(full: true)}"
stub_feature_flags(epic_new_issue: true)
visit_epic
end
it 'user can add new issues to the epic' do
references = "#{issue_to_add.to_reference(full: true)}"
add_issues(references, button_selector: '.js-issue-actions-split-button') add_issues(references, button_selector: '.js-issue-actions-split-button')
expect(page).not_to have_selector('.gl-field-error') expect(page).not_to have_selector('.gl-field-error')
expect(page).not_to have_content("Issue cannot be found.") expect(page).not_to have_content("Issue cannot be found.")
within('.related-items-tree-container ul.related-items-list') do within('.related-items-tree-container ul.related-items-list') do
expect(page).to have_selector('li.js-item-type-issue', count: 3) expect(page).to have_selector('li.js-item-type-issue', count: 3)
end
end end
end end
end end
......
...@@ -241,27 +241,18 @@ describe('RelatedItemsTreeApp', () => { ...@@ -241,27 +241,18 @@ describe('RelatedItemsTreeApp', () => {
}); });
}); });
it('does not render issue actions split button', () => {
expect(findIssueActionsSplitButton().exists()).toBe(false);
});
it('does not render create issue form', () => { it('does not render create issue form', () => {
expect(findCreateIssueForm().exists()).toBe(false); expect(findCreateIssueForm().exists()).toBe(false);
}); });
}); });
describe('with epicNewIssue feature flag enabled', () => { describe('issue actions split button', () => {
beforeEach(() => { beforeEach(() => {
window.gon.features = { epicNewIssue: true };
wrapper = createComponent(); wrapper = createComponent();
wrapper.vm.$store.state.itemsFetchInProgress = false; wrapper.vm.$store.state.itemsFetchInProgress = false;
return wrapper.vm.$nextTick(); return wrapper.vm.$nextTick();
}); });
afterEach(() => {
window.gon.features = {};
});
it('renders issue actions split button', () => { it('renders issue actions split button', () => {
expect(findIssueActionsSplitButton().exists()).toBe(true); expect(findIssueActionsSplitButton().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