Add latest changes from gitlab-org/gitlab@master

spec/lib/gitlab/data_builder/wiki_page_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 describe Gitlab::DataBuilder::WikiPage do
-  set(:project) { create(:project, :repository, :wiki_repo) }
+  let_it_be(:project) { create(:project, :repository, :wiki_repo) }
   let(:wiki_page) { create(:wiki_page, wiki: project.wiki) }
   let(:user) { create(:user) }

spec/lib/gitlab/git/lfs_changes_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 describe Gitlab::Git::LfsChanges do
-  set(:project) { create(:project, :repository) }
+  let_it_be(:project) { create(:project, :repository) }
   let(:newrev) { '54fcc214b94e78d7a41a9a8fe6d87a5e59500e51' }
   let(:blob_object_id) { '0c304a93cb8430108629bbbcaa27db3343299bc0' }

spec/lib/gitlab/git/merge_base_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 describe Gitlab::Git::MergeBase do
-  set(:project) { create(:project, :repository) }
+  let_it_be(:project) { create(:project, :repository) }
   let(:repository) { project.repository }
   subject(:merge_base) { described_class.new(repository, refs) }

spec/lib/gitlab/git/push_spec.rb

@@ -3,8 +3,7 @@
 require 'spec_helper'
 describe Gitlab::Git::Push do
-  set(:project) { create(:project, :repository) }
-
+  let_it_be(:project) { create(:project, :repository) }
   let(:oldrev) { project.commit('HEAD~2').id }
   let(:newrev) { project.commit.id }
   let(:ref) { 'refs/heads/some-branch' }

spec/lib/gitlab/git_post_receive_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 describe ::Gitlab::GitPostReceive do
-  set(:project) { create(:project, :repository) }
+  let_it_be(:project) { create(:project, :repository) }
   subject { described_class.new(project, "project-#{project.id}", changes.dup, {}) }

spec/lib/gitlab/gitaly_client/operation_service_spec.rb

@@ -3,10 +3,10 @@
 require 'spec_helper'
 describe Gitlab::GitalyClient::OperationService do
-  set(:project) { create(:project, :repository) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project) { create(:project, :repository) }
   let(:repository) { project.repository.raw }
   let(:client) { described_class.new(repository) }
-  set(:user) { create(:user) }
   let(:gitaly_user) { Gitlab::Git::User.from_gitlab(user).to_gitaly }
   describe '#user_create_branch' do

spec/lib/gitlab/global_id_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 describe Gitlab::GlobalId do
   describe '.build' do
-    set(:object) { create(:issue) }
+    let_it_be(:object) { create(:issue) }
     it 'returns a standard GlobalId if only object is passed' do
       expect(described_class.build(object).to_s).to eq(object.to_global_id.to_s)

spec/lib/gitlab/graphql/loaders/batch_lfs_oid_loader_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe Gitlab::Graphql::Loaders::BatchLfsOidLoader do
   include GraphqlHelpers
-  set(:project) { create(:project, :repository) }
+  let_it_be(:project) { create(:project, :repository) }
   let(:repository) { project.repository }
   let(:blob) { Gitlab::Graphql::Representation::TreeEntry.new(repository.blob_at('master', 'files/lfs/lfs_object.iso'), repository) }
   let(:otherblob) { Gitlab::Graphql::Representation::TreeEntry.new(repository.blob_at('master', 'README'), repository) }

spec/lib/gitlab/hashed_storage/migrator_spec.rb

@@ -186,7 +186,7 @@ describe Gitlab::HashedStorage::Migrator, :redis do
   end
   describe 'migration_pending?' do
-    set(:project) { create(:project, :empty_repo) }
+    let_it_be(:project) { create(:project, :empty_repo) }
     it 'returns true when there are MigratorWorker jobs scheduled' do
       Sidekiq::Testing.disable! do
@@ -210,7 +210,7 @@ describe Gitlab::HashedStorage::Migrator, :redis do
   end
   describe 'rollback_pending?' do
-    set(:project) { create(:project, :empty_repo) }
+    let_it_be(:project) { create(:project, :empty_repo) }
     it 'returns true when there are RollbackerWorker jobs scheduled' do
       Sidekiq::Testing.disable! do

spec/lib/gitlab/hook_data/issuable_builder_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 describe Gitlab::HookData::IssuableBuilder do
-  set(:user) { create(:user) }
+  let_it_be(:user) { create(:user) }
   # This shared example requires a `builder` and `user` variable
   shared_examples 'issuable hook data' do |kind|

spec/lib/gitlab/hook_data/issue_builder_spec.rb

@@ -3,8 +3,8 @@
 require 'spec_helper'
 describe Gitlab::HookData::IssueBuilder do
-  set(:label) { create(:label) }
-  set(:issue) { create(:labeled_issue, labels: [label], project: label.project) }
+  let_it_be(:label) { create(:label) }
+  let_it_be(:issue) { create(:labeled_issue, labels: [label], project: label.project) }
   let(:builder) { described_class.new(issue) }
   describe '#build' do

spec/lib/gitlab/hook_data/merge_request_builder_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 describe Gitlab::HookData::MergeRequestBuilder do
-  set(:merge_request) { create(:merge_request) }
+  let_it_be(:merge_request) { create(:merge_request) }
   let(:builder) { described_class.new(merge_request) }
   describe '#build' do

spec/lib/gitlab/import/merge_request_helpers_spec.rb

@@ -3,8 +3,8 @@
 require 'spec_helper'
 describe Gitlab::Import::MergeRequestHelpers, type: :helper do
-  set(:project) { create(:project, :repository) }
-  set(:user) { create(:user) }
+  let_it_be(:project) { create(:project, :repository) }
+  let_it_be(:user) { create(:user) }
   describe '.create_merge_request_without_hooks' do
     let(:iid) { 42 }

spec/lib/gitlab/import_export/repo_saver_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 describe Gitlab::ImportExport::RepoSaver do
   describe 'bundle a project Git repo' do
-    set(:user) { create(:user) }
+    let_it_be(:user) { create(:user) }
     let!(:project) { create(:project, :repository) }
     let(:export_path) { "#{Dir.tmpdir}/project_tree_saver_spec" }
     let(:shared) { project.import_export_shared }

spec/lib/gitlab/import_export/wiki_repo_saver_spec.rb

@@ -4,8 +4,8 @@ require 'spec_helper'
 describe Gitlab::ImportExport::WikiRepoSaver do
   describe 'bundle a wiki Git repo' do
-    set(:user) { create(:user) }
-    let!(:project) { create(:project, :wiki_repo) }
+    let_it_be(:user) { create(:user) }
+    let_it_be(:project) { create(:project, :wiki_repo) }
     let(:export_path) { "#{Dir.tmpdir}/project_tree_saver_spec" }
     let(:shared) { project.import_export_shared }
     let(:wiki_bundler) { described_class.new(project: project, shared: shared) }

spec/lib/gitlab/json_cache_spec.rb

@@ -3,13 +3,12 @@
 require 'spec_helper'
 describe Gitlab::JsonCache do
+  let_it_be(:broadcast_message) { create(:broadcast_message) }
   let(:backend) { double('backend').as_null_object }
   let(:namespace) { 'geo' }
   let(:key) { 'foo' }
   let(:expanded_key) { "#{namespace}:#{key}:#{Gitlab::VERSION}:#{Rails.version}" }
-  set(:broadcast_message) { create(:broadcast_message) }
-
   subject(:cache) { described_class.new(namespace: namespace, backend: backend) }
   describe '#active?' do

spec/lib/gitlab/language_detection_spec.rb

@@ -3,9 +3,9 @@
 require 'spec_helper'
 describe Gitlab::LanguageDetection do
-  set(:project) { create(:project, :repository) }
-  set(:ruby) { create(:programming_language, name: 'Ruby') }
-  set(:haskell) { create(:programming_language, name: 'Haskell') }
+  let_it_be(:project) { create(:project, :repository) }
+  let_it_be(:ruby) { create(:programming_language, name: 'Ruby') }
+  let_it_be(:haskell) { create(:programming_language, name: 'Haskell') }
   let(:repository) { project.repository }
   let(:detection) do
     [{ value: 66.63, label: "Ruby", color: "#701516", highlight: "#701516" },

spec/lib/gitlab/metrics/dashboard/finder_spec.rb

@@ -5,9 +5,9 @@ require 'spec_helper'
 describe Gitlab::Metrics::Dashboard::Finder, :use_clean_rails_memory_store_caching do
   include MetricsDashboardHelpers
-  set(:project) { create(:project) }
-  set(:user) { create(:user) }
-  set(:environment) { create(:environment, project: project) }
+  let_it_be(:project) { create(:project) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:environment) { create(:environment, project: project) }
   before do
     project.add_maintainer(user)

spec/lib/gitlab/phabricator_import/cache/map_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 describe Gitlab::PhabricatorImport::Cache::Map, :clean_gitlab_redis_cache do
-  set(:project) { create(:project) }
+  let_it_be(:project) { create(:project) }
   let(:redis) { Gitlab::Redis::Cache }
   subject(:map) { described_class.new(project) }

spec/lib/gitlab/phabricator_import/issues/task_importer_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 describe Gitlab::PhabricatorImport::Issues::TaskImporter do
-  set(:project) { create(:project) }
+  let_it_be(:project) { create(:project) }
   let(:task) do
     Gitlab::PhabricatorImport::Representation::Task.new(
       {