Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

1 files changed, 5 insertions, 8 deletions

diff --git a/spec/support/shared_examples/services/boards/lists_destroy_service_shared_examples.rb b/spec/support/shared_examples/services/boards/lists_destroy_service_shared_examples.rb
index 94da405e491..af88644ced7 100644
--- a/spec/support/shared_examples/services/boards/lists_destroy_service_shared_examples.rb
+++ b/spec/support/shared_examples/services/boards/lists_destroy_service_shared_examples.rb
@@ -3,30 +3,27 @@
 RSpec.shared_examples 'lists destroy service' do
   context 'when list type is label' do
     it 'removes list from board' do
-      list = create(:list, board: board)
       service = described_class.new(parent, user)
 
       expect { service.execute(list) }.to change(board.lists, :count).by(-1)
     end
 
     it 'decrements position of higher lists' do
-      development = create(:list, board: board, position: 0)
-      review      = create(:list, board: board, position: 1)
-      staging     = create(:list, board: board, position: 2)
-      closed      = board.lists.closed.first
+      development = create(list_type, params.merge(position: 0))
+      review      = create(list_type, params.merge(position: 1))
+      staging     = create(list_type, params.merge(position: 2))
 
       described_class.new(parent, user).execute(development)
 
       expect(review.reload.position).to eq 0
       expect(staging.reload.position).to eq 1
-      expect(closed.reload.position).to be_nil
+      expect(closed_list.reload.position).to be_nil
     end
   end
 
   it 'does not remove list from board when list type is closed' do
-    list = board.lists.closed.first
     service = described_class.new(parent, user)
 
-    expect { service.execute(list) }.not_to change(board.lists, :count)
+    expect { service.execute(closed_list) }.not_to change(board.lists, :count)
   end
 end