Add latest changes from gitlab-org/gitlab@master

1 files changed, 41 insertions, 37 deletions

diff --git a/spec/services/boards/issues/list_service_spec.rb b/spec/services/boards/issues/list_service_spec.rb
index 29b49db42f9..2fd544ab949 100644
--- a/spec/services/boards/issues/list_service_spec.rb
+++ b/spec/services/boards/issues/list_service_spec.rb
@@ -4,40 +4,41 @@ require 'spec_helper'
 
 RSpec.describe Boards::Issues::ListService do
   describe '#execute' do
-    context 'when parent is a project' do
-      let(:user)    { create(:user) }
-      let(:project) { create(:project) }
-      let(:board)   { create(:board, project: project) }
-
-      let(:m1) { create(:milestone, project: project) }
-      let(:m2) { create(:milestone, project: project) }
-
-      let(:bug) { create(:label, project: project, name: 'Bug') }
-      let(:development) { create(:label, project: project, name: 'Development') }
-      let(:testing) { create(:label, project: project, name: 'Testing') }
-      let(:p1) { create(:label, title: 'P1', project: project, priority: 1) }
-      let(:p2) { create(:label, title: 'P2', project: project, priority: 2) }
-      let(:p3) { create(:label, title: 'P3', project: project, priority: 3) }
-
-      let!(:backlog) { create(:backlog_list, board: board) }
-      let!(:list1)   { create(:list, board: board, label: development, position: 0) }
-      let!(:list2)   { create(:list, board: board, label: testing, position: 1) }
-      let!(:closed)  { create(:closed_list, board: board) }
+    let_it_be(:user) { create(:user) }
 
-      let!(:opened_issue1) { create(:labeled_issue, project: project, milestone: m1, title: 'Issue 1', labels: [bug]) }
-      let!(:opened_issue2) { create(:labeled_issue, project: project, milestone: m2, title: 'Issue 2', labels: [p2]) }
-      let!(:reopened_issue1) { create(:issue, :opened, project: project, title: 'Reopened Issue 1' ) }
-
-      let!(:list1_issue1) { create(:labeled_issue, project: project, milestone: m1, labels: [p2, development]) }
-      let!(:list1_issue2) { create(:labeled_issue, project: project, milestone: m2, labels: [development]) }
-      let!(:list1_issue3) { create(:labeled_issue, project: project, milestone: m1, labels: [development, p1]) }
-      let!(:list2_issue1) { create(:labeled_issue, project: project, milestone: m1, labels: [testing]) }
-
-      let!(:closed_issue1) { create(:labeled_issue, :closed, project: project, labels: [bug], closed_at: 1.day.ago) }
-      let!(:closed_issue2) { create(:labeled_issue, :closed, project: project, labels: [p3], closed_at: 2.days.ago) }
-      let!(:closed_issue3) { create(:issue, :closed, project: project, closed_at: 1.week.ago) }
-      let!(:closed_issue4) { create(:labeled_issue, :closed, project: project, labels: [p1], closed_at: 1.year.ago) }
-      let!(:closed_issue5) { create(:labeled_issue, :closed, project: project, labels: [development], closed_at: 2.years.ago) }
+    context 'when parent is a project' do
+      let_it_be(:project) { create(:project, :empty_repo) }
+      let_it_be(:board)   { create(:board, project: project) }
+
+      let_it_be(:m1) { create(:milestone, project: project) }
+      let_it_be(:m2) { create(:milestone, project: project) }
+
+      let_it_be(:bug) { create(:label, project: project, name: 'Bug') }
+      let_it_be(:development) { create(:label, project: project, name: 'Development') }
+      let_it_be(:testing) { create(:label, project: project, name: 'Testing') }
+      let_it_be(:p1) { create(:label, title: 'P1', project: project, priority: 1) }
+      let_it_be(:p2) { create(:label, title: 'P2', project: project, priority: 2) }
+      let_it_be(:p3) { create(:label, title: 'P3', project: project, priority: 3) }
+
+      let_it_be(:backlog) { create(:backlog_list, board: board) }
+      let_it_be(:list1)   { create(:list, board: board, label: development, position: 0) }
+      let_it_be(:list2)   { create(:list, board: board, label: testing, position: 1) }
+      let_it_be(:closed)  { create(:closed_list, board: board) }
+
+      let_it_be(:opened_issue1) { create(:labeled_issue, project: project, milestone: m1, title: 'Issue 1', labels: [bug]) }
+      let_it_be(:opened_issue2) { create(:labeled_issue, project: project, milestone: m2, title: 'Issue 2', labels: [p2]) }
+      let_it_be(:reopened_issue1) { create(:issue, :opened, project: project, title: 'Reopened Issue 1' ) }
+
+      let_it_be(:list1_issue1) { create(:labeled_issue, project: project, milestone: m1, labels: [p2, development]) }
+      let_it_be(:list1_issue2) { create(:labeled_issue, project: project, milestone: m2, labels: [development]) }
+      let_it_be(:list1_issue3) { create(:labeled_issue, project: project, milestone: m1, labels: [development, p1]) }
+      let_it_be(:list2_issue1) { create(:labeled_issue, project: project, milestone: m1, labels: [testing]) }
+
+      let_it_be(:closed_issue1) { create(:labeled_issue, :closed, project: project, labels: [bug], closed_at: 1.day.ago) }
+      let_it_be(:closed_issue2) { create(:labeled_issue, :closed, project: project, labels: [p3], closed_at: 2.days.ago) }
+      let_it_be(:closed_issue3) { create(:issue, :closed, project: project, closed_at: 1.week.ago) }
+      let_it_be(:closed_issue4) { create(:labeled_issue, :closed, project: project, labels: [p1], closed_at: 1.year.ago) }
+      let_it_be(:closed_issue5) { create(:labeled_issue, :closed, project: project, labels: [development], closed_at: 2.years.ago) }
 
       let(:parent) { project }
 
@@ -48,14 +49,16 @@ RSpec.describe Boards::Issues::ListService do
       it_behaves_like 'issues list service'
 
       context 'when project is archived' do
-        let(:project) { create(:project, :archived) }
+        before do
+          project.update!(archived: true)
+        end
 
         it_behaves_like 'issues list service'
       end
     end
 
+    # rubocop: disable RSpec/MultipleMemoizedHelpers
     context 'when parent is a group' do
-      let(:user)    { create(:user) }
       let(:project) { create(:project, :empty_repo, namespace: group) }
       let(:project1) { create(:project, :empty_repo, namespace: group) }
       let(:project_archived) { create(:project, :empty_repo, :archived, namespace: group) }
@@ -104,7 +107,7 @@ RSpec.describe Boards::Issues::ListService do
         group.add_developer(user)
       end
 
-      context 'and group has no parent' do
+      context 'when the group has no parent' do
         let(:parent) { group }
         let(:group) { create(:group) }
         let(:board) { create(:board, group: group) }
@@ -112,7 +115,7 @@ RSpec.describe Boards::Issues::ListService do
         it_behaves_like 'issues list service'
       end
 
-      context 'and group is an ancestor' do
+      context 'when the group is an ancestor' do
         let(:parent) { create(:group) }
         let(:group) { create(:group, parent: parent) }
         let!(:backlog) { create(:backlog_list, board: board) }
@@ -125,5 +128,6 @@ RSpec.describe Boards::Issues::ListService do
         it_behaves_like 'issues list service'
       end
     end
+    # rubocop: enable RSpec/MultipleMemoizedHelpers
   end
 end