diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-24 18:09:03 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-24 18:09:03 +0000 |
| commit | c59765a50abd6a235220fd895f5de78038c243a8 (patch) | |
| tree | 6cacf61d1746e2d54149c028ecd3f187128cd7da /spec/lib/gitlab/import | |
| parent | 4c5468b40825debc2b7bbe08b975dedd2f7f1523 (diff) | |
| download | gitlab-ce-c59765a50abd6a235220fd895f5de78038c243a8.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/import')
| -rw-r--r-- | spec/lib/gitlab/import/database_helpers_spec.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/import/merge_request_creator_spec.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/import/merge_request_helpers_spec.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/import/metrics_spec.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/import/set_async_jid_spec.rb | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/spec/lib/gitlab/import/database_helpers_spec.rb b/spec/lib/gitlab/import/database_helpers_spec.rb index 3ac34455177..d56e05df5d7 100644 --- a/spec/lib/gitlab/import/database_helpers_spec.rb +++ b/spec/lib/gitlab/import/database_helpers_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Import::DatabaseHelpers do +RSpec.describe Gitlab::Import::DatabaseHelpers do let(:database_helper) do Class.new do include Gitlab::Import::DatabaseHelpers diff --git a/spec/lib/gitlab/import/merge_request_creator_spec.rb b/spec/lib/gitlab/import/merge_request_creator_spec.rb index 48a57f9b251..9aedca40f1b 100644 --- a/spec/lib/gitlab/import/merge_request_creator_spec.rb +++ b/spec/lib/gitlab/import/merge_request_creator_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Import::MergeRequestCreator do +RSpec.describe Gitlab::Import::MergeRequestCreator do let(:project) { create(:project, :repository) } subject { described_class.new(project) } diff --git a/spec/lib/gitlab/import/merge_request_helpers_spec.rb b/spec/lib/gitlab/import/merge_request_helpers_spec.rb index d81251c4a43..f858ab934bb 100644 --- a/spec/lib/gitlab/import/merge_request_helpers_spec.rb +++ b/spec/lib/gitlab/import/merge_request_helpers_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Import::MergeRequestHelpers, type: :helper do +RSpec.describe Gitlab::Import::MergeRequestHelpers, type: :helper do let_it_be(:project) { create(:project, :repository) } let_it_be(:user) { create(:user) } diff --git a/spec/lib/gitlab/import/metrics_spec.rb b/spec/lib/gitlab/import/metrics_spec.rb index 89ea4db5c6e..0a912427014 100644 --- a/spec/lib/gitlab/import/metrics_spec.rb +++ b/spec/lib/gitlab/import/metrics_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::Import::Metrics do +RSpec.describe Gitlab::Import::Metrics do let(:importer) { :test_importer } let(:project) { create(:project) } let(:histogram) { double(:histogram) } diff --git a/spec/lib/gitlab/import/set_async_jid_spec.rb b/spec/lib/gitlab/import/set_async_jid_spec.rb index d2933cfd371..6931a7a953d 100644 --- a/spec/lib/gitlab/import/set_async_jid_spec.rb +++ b/spec/lib/gitlab/import/set_async_jid_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -describe Gitlab::Import::SetAsyncJid do +RSpec.describe Gitlab::Import::SetAsyncJid do describe '.set_jid', :clean_gitlab_redis_shared_state do let(:project) { create(:project, :import_scheduled) } |