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

1 files changed, 13 insertions, 0 deletions

diff --git a/spec/controllers/boards/issues_controller_spec.rb b/spec/controllers/boards/issues_controller_spec.rb
index d23f099e382..48000284264 100644
--- a/spec/controllers/boards/issues_controller_spec.rb
+++ b/spec/controllers/boards/issues_controller_spec.rb
@@ -49,6 +49,7 @@ RSpec.describe Boards::IssuesController do
           create(:labeled_issue, project: project, labels: [development], due_date: Date.tomorrow)
           create(:labeled_issue, project: project, labels: [development], assignees: [johndoe])
           issue.subscribe(johndoe, project)
+          expect(Issue).to receive(:move_nulls_to_end)
 
           list_issues user: user, board: board, list: list2
 
@@ -119,6 +120,18 @@ RSpec.describe Boards::IssuesController do
 
           expect(query_count).to eq(1)
         end
+
+        context 'when block_issue_repositioning feature flag is enabled' do
+          before do
+            stub_feature_flags(block_issue_repositioning: true)
+          end
+
+          it 'does not reposition issues with null position' do
+            expect(Issue).not_to receive(:move_nulls_to_end)
+
+            list_issues(user: user, board: group_board, list: list3)
+          end
+        end
       end
 
       context 'with invalid list id' do