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/database_importers | |
parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'spec/lib/gitlab/database_importers')
5 files changed, 7 insertions, 7 deletions
diff --git a/spec/lib/gitlab/database_importers/common_metrics/importer_spec.rb b/spec/lib/gitlab/database_importers/common_metrics/importer_spec.rb index e6321d48e11..fdf16069381 100644 --- a/spec/lib/gitlab/database_importers/common_metrics/importer_spec.rb +++ b/spec/lib/gitlab/database_importers/common_metrics/importer_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::DatabaseImporters::CommonMetrics::Importer do +RSpec.describe Gitlab::DatabaseImporters::CommonMetrics::Importer do subject { described_class.new } context "does import common_metrics.yml" do diff --git a/spec/lib/gitlab/database_importers/common_metrics/prometheus_metric_spec.rb b/spec/lib/gitlab/database_importers/common_metrics/prometheus_metric_spec.rb index e4e8a85e7bc..67da59d6477 100644 --- a/spec/lib/gitlab/database_importers/common_metrics/prometheus_metric_spec.rb +++ b/spec/lib/gitlab/database_importers/common_metrics/prometheus_metric_spec.rb @@ -2,14 +2,14 @@ require 'spec_helper' -describe Gitlab::DatabaseImporters::CommonMetrics::PrometheusMetric do +RSpec.describe Gitlab::DatabaseImporters::CommonMetrics::PrometheusMetric do it 'group enum equals ::PrometheusMetric' do expect(described_class.groups).to eq(::PrometheusMetric.groups) end it '.group_titles equals ::PrometheusMetric' do - existing_group_titles = ::PrometheusMetricEnums.group_details.each_with_object({}) do |(key, value), memo| - memo[key] = value[:group_title] + existing_group_titles = ::PrometheusMetricEnums.group_details.transform_values do |value| + value[:group_title] end expect(Gitlab::DatabaseImporters::CommonMetrics::PrometheusMetricEnums.group_titles).to eq(existing_group_titles) end diff --git a/spec/lib/gitlab/database_importers/instance_administrators/create_group_spec.rb b/spec/lib/gitlab/database_importers/instance_administrators/create_group_spec.rb index 97f4a7eec75..a3661bbe49a 100644 --- a/spec/lib/gitlab/database_importers/instance_administrators/create_group_spec.rb +++ b/spec/lib/gitlab/database_importers/instance_administrators/create_group_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::DatabaseImporters::InstanceAdministrators::CreateGroup do +RSpec.describe Gitlab::DatabaseImporters::InstanceAdministrators::CreateGroup do describe '#execute' do let(:result) { subject.execute } diff --git a/spec/lib/gitlab/database_importers/self_monitoring/project/create_service_spec.rb b/spec/lib/gitlab/database_importers/self_monitoring/project/create_service_spec.rb index 923f620a81d..ca9f9ab915f 100644 --- a/spec/lib/gitlab/database_importers/self_monitoring/project/create_service_spec.rb +++ b/spec/lib/gitlab/database_importers/self_monitoring/project/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::DatabaseImporters::SelfMonitoring::Project::CreateService do +RSpec.describe Gitlab::DatabaseImporters::SelfMonitoring::Project::CreateService do describe '#execute' do let(:result) { subject.execute } diff --git a/spec/lib/gitlab/database_importers/self_monitoring/project/delete_service_spec.rb b/spec/lib/gitlab/database_importers/self_monitoring/project/delete_service_spec.rb index 89d816c0cf7..9d514bcc661 100644 --- a/spec/lib/gitlab/database_importers/self_monitoring/project/delete_service_spec.rb +++ b/spec/lib/gitlab/database_importers/self_monitoring/project/delete_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Gitlab::DatabaseImporters::SelfMonitoring::Project::DeleteService do +RSpec.describe Gitlab::DatabaseImporters::SelfMonitoring::Project::DeleteService do describe '#execute' do let!(:application_setting) { create(:application_setting) } let(:result) { subject.execute } |