Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 8 deletions

diff --git a/spec/finders/issues_finder_spec.rb b/spec/finders/issues_finder_spec.rb
index 7a102cb479e..ff52e1b9d5f 100644
--- a/spec/finders/issues_finder_spec.rb
+++ b/spec/finders/issues_finder_spec.rb
@@ -29,7 +29,7 @@ describe IssuesFinder do
         end
 
         context 'filter by username' do
-          set(:user3) { create(:user) }
+          let_it_be(:user3) { create(:user) }
 
           before do
             project2.add_developer(user3)
@@ -53,7 +53,7 @@ describe IssuesFinder do
         end
 
         it_behaves_like 'no assignee filter' do
-          set(:user3) { create(:user) }
+          let_it_be(:user3) { create(:user) }
           let(:expected_issuables) { [issue4] }
         end
 
@@ -679,7 +679,7 @@ describe IssuesFinder do
       end
 
       context 'filtering by confidential' do
-        set(:confidential_issue) { create(:issue, project: project1, confidential: true) }
+        let_it_be(:confidential_issue) { create(:issue, project: project1, confidential: true) }
 
         context 'no filtering' do
           it 'returns all issues' do
@@ -777,7 +777,7 @@ describe IssuesFinder do
     it 'returns the number of rows for the default state' do
       finder = described_class.new(user)
 
-      expect(finder.row_count).to eq(5)
+      expect(finder.row_count).to eq(4)
     end
 
     it 'returns the number of rows for a given state' do
@@ -790,10 +790,10 @@ describe IssuesFinder do
   describe '#with_confidentiality_access_check' do
     let(:guest) { create(:user) }
 
-    set(:authorized_user) { create(:user) }
-    set(:project) { create(:project, namespace: authorized_user.namespace) }
-    set(:public_issue) { create(:issue, project: project) }
-    set(:confidential_issue) { create(:issue, project: project, confidential: true) }
+    let_it_be(:authorized_user) { create(:user) }
+    let_it_be(:project) { create(:project, namespace: authorized_user.namespace) }
+    let_it_be(:public_issue) { create(:issue, project: project) }
+    let_it_be(:confidential_issue) { create(:issue, project: project, confidential: true) }
 
     context 'when no project filter is given' do
       let(:params) { {} }