Add latest changes from gitlab-org/gitlab@master

4 files changed, 13 insertions, 13 deletions

diff --git a/spec/features/discussion_comments/snippets_spec.rb b/spec/features/discussion_comments/snippets_spec.rb
index 0dccb7f5bb3..bf78a5261c5 100644
--- a/spec/features/discussion_comments/snippets_spec.rb
+++ b/spec/features/discussion_comments/snippets_spec.rb
@@ -3,9 +3,9 @@
 require 'spec_helper'
 
 describe 'Thread Comments Snippet', :js do
-  let(:user) { create(:user) }
-  let(:project) { create(:project) }
-  let(:snippet) { create(:project_snippet, :private, project: project, author: user) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project) { create(:project) }
+  let_it_be(:snippet) { create(:project_snippet, :private, :repository, project: project, author: user) }
 
   before do
     stub_feature_flags(snippets_vue: false)
diff --git a/spec/features/projects/snippets/create_snippet_spec.rb b/spec/features/projects/snippets/create_snippet_spec.rb
index 5a425fb5d27..33113dce620 100644
--- a/spec/features/projects/snippets/create_snippet_spec.rb
+++ b/spec/features/projects/snippets/create_snippet_spec.rb
@@ -5,8 +5,8 @@ require 'spec_helper'
 describe 'Projects > Snippets > Create Snippet', :js do
   include DropzoneHelper
 
-  let(:user) { create(:user) }
-  let(:project) { create(:project, :public) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project) { create(:project, :public) }
 
   def description_field
     find('.js-description-input input,textarea')
@@ -102,7 +102,7 @@ describe 'Projects > Snippets > Create Snippet', :js do
     end
 
     it 'shows a public snippet on the index page but not the New snippet button' do
-      snippet = create(:project_snippet, :public, project: project)
+      snippet = create(:project_snippet, :public, :repository, project: project)
 
       visit project_snippets_path(project)
 
diff --git a/spec/features/projects/snippets/user_comments_on_snippet_spec.rb b/spec/features/projects/snippets/user_comments_on_snippet_spec.rb
index 11707378996..9d11b55228b 100644
--- a/spec/features/projects/snippets/user_comments_on_snippet_spec.rb
+++ b/spec/features/projects/snippets/user_comments_on_snippet_spec.rb
@@ -3,9 +3,9 @@
 require 'spec_helper'
 
 describe 'Projects > Snippets > User comments on a snippet', :js do
-  let(:project) { create(:project) }
-  let!(:snippet) { create(:project_snippet, project: project, author: user) }
-  let(:user) { create(:user) }
+  let_it_be(:project) { create(:project) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:snippet) { create(:project_snippet, :repository, project: project, author: user) }
 
   before do
     stub_feature_flags(snippets_vue: false)
diff --git a/spec/features/reportable_note/snippets_spec.rb b/spec/features/reportable_note/snippets_spec.rb
index bd37675315f..a4e609ce40c 100644
--- a/spec/features/reportable_note/snippets_spec.rb
+++ b/spec/features/reportable_note/snippets_spec.rb
@@ -3,8 +3,8 @@
 require 'spec_helper'
 
 describe 'Reportable note on snippets', :js do
-  let(:user) { create(:user) }
-  let(:project) { create(:project) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project) { create(:project) }
 
   before do
     stub_feature_flags(snippets_vue: false)
@@ -13,8 +13,8 @@ describe 'Reportable note on snippets', :js do
   end
 
   describe 'on project snippet' do
-    let(:snippet) { create(:project_snippet, :public, project: project, author: user) }
-    let!(:note) { create(:note_on_project_snippet, noteable: snippet, project: project) }
+    let_it_be(:snippet) { create(:project_snippet, :public, :repository, project: project, author: user) }
+    let_it_be(:note) { create(:note_on_project_snippet, noteable: snippet, project: project) }
 
     before do
       visit project_snippet_path(project, snippet)