Add latest changes from gitlab-org/gitlab@master

spec/lib/gitlab/project_template_spec.rb

@@ -73,7 +73,7 @@ describe Gitlab::ProjectTemplate do
   end
   describe 'validate all templates' do
-    set(:admin) { create(:admin) }
+    let_it_be(:admin) { create(:admin) }
     described_class.all.each do |template|
       it "#{template.name} has a valid archive" do

spec/lib/gitlab/repo_path_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 describe ::Gitlab::RepoPath do
   describe '.parse' do
-    set(:project) { create(:project, :repository) }
+    let_it_be(:project) { create(:project, :repository) }
     context 'a repository storage path' do
       it 'parses a full repository path' do

spec/lib/gitlab/sanitizers/exif_spec.rb

@@ -7,9 +7,9 @@ describe Gitlab::Sanitizers::Exif do
   describe '#batch_clean' do
     context 'with image uploads' do
-      set(:upload1) { create(:upload, :with_file, :issuable_upload) }
-      set(:upload2) { create(:upload, :with_file, :personal_snippet_upload) }
-      set(:upload3) { create(:upload, :with_file, created_at: 3.days.ago) }
+      let_it_be(:upload1) { create(:upload, :with_file, :issuable_upload) }
+      let_it_be(:upload2) { create(:upload, :with_file, :personal_snippet_upload) }
+      let_it_be(:upload3) { create(:upload, :with_file, created_at: 3.days.ago) }
       it 'processes all uploads if range ID is not set' do
         expect(sanitizer).to receive(:clean).exactly(3).times

spec/lib/gitlab/shell_spec.rb

@@ -4,8 +4,7 @@ require 'spec_helper'
 require 'stringio'
 describe Gitlab::Shell do
-  set(:project) { create(:project, :repository) }
-
+  let_it_be(:project) { create(:project, :repository) }
   let(:repository) { project.repository }
   let(:gitlab_shell) { described_class.new }
   let(:popen_vars) { { 'GIT_TERMINAL_PROMPT' => ENV['GIT_TERMINAL_PROMPT'] } }

spec/lib/gitlab/slash_commands/issue_move_spec.rb

@@ -22,11 +22,11 @@ describe Gitlab::SlashCommands::IssueMove, service: true do
   end
   describe '#execute' do
-    set(:user) { create(:user) }
-    set(:issue) { create(:issue) }
-    set(:chat_name) { create(:chat_name, user: user) }
-    set(:project) { issue.project }
-    set(:other_project) { create(:project, namespace: project.namespace) }
+    let_it_be(:user) { create(:user) }
+    let_it_be(:issue) { create(:issue) }
+    let_it_be(:chat_name) { create(:chat_name, user: user) }
+    let_it_be(:project) { issue.project }
+    let_it_be(:other_project) { create(:project, namespace: project.namespace) }
     before do
       [project, other_project].each { |prj| prj.add_maintainer(user) }

spec/lib/gitlab/slash_commands/presenters/issue_move_spec.rb

@@ -3,11 +3,11 @@
 require 'spec_helper'
 describe Gitlab::SlashCommands::Presenters::IssueMove do
-  set(:admin) { create(:admin) }
-  set(:project) { create(:project) }
-  set(:other_project) { create(:project) }
-  set(:old_issue) { create(:issue, project: project) }
-  set(:new_issue) { Issues::MoveService.new(project, admin).execute(old_issue, other_project) }
+  let_it_be(:admin) { create(:admin) }
+  let_it_be(:project, reload: true) { create(:project) }
+  let_it_be(:other_project) { create(:project) }
+  let_it_be(:old_issue, reload: true) { create(:issue, project: project) }
+  let(:new_issue) { Issues::MoveService.new(project, admin).execute(old_issue, other_project) }
   let(:attachment) { subject[:attachments].first }
   subject { described_class.new(new_issue).present(old_issue) }

spec/lib/gitlab/template/finders/repo_template_finders_spec.rb

@@ -3,8 +3,7 @@
 require 'spec_helper'
 describe Gitlab::Template::Finders::RepoTemplateFinder do
-  set(:project) { create(:project, :repository) }
-
+  let_it_be(:project) { create(:project, :repository) }
   let(:categories) { { 'HTML' => 'html' } }
   subject(:finder) { described_class.new(project, 'files/', '.html', categories) }

spec/lib/gitlab/workhorse_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 describe Gitlab::Workhorse do
-  set(:project)    { create(:project, :repository) }
+  let_it_be(:project) { create(:project, :repository) }
   let(:repository) { project.repository }
   def decode_workhorse_header(array)

spec/support/capybara.rb

@@ -17,7 +17,8 @@ JS_CONSOLE_FILTER = Regexp.union([
   '"[HMR] Waiting for update signal from WDS..."',
   '"[WDS] Hot Module Replacement enabled."',
   '"[WDS] Live Reloading enabled."',
-  "Download the Vue Devtools extension"
+  'Download the Vue Devtools extension',
+  'Download the Apollo DevTools'
 ])
 CAPYBARA_WINDOW_SIZE = [1366, 768].freeze