Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 0 deletions

diff --git a/spec/models/board_spec.rb b/spec/models/board_spec.rb
index 90a06b80f9c..775cccd2aec 100644
--- a/spec/models/board_spec.rb
+++ b/spec/models/board_spec.rb
@@ -21,10 +21,12 @@ RSpec.describe Board do
   end
 
   describe '#order_by_name_asc' do
+    # rubocop:disable RSpec/VariableName
     let!(:board_B) { create(:board, project: project, name: 'B') }
     let!(:board_C) { create(:board, project: project, name: 'C') }
     let!(:board_a) { create(:board, project: project, name: 'a') }
     let!(:board_A) { create(:board, project: project, name: 'A') }
+    # rubocop:enable RSpec/VariableName
 
     it 'returns in case-insensitive alphabetical order and then by ascending id' do
       expect(project.boards.order_by_name_asc).to eq [board_a, board_A, board_B, board_C]
@@ -32,10 +34,12 @@ RSpec.describe Board do
   end
 
   describe '#first_board' do
+    # rubocop:disable RSpec/VariableName
     let!(:board_B) { create(:board, project: project, name: 'B') }
     let!(:board_C) { create(:board, project: project, name: 'C') }
     let!(:board_a) { create(:board, project: project, name: 'a') }
     let!(:board_A) { create(:board, project: project, name: 'A') }
+    # rubocop:enable RSpec/VariableName
 
     it 'return the first case-insensitive alphabetical board as a relation' do
       expect(project.boards.first_board).to eq [board_a]