Add latest changes from gitlab-org/gitlab@13-2-stable-ee

15 files changed, 16 insertions, 16 deletions

diff --git a/spec/lib/gitlab/phabricator_import/cache/map_spec.rb b/spec/lib/gitlab/phabricator_import/cache/map_spec.rb
index 4935ef1bd90..0f760852a68 100644
--- a/spec/lib/gitlab/phabricator_import/cache/map_spec.rb
+++ b/spec/lib/gitlab/phabricator_import/cache/map_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::PhabricatorImport::Cache::Map, :clean_gitlab_redis_cache do
+RSpec.describe Gitlab::PhabricatorImport::Cache::Map, :clean_gitlab_redis_cache do
   let_it_be(:project) { create(:project) }
   let(:redis) { Gitlab::Redis::Cache }
 
diff --git a/spec/lib/gitlab/phabricator_import/conduit/client_spec.rb b/spec/lib/gitlab/phabricator_import/conduit/client_spec.rb
index 542b3cd060f..dad349f3255 100644
--- a/spec/lib/gitlab/phabricator_import/conduit/client_spec.rb
+++ b/spec/lib/gitlab/phabricator_import/conduit/client_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-describe Gitlab::PhabricatorImport::Conduit::Client do
+RSpec.describe Gitlab::PhabricatorImport::Conduit::Client do
   let(:client) do
     described_class.new('https://see-ya-later.phabricator', 'api-token')
   end
diff --git a/spec/lib/gitlab/phabricator_import/conduit/maniphest_spec.rb b/spec/lib/gitlab/phabricator_import/conduit/maniphest_spec.rb
index 0d7714649b9..e655a39a28d 100644
--- a/spec/lib/gitlab/phabricator_import/conduit/maniphest_spec.rb
+++ b/spec/lib/gitlab/phabricator_import/conduit/maniphest_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-describe Gitlab::PhabricatorImport::Conduit::Maniphest do
+RSpec.describe Gitlab::PhabricatorImport::Conduit::Maniphest do
   let(:maniphest) do
     described_class.new(phabricator_url: 'https://see-ya-later.phabricator', api_token: 'api-token')
   end
diff --git a/spec/lib/gitlab/phabricator_import/conduit/response_spec.rb b/spec/lib/gitlab/phabricator_import/conduit/response_spec.rb
index 1ffb811cbc1..c368b349a3c 100644
--- a/spec/lib/gitlab/phabricator_import/conduit/response_spec.rb
+++ b/spec/lib/gitlab/phabricator_import/conduit/response_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-describe Gitlab::PhabricatorImport::Conduit::Response do
+RSpec.describe Gitlab::PhabricatorImport::Conduit::Response do
   let(:response) { described_class.new(Gitlab::Json.parse(fixture_file('phabricator_responses/maniphest.search.json')))}
   let(:error_response) { described_class.new(Gitlab::Json.parse(fixture_file('phabricator_responses/auth_failed.json'))) }
 
@@ -30,7 +30,7 @@ describe Gitlab::PhabricatorImport::Conduit::Response do
                        body: 'This is no JSON')
 
       expect { described_class.parse!(fake_response) }
-        .to raise_error(Gitlab::PhabricatorImport::Conduit::ResponseError, /unexpected token at/)
+        .to raise_error(Gitlab::PhabricatorImport::Conduit::ResponseError, /unexpected character/)
     end
 
     it 'returns a parsed response for valid input' do
diff --git a/spec/lib/gitlab/phabricator_import/conduit/tasks_response_spec.rb b/spec/lib/gitlab/phabricator_import/conduit/tasks_response_spec.rb
index 2cc12ee0165..4e56dead5c0 100644
--- a/spec/lib/gitlab/phabricator_import/conduit/tasks_response_spec.rb
+++ b/spec/lib/gitlab/phabricator_import/conduit/tasks_response_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-describe Gitlab::PhabricatorImport::Conduit::TasksResponse do
+RSpec.describe Gitlab::PhabricatorImport::Conduit::TasksResponse do
   let(:conduit_response) do
     Gitlab::PhabricatorImport::Conduit::Response
       .new(Gitlab::Json.parse(fixture_file('phabricator_responses/maniphest.search.json')))
diff --git a/spec/lib/gitlab/phabricator_import/conduit/user_spec.rb b/spec/lib/gitlab/phabricator_import/conduit/user_spec.rb
index f3928f390bc..d38421c9405 100644
--- a/spec/lib/gitlab/phabricator_import/conduit/user_spec.rb
+++ b/spec/lib/gitlab/phabricator_import/conduit/user_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-describe Gitlab::PhabricatorImport::Conduit::User do
+RSpec.describe Gitlab::PhabricatorImport::Conduit::User do
   let(:user_client) do
     described_class.new(phabricator_url: 'https://see-ya-later.phabricator', api_token: 'api-token')
   end
diff --git a/spec/lib/gitlab/phabricator_import/conduit/users_response_spec.rb b/spec/lib/gitlab/phabricator_import/conduit/users_response_spec.rb
index 999a986b73c..ebbb2c0598c 100644
--- a/spec/lib/gitlab/phabricator_import/conduit/users_response_spec.rb
+++ b/spec/lib/gitlab/phabricator_import/conduit/users_response_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-describe Gitlab::PhabricatorImport::Conduit::UsersResponse do
+RSpec.describe Gitlab::PhabricatorImport::Conduit::UsersResponse do
   let(:conduit_response) do
     Gitlab::PhabricatorImport::Conduit::Response
       .new(Gitlab::Json.parse(fixture_file('phabricator_responses/user.search.json')))
diff --git a/spec/lib/gitlab/phabricator_import/importer_spec.rb b/spec/lib/gitlab/phabricator_import/importer_spec.rb
index 2715b785379..e78024c35c1 100644
--- a/spec/lib/gitlab/phabricator_import/importer_spec.rb
+++ b/spec/lib/gitlab/phabricator_import/importer_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::PhabricatorImport::Importer do
+RSpec.describe Gitlab::PhabricatorImport::Importer do
   it { expect(described_class).to be_async }
 
   it "acts like it's importing repositories" do
diff --git a/spec/lib/gitlab/phabricator_import/issues/importer_spec.rb b/spec/lib/gitlab/phabricator_import/issues/importer_spec.rb
index 02dafd4bb3b..63ba575aea3 100644
--- a/spec/lib/gitlab/phabricator_import/issues/importer_spec.rb
+++ b/spec/lib/gitlab/phabricator_import/issues/importer_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-describe Gitlab::PhabricatorImport::Issues::Importer do
+RSpec.describe Gitlab::PhabricatorImport::Issues::Importer do
   let(:project) { create(:project) }
 
   let(:response) do
diff --git a/spec/lib/gitlab/phabricator_import/issues/task_importer_spec.rb b/spec/lib/gitlab/phabricator_import/issues/task_importer_spec.rb
index 79f11d7fae6..3cb15f08627 100644
--- a/spec/lib/gitlab/phabricator_import/issues/task_importer_spec.rb
+++ b/spec/lib/gitlab/phabricator_import/issues/task_importer_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-describe Gitlab::PhabricatorImport::Issues::TaskImporter do
+RSpec.describe Gitlab::PhabricatorImport::Issues::TaskImporter do
   let_it_be(:project) { create(:project) }
   let(:task) do
     Gitlab::PhabricatorImport::Representation::Task.new(
diff --git a/spec/lib/gitlab/phabricator_import/project_creator_spec.rb b/spec/lib/gitlab/phabricator_import/project_creator_spec.rb
index 0b6a71290ed..016aa0abe4d 100644
--- a/spec/lib/gitlab/phabricator_import/project_creator_spec.rb
+++ b/spec/lib/gitlab/phabricator_import/project_creator_spec.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 require 'spec_helper'
 
-describe Gitlab::PhabricatorImport::ProjectCreator do
+RSpec.describe Gitlab::PhabricatorImport::ProjectCreator do
   let(:user) { create(:user) }
   let(:params) do
     { path: 'new-phab-import',
diff --git a/spec/lib/gitlab/phabricator_import/representation/task_spec.rb b/spec/lib/gitlab/phabricator_import/representation/task_spec.rb
index 5603a6961d6..25a52af3a7a 100644
--- a/spec/lib/gitlab/phabricator_import/representation/task_spec.rb
+++ b/spec/lib/gitlab/phabricator_import/representation/task_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::PhabricatorImport::Representation::Task do
+RSpec.describe Gitlab::PhabricatorImport::Representation::Task do
   subject(:task) do
     described_class.new(
       {
diff --git a/spec/lib/gitlab/phabricator_import/representation/user_spec.rb b/spec/lib/gitlab/phabricator_import/representation/user_spec.rb
index f52467a0cf1..f51be0f7d8d 100644
--- a/spec/lib/gitlab/phabricator_import/representation/user_spec.rb
+++ b/spec/lib/gitlab/phabricator_import/representation/user_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::PhabricatorImport::Representation::User do
+RSpec.describe Gitlab::PhabricatorImport::Representation::User do
   subject(:user) do
     described_class.new(
       {
diff --git a/spec/lib/gitlab/phabricator_import/user_finder_spec.rb b/spec/lib/gitlab/phabricator_import/user_finder_spec.rb
index f260e38b7c8..e63ad6e6626 100644
--- a/spec/lib/gitlab/phabricator_import/user_finder_spec.rb
+++ b/spec/lib/gitlab/phabricator_import/user_finder_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::PhabricatorImport::UserFinder, :clean_gitlab_redis_cache do
+RSpec.describe Gitlab::PhabricatorImport::UserFinder, :clean_gitlab_redis_cache do
   let(:project) { create(:project, namespace: create(:group)) }
 
   subject(:finder) { described_class.new(project, %w[first-phid second-phid]) }
diff --git a/spec/lib/gitlab/phabricator_import/worker_state_spec.rb b/spec/lib/gitlab/phabricator_import/worker_state_spec.rb
index 51514dd0ffd..4a07e28440f 100644
--- a/spec/lib/gitlab/phabricator_import/worker_state_spec.rb
+++ b/spec/lib/gitlab/phabricator_import/worker_state_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Gitlab::PhabricatorImport::WorkerState, :clean_gitlab_redis_shared_state do
+RSpec.describe Gitlab::PhabricatorImport::WorkerState, :clean_gitlab_redis_shared_state do
   subject(:state) { described_class.new('weird-project-id') }
 
   let(:key) { 'phabricator-import/jobs/project-weird-project-id/job-count' }