Merge branch 'psi-scoped-label-spec' into 'master'

Move scoped label spec to EE

See merge request gitlab-org/gitlab!18706

ee/spec/features/boards/sidebar_spec.rb

@@ -250,4 +250,43 @@ describe 'Issue Boards', :js do
       end
     end
   end
+
+  context 'scoped labels' do
+    let!(:scoped_label_1) { create(:label, project: project, name: 'Scoped::Label1') }
+    let!(:scoped_label_2) { create(:label, project: project, name: 'Scoped::Label2') }
+
+    before do
+      stub_licensed_features(scoped_labels: true)
+
+      visit project_board_path(project, board)
+      wait_for_requests
+    end
+
+    it 'removes existing scoped label' do
+      click_card(card1)
+
+      page.within('.labels') do
+        click_link 'Edit'
+
+        wait_for_requests
+
+        click_link scoped_label_1.title
+        click_link scoped_label_2.title
+
+        wait_for_requests
+
+        find('.dropdown-menu-close-icon').click
+
+        page.within('.value') do
+          expect(page).to have_selector('.scoped-label-wrapper', count: 1)
+          expect(page).not_to have_content(scoped_label_1.title)
+          expect(page).to have_content(scoped_label_2.title)
+        end
+      end
+
+      expect(card1).to have_selector('.scoped-label-wrapper', count: 1)
+      expect(card1).not_to have_content(scoped_label_1.title)
+      expect(card1).to have_content(scoped_label_2.title)
+    end
+  end
 end

spec/features/boards/sidebar_spec.rb

@@ -14,8 +14,6 @@ describe 'Issue Boards', :js do
   let!(:bug)         { create(:label, project: project, name: 'Bug') }
   let!(:regression)  { create(:label, project: project, name: 'Regression') }
   let!(:stretch)     { create(:label, project: project, name: 'Stretch') }
-  let!(:scoped_label_1)     { create(:label, project: project, name: 'Scoped::Label1') }
-  let!(:scoped_label_2)     { create(:label, project: project, name: 'Scoped::Label2') }
   let!(:issue1)      { create(:labeled_issue, project: project, assignees: [user], milestone: milestone, labels: [development], relative_position: 2) }
   let!(:issue2)      { create(:labeled_issue, project: project, labels: [development, stretch], relative_position: 1) }
   let(:board)        { create(:board, project: project) }
@@ -29,8 +27,6 @@ describe 'Issue Boards', :js do
   end
 
   before do
-    stub_licensed_features(scoped_labels: true)
-
     project.add_maintainer(user)
 
     sign_in(user)
@@ -313,33 +309,6 @@ describe 'Issue Boards', :js do
       expect(card).to have_content(bug.title)
     end
 
-    it 'removes existing scoped label' do
-      click_card(card)
-
-      page.within('.labels') do
-        click_link 'Edit'
-
-        wait_for_requests
-
-        click_link scoped_label_1.title
-        click_link scoped_label_2.title
-
-        wait_for_requests
-
-        find('.dropdown-menu-close-icon').click
-
-        page.within('.value') do
-          expect(page).to have_selector('.scoped-label-wrapper', count: 1)
-          expect(page).not_to have_content(scoped_label_1.title)
-          expect(page).to have_content(scoped_label_2.title)
-        end
-      end
-
-      expect(card).to have_selector('.scoped-label-wrapper', count: 1)
-      expect(card).not_to have_content(scoped_label_1.title)
-      expect(card).to have_content(scoped_label_2.title)
-    end
-
     it 'adds a multiple labels' do
       click_card(card)