1 files changed, 31 insertions, 3 deletions

diff --git a/spec/services/boards/lists/list_service_spec.rb b/spec/services/boards/lists/list_service_spec.rb
index 0c8a8dc7329..2d41de42581 100644
--- a/spec/services/boards/lists/list_service_spec.rb
+++ b/spec/services/boards/lists/list_service_spec.rb
@@ -3,13 +3,40 @@
 require 'spec_helper'
 
 RSpec.describe Boards::Lists::ListService do
-  let(:user) { create(:user) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:group) { create(:group) }
+
+  RSpec.shared_examples 'FOSS lists only' do
+    context 'when board contains a non FOSS list' do
+      # This scenario may happen when there used to be an EE license and user downgraded
+      let!(:backlog_list) { create_backlog_list(board) }
+      let_it_be(:milestone) { create(:milestone, group: group) }
+      let_it_be(:assignee_list) do
+        list = build(:list, board: board, user_id: user.id, list_type: List.list_types[:assignee], position: 0)
+        list.save!(validate: false)
+        list
+      end
+
+      let_it_be(:milestone_list) do
+        list = build(:list, board: board, milestone_id: milestone.id, list_type: List.list_types[:milestone], position: 1) # rubocop:disable Layout/LineLength
+        list.save!(validate: false)
+        list
+      end
+
+      it "returns only FOSS board's lists" do
+        # just making sure these non FOSS lists actually exist on the board
+        expect(board.lists.with_types([List.list_types[:assignee], List.list_types[:milestone]]).count).to eq 2
+        # check that the FOSS lists are not returned from the service
+        expect(service.execute(board)).to match_array [backlog_list, list, board.lists.closed.first]
+      end
+    end
+  end
 
   describe '#execute' do
     let(:service) { described_class.new(parent, user) }
 
     context 'when board parent is a project' do
-      let_it_be(:project) { create(:project) }
+      let_it_be(:project) { create(:project, group: group) }
       let_it_be_with_reload(:board) { create(:board, project: project) }
       let_it_be(:label) { create(:label, project: project) }
       let_it_be(:list) { create(:list, board: board, label: label) }
@@ -18,10 +45,10 @@ RSpec.describe Boards::Lists::ListService do
       let(:parent) { project }
 
       it_behaves_like 'lists list service'
+      it_behaves_like 'FOSS lists only'
     end
 
     context 'when board parent is a group' do
-      let_it_be(:group) { create(:group) }
       let_it_be_with_reload(:board) { create(:board, group: group) }
       let_it_be(:label) { create(:group_label, group: group) }
       let_it_be(:list) { create(:list, board: board, label: label) }
@@ -30,6 +57,7 @@ RSpec.describe Boards::Lists::ListService do
       let(:parent) { group }
 
       it_behaves_like 'lists list service'
+      it_behaves_like 'FOSS lists only'
     end
 
     def create_backlog_list(board)