Add latest changes from gitlab-org/gitlab@master

1 files changed, 58 insertions, 15 deletions

diff --git a/spec/features/labels_hierarchy_spec.rb b/spec/features/labels_hierarchy_spec.rb
index d6e607e80df..e8f40a1ceab 100644
--- a/spec/features/labels_hierarchy_spec.rb
+++ b/spec/features/labels_hierarchy_spec.rb
@@ -157,28 +157,71 @@ RSpec.describe 'Labels Hierarchy', :js, feature_category: :team_planning do
     end
   end
 
-  context 'when creating new issuable' do
+  context 'with the visible_label_selection_on_metadata feature flag enabled' do
     before do
-      visit new_project_issue_path(project_1)
+      stub_feature_flags(visible_label_selection_on_metadata: true)
     end
 
-    it 'is able to assign ancestor group labels' do
-      fill_in 'issue_title', with: 'new created issue'
-      fill_in 'issue_description', with: 'new issue description'
+    context 'when creating new issuable' do
+      before do
+        visit new_project_issue_path(project_1)
+      end
+
+      it 'is able to assign ancestor group labels' do
+        fill_in 'issue_title', with: 'new created issue'
+        fill_in 'issue_description', with: 'new issue description'
+
+        click_button _('Select label')
+
+        wait_for_all_requests
+
+        page.within '[data-testid="sidebar-labels"]' do
+          click_button grandparent_group_label.title
+          click_button parent_group_label.title
+          click_button project_label_1.title
+          click_button _('Close')
+
+          wait_for_requests
+        end
+
+        find('.btn-confirm').click
+
+        expect(page.find('.issue-details h1.title')).to have_content('new created issue')
+        expect(page).to have_selector('span.gl-label-text', text: grandparent_group_label.title)
+        expect(page).to have_selector('span.gl-label-text', text: parent_group_label.title)
+        expect(page).to have_selector('span.gl-label-text', text: project_label_1.title)
+      end
+    end
+  end
 
-      find(".js-label-select").click
-      wait_for_requests
+  context 'with the visible_label_selection_on_metadata feature flag disabled' do
+    before do
+      stub_feature_flags(visible_label_selection_on_metadata: false)
+    end
 
-      find('a.label-item', text: grandparent_group_label.title).click
-      find('a.label-item', text: parent_group_label.title).click
-      find('a.label-item', text: project_label_1.title).click
+    context 'when creating new issuable' do
+      before do
+        visit new_project_issue_path(project_1)
+      end
+
+      it 'is able to assign ancestor group labels' do
+        fill_in 'issue_title', with: 'new created issue'
+        fill_in 'issue_description', with: 'new issue description'
+
+        find(".js-label-select").click
+        wait_for_requests
 
-      find('.btn-confirm').click
+        find('a.label-item', text: grandparent_group_label.title).click
+        find('a.label-item', text: parent_group_label.title).click
+        find('a.label-item', text: project_label_1.title).click
 
-      expect(page.find('.issue-details h1.title')).to have_content('new created issue')
-      expect(page).to have_selector('span.gl-label-text', text: grandparent_group_label.title)
-      expect(page).to have_selector('span.gl-label-text', text: parent_group_label.title)
-      expect(page).to have_selector('span.gl-label-text', text: project_label_1.title)
+        find('.btn-confirm').click
+
+        expect(page.find('.issue-details h1.title')).to have_content('new created issue')
+        expect(page).to have_selector('span.gl-label-text', text: grandparent_group_label.title)
+        expect(page).to have_selector('span.gl-label-text', text: parent_group_label.title)
+        expect(page).to have_selector('span.gl-label-text', text: project_label_1.title)
+      end
     end
   end