Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc41

1 files changed, 3 insertions, 15 deletions

diff --git a/spec/features/boards/boards_spec.rb b/spec/features/boards/boards_spec.rb
index 2d6b669f28b..35fda25d70f 100644
--- a/spec/features/boards/boards_spec.rb
+++ b/spec/features/boards/boards_spec.rb
@@ -13,8 +13,6 @@ RSpec.describe 'Issue Boards', :js do
   let_it_be(:user2)   { create(:user) }
 
   before do
-    stub_feature_flags(board_new_list: false)
-
     project.add_maintainer(user)
     project.add_maintainer(user2)
 
@@ -68,6 +66,8 @@ RSpec.describe 'Issue Boards', :js do
     let_it_be(:issue10) { create(:labeled_issue, project: project, title: 'issue +', description: 'A+ great issue', labels: [a_plus]) }
 
     before do
+      stub_feature_flags(board_new_list: false)
+
       visit project_board_path(project, board)
 
       wait_for_requests
@@ -168,19 +168,6 @@ RSpec.describe 'Issue Boards', :js do
       expect(page).to have_selector('.board', count: 3)
     end
 
-    it 'removes checkmark in new list dropdown after deleting' do
-      click_button 'Add list'
-      wait_for_requests
-
-      find('.js-new-board-list').click
-
-      remove_list
-
-      wait_for_requests
-
-      expect(page).to have_selector('.board', count: 3)
-    end
-
     it 'infinite scrolls list' do
       create_list(:labeled_issue, 50, project: project, labels: [planning])
 
@@ -321,6 +308,7 @@ RSpec.describe 'Issue Boards', :js do
       context 'new list' do
         it 'shows all labels in new list dropdown' do
           click_button 'Add list'
+
           wait_for_requests
 
           page.within('.dropdown-menu-issues-board-new') do