Add latest changes from gitlab-org/gitlab@master

6 files changed, 4 insertions, 12 deletions

diff --git a/spec/features/boards/boards_spec.rb b/spec/features/boards/boards_spec.rb
index 9354050400e..85e54c0f451 100644
--- a/spec/features/boards/boards_spec.rb
+++ b/spec/features/boards/boards_spec.rb
@@ -74,7 +74,6 @@ RSpec.describe 'Project issue boards', :js, feature_category: :team_planning do
       let_it_be(:a_plus, reload: true)      { create(:label, project: project, name: 'A+') }
       let_it_be(:list1, reload: true)       { create(:list, board: board, label: planning, position: 0) }
       let_it_be(:list2, reload: true)       { create(:list, board: board, label: development, position: 1) }
-      let_it_be(:backlog_list, reload: true) { create(:backlog_list, board: board) }
 
       let_it_be(:confidential_issue, reload: true) { create(:labeled_issue, :confidential, project: project, author: user, labels: [planning], relative_position: 9) }
       let_it_be(:issue1, reload: true) { create(:labeled_issue, project: project, title: 'aaa', description: '111', assignees: [user], labels: [planning], relative_position: 8) }
diff --git a/spec/features/boards/new_issue_spec.rb b/spec/features/boards/new_issue_spec.rb
index 527415701e6..682ccca38bd 100644
--- a/spec/features/boards/new_issue_spec.rb
+++ b/spec/features/boards/new_issue_spec.rb
@@ -5,7 +5,6 @@ require 'spec_helper'
 RSpec.describe 'Issue Boards new issue', :js, feature_category: :team_planning do
   let_it_be(:project)        { create(:project, :public) }
   let_it_be(:board)          { create(:board, project: project) }
-  let_it_be(:backlog_list)   { create(:backlog_list, board: board) }
   let_it_be(:label)          { create(:label, project: project, name: 'Label 1') }
   let_it_be(:list)           { create(:list, board: board, label: label, position: 0) }
   let_it_be(:user)           { create(:user) }
@@ -179,8 +178,6 @@ RSpec.describe 'Issue Boards new issue', :js, feature_category: :team_planning d
       end
 
       context 'when backlog list already exists' do
-        let_it_be(:backlog_list) { create(:backlog_list, board: group_board) }
-
         it 'does not display new issue button in open list' do
           expect(first('.board')).not_to have_button('Create new issue')
         end
@@ -204,14 +201,16 @@ RSpec.describe 'Issue Boards new issue', :js, feature_category: :team_planning d
       end
 
       context 'when backlog does not exist' do
+        before do
+          group_board.lists.backlog.delete_all
+        end
+
         it 'display new issue button in label list' do
           expect(board_list_header).to have_button('Create new issue')
         end
       end
 
       context 'project select dropdown' do
-        let_it_be(:backlog_list) { create(:backlog_list, board: group_board) }
-
         before do
           page.within(board_list_header) do
             click_button 'Create new issue'
diff --git a/spec/features/boards/sidebar_labels_in_namespaces_spec.rb b/spec/features/boards/sidebar_labels_in_namespaces_spec.rb
index 39485fe21a9..ffed4a0854f 100644
--- a/spec/features/boards/sidebar_labels_in_namespaces_spec.rb
+++ b/spec/features/boards/sidebar_labels_in_namespaces_spec.rb
@@ -12,7 +12,6 @@ RSpec.describe 'Issue boards sidebar labels select', :js, feature_category: :tea
   context 'group boards' do
     context 'in the top-level group board' do
       let_it_be(:group_board) { create(:board, group: group) }
-      let_it_be(:board_list) { create(:backlog_list, board: group_board) }
 
       before do
         stub_feature_flags(apollo_boards: false)
diff --git a/spec/features/boards/user_adds_lists_to_board_spec.rb b/spec/features/boards/user_adds_lists_to_board_spec.rb
index a936e14168c..cc2afca7657 100644
--- a/spec/features/boards/user_adds_lists_to_board_spec.rb
+++ b/spec/features/boards/user_adds_lists_to_board_spec.rb
@@ -13,8 +13,6 @@ RSpec.describe 'User adds lists', :js, feature_category: :team_planning do
 
   let_it_be(:group_label) { create(:group_label, group: group) }
   let_it_be(:project_label) { create(:label, project: project) }
-  let_it_be(:group_backlog_list) { create(:backlog_list, board: group_board) }
-  let_it_be(:project_backlog_list) { create(:backlog_list, board: project_board) }
   let_it_be(:backlog) { create(:group_label, group: group, name: 'Backlog') }
   let_it_be(:closed) { create(:group_label, group: group, name: 'Closed') }
 
diff --git a/spec/features/boards/user_visits_board_spec.rb b/spec/features/boards/user_visits_board_spec.rb
index 44c691435df..5867ec17070 100644
--- a/spec/features/boards/user_visits_board_spec.rb
+++ b/spec/features/boards/user_visits_board_spec.rb
@@ -62,7 +62,6 @@ RSpec.describe 'User visits issue boards', :js, feature_category: :team_planning
   context "project boards" do
     stub_feature_flags(apollo_boards: false)
     let_it_be(:board) { create_default(:board, project: project) }
-    let_it_be(:backlog_list) { create_default(:backlog_list, board: board) }
 
     let(:board_path) { project_boards_path(project, params) }
 
@@ -72,7 +71,6 @@ RSpec.describe 'User visits issue boards', :js, feature_category: :team_planning
   context "group boards" do
     stub_feature_flags(apollo_boards: false)
     let_it_be(:board) { create_default(:board, group: group) }
-    let_it_be(:backlog_list) { create_default(:backlog_list, board: board) }
 
     let(:board_path) { group_boards_path(group, params) }
 
diff --git a/spec/features/groups/board_spec.rb b/spec/features/groups/board_spec.rb
index 423e8029d9c..c2d6b80b4c0 100644
--- a/spec/features/groups/board_spec.rb
+++ b/spec/features/groups/board_spec.rb
@@ -50,7 +50,6 @@ RSpec.describe 'Group Boards', feature_category: :team_planning do
   context "when user is a Reporter in one of the group's projects", :js do
     let_it_be(:board) { create(:board, group: group) }
 
-    let_it_be(:backlog_list) { create(:backlog_list, board: board) }
     let_it_be(:group_label1) { create(:group_label, title: "bug", group: group) }
     let_it_be(:group_label2) { create(:group_label, title: "dev", group: group) }
     let_it_be(:list1) { create(:list, board: board, label: group_label1, position: 0) }