diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 15:26:25 +0300 |
commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /spec/lib/gitlab/phabricator_import/conduit | |
parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'spec/lib/gitlab/phabricator_import/conduit')
6 files changed, 7 insertions, 7 deletions
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'))) |