From 45a5ed6d024a8066937885da1ce18446f5e02316 Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Mon, 3 Dec 2018 22:01:30 +0900 Subject: [PATCH] fix wording --- spec/models/ci/build_metadata_spec.rb | 2 +- spec/models/ci/build_trace_chunk_spec.rb | 2 +- spec/models/ci/job_artifact_spec.rb | 2 +- spec/models/ci/pipeline_spec.rb | 2 +- spec/models/ci/runner_spec.rb | 2 +- spec/models/ci/stage_spec.rb | 2 +- spec/models/clusters/applications/ingress_spec.rb | 2 +- spec/models/clusters/cluster_spec.rb | 2 +- spec/models/clusters/platforms/kubernetes_spec.rb | 2 +- spec/models/commit_status_spec.rb | 2 +- spec/models/deployment_spec.rb | 2 +- spec/models/gpg_signature_spec.rb | 2 +- spec/models/internal_id_spec.rb | 2 +- spec/models/list_spec.rb | 2 +- spec/models/notification_setting_spec.rb | 2 +- spec/models/project_auto_devops_spec.rb | 2 +- spec/models/project_spec.rb | 2 +- spec/models/prometheus_metric_spec.rb | 2 +- spec/models/push_event_payload_spec.rb | 2 +- spec/models/resource_label_event_spec.rb | 2 +- spec/models/user_callout_spec.rb | 2 +- spec/models/user_spec.rb | 2 +- spec/support/active_record_enum.rb | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/spec/models/ci/build_metadata_spec.rb b/spec/models/ci/build_metadata_spec.rb index a50094c9d27..37227469fcc 100644 --- a/spec/models/ci/build_metadata_spec.rb +++ b/spec/models/ci/build_metadata_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Ci::BuildMetadata do - it_behaves_like 'Unique enum values' + it_behaves_like 'having unique enum values' set(:user) { create(:user) } set(:group) { create(:group, :access_requestable) } diff --git a/spec/models/ci/build_trace_chunk_spec.rb b/spec/models/ci/build_trace_chunk_spec.rb index 7cf932a835a..86a1f614eea 100644 --- a/spec/models/ci/build_trace_chunk_spec.rb +++ b/spec/models/ci/build_trace_chunk_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe Ci::BuildTraceChunk, :clean_gitlab_redis_shared_state do include ExclusiveLeaseHelpers - it_behaves_like 'Unique enum values' + it_behaves_like 'having unique enum values' set(:build) { create(:ci_build, :running) } let(:chunk_index) { 0 } diff --git a/spec/models/ci/job_artifact_spec.rb b/spec/models/ci/job_artifact_spec.rb index 097387767b6..a5ab577b9b1 100644 --- a/spec/models/ci/job_artifact_spec.rb +++ b/spec/models/ci/job_artifact_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Ci::JobArtifact do - it_behaves_like 'Unique enum values' + it_behaves_like 'having unique enum values' let(:artifact) { create(:ci_job_artifact, :archive) } diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb index cd19cde850a..ebde70776ad 100644 --- a/spec/models/ci/pipeline_spec.rb +++ b/spec/models/ci/pipeline_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Ci::Pipeline, :mailer do - it_behaves_like 'Unique enum values' + it_behaves_like 'having unique enum values' let(:user) { create(:user) } set(:project) { create(:project) } diff --git a/spec/models/ci/runner_spec.rb b/spec/models/ci/runner_spec.rb index db348ec5a33..ad79f8d4ce0 100644 --- a/spec/models/ci/runner_spec.rb +++ b/spec/models/ci/runner_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Ci::Runner do - it_behaves_like 'Unique enum values' + it_behaves_like 'having unique enum values' describe 'validation' do it { is_expected.to validate_presence_of(:access_level) } diff --git a/spec/models/ci/stage_spec.rb b/spec/models/ci/stage_spec.rb index 82388a19ce6..7559c533804 100644 --- a/spec/models/ci/stage_spec.rb +++ b/spec/models/ci/stage_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe Ci::Stage, :models do - it_behaves_like 'Unique enum values' + it_behaves_like 'having unique enum values' let(:stage) { create(:ci_stage_entity) } diff --git a/spec/models/clusters/applications/ingress_spec.rb b/spec/models/clusters/applications/ingress_spec.rb index a4927dff78b..0d13901133b 100644 --- a/spec/models/clusters/applications/ingress_spec.rb +++ b/spec/models/clusters/applications/ingress_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' describe Clusters::Applications::Ingress do - it_behaves_like 'Unique enum values' + it_behaves_like 'having unique enum values' let(:ingress) { create(:clusters_applications_ingress) } diff --git a/spec/models/clusters/cluster_spec.rb b/spec/models/clusters/cluster_spec.rb index e892ce7d7a0..7dcf97276b2 100644 --- a/spec/models/clusters/cluster_spec.rb +++ b/spec/models/clusters/cluster_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe Clusters::Cluster do - it_behaves_like 'Unique enum values' + it_behaves_like 'having unique enum values' it { is_expected.to belong_to(:user) } it { is_expected.to have_many(:cluster_projects) } diff --git a/spec/models/clusters/platforms/kubernetes_spec.rb b/spec/models/clusters/platforms/kubernetes_spec.rb index 43b1912f6d3..eab69a39946 100644 --- a/spec/models/clusters/platforms/kubernetes_spec.rb +++ b/spec/models/clusters/platforms/kubernetes_spec.rb @@ -4,7 +4,7 @@ describe Clusters::Platforms::Kubernetes, :use_clean_rails_memory_store_caching include KubernetesHelpers include ReactiveCachingHelpers - it_behaves_like 'Unique enum values' + it_behaves_like 'having unique enum values' it { is_expected.to belong_to(:cluster) } it { is_expected.to be_kind_of(Gitlab::Kubernetes) } diff --git a/spec/models/commit_status_spec.rb b/spec/models/commit_status_spec.rb index cc3292b813e..be339abee72 100644 --- a/spec/models/commit_status_spec.rb +++ b/spec/models/commit_status_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe CommitStatus do - it_behaves_like 'Unique enum values' + it_behaves_like 'having unique enum values' set(:project) { create(:project, :repository) } diff --git a/spec/models/deployment_spec.rb b/spec/models/deployment_spec.rb index ca33205af8e..a8d53cfcd7d 100644 --- a/spec/models/deployment_spec.rb +++ b/spec/models/deployment_spec.rb @@ -16,7 +16,7 @@ describe Deployment do it { is_expected.to validate_presence_of(:ref) } it { is_expected.to validate_presence_of(:sha) } - it_behaves_like 'Unique enum values' + it_behaves_like 'having unique enum values' describe '#scheduled_actions' do subject { deployment.scheduled_actions } diff --git a/spec/models/gpg_signature_spec.rb b/spec/models/gpg_signature_spec.rb index 0a490a33b37..69ca11971ff 100644 --- a/spec/models/gpg_signature_spec.rb +++ b/spec/models/gpg_signature_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' RSpec.describe GpgSignature do - it_behaves_like 'Unique enum values' + it_behaves_like 'having unique enum values' let(:commit_sha) { '0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33' } let!(:project) { create(:project, :repository, path: 'sample-project') } diff --git a/spec/models/internal_id_spec.rb b/spec/models/internal_id_spec.rb index 0ea0c5f17e4..1883069400f 100644 --- a/spec/models/internal_id_spec.rb +++ b/spec/models/internal_id_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe InternalId do - it_behaves_like 'Unique enum values' + it_behaves_like 'having unique enum values' let(:project) { create(:project) } let(:usage) { :issues } diff --git a/spec/models/list_spec.rb b/spec/models/list_spec.rb index 92c79b86078..a51580f8292 100644 --- a/spec/models/list_spec.rb +++ b/spec/models/list_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' describe List do - it_behaves_like 'Unique enum values' + it_behaves_like 'having unique enum values' describe 'relationships' do it { is_expected.to belong_to(:board) } diff --git a/spec/models/notification_setting_spec.rb b/spec/models/notification_setting_spec.rb index 407b42fc5ee..771d834c4bc 100644 --- a/spec/models/notification_setting_spec.rb +++ b/spec/models/notification_setting_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' RSpec.describe NotificationSetting do - it_behaves_like 'Unique enum values' + it_behaves_like 'having unique enum values' describe "Associations" do it { is_expected.to belong_to(:user) } diff --git a/spec/models/project_auto_devops_spec.rb b/spec/models/project_auto_devops_spec.rb index 306705e15a8..3d83e0a11fb 100644 --- a/spec/models/project_auto_devops_spec.rb +++ b/spec/models/project_auto_devops_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe ProjectAutoDevops do - it_behaves_like 'Unique enum values' + it_behaves_like 'having unique enum values' set(:project) { build(:project) } diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index c9579f22d2c..3f99fd12e38 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -4,7 +4,7 @@ describe Project do include ProjectForksHelper include GitHelpers - it_behaves_like 'Unique enum values' + it_behaves_like 'having unique enum values' describe 'associations' do it { is_expected.to belong_to(:group) } diff --git a/spec/models/prometheus_metric_spec.rb b/spec/models/prometheus_metric_spec.rb index f7d9edc8ca1..1737c498359 100644 --- a/spec/models/prometheus_metric_spec.rb +++ b/spec/models/prometheus_metric_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe PrometheusMetric do - it_behaves_like 'Unique enum values' + it_behaves_like 'having unique enum values' subject { build(:prometheus_metric) } let(:other_project) { build(:project) } diff --git a/spec/models/push_event_payload_spec.rb b/spec/models/push_event_payload_spec.rb index ec559517549..69a4922b6fd 100644 --- a/spec/models/push_event_payload_spec.rb +++ b/spec/models/push_event_payload_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' describe PushEventPayload do - it_behaves_like 'Unique enum values' + it_behaves_like 'having unique enum values' describe 'saving payloads' do it 'does not allow commit messages longer than 70 characters' do diff --git a/spec/models/resource_label_event_spec.rb b/spec/models/resource_label_event_spec.rb index 9523850cace..450a24d8445 100644 --- a/spec/models/resource_label_event_spec.rb +++ b/spec/models/resource_label_event_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' RSpec.describe ResourceLabelEvent, type: :model do - it_behaves_like 'Unique enum values' + it_behaves_like 'having unique enum values' subject { build(:resource_label_event, issue: issue) } let(:issue) { create(:issue) } diff --git a/spec/models/user_callout_spec.rb b/spec/models/user_callout_spec.rb index dd63aee2145..36443e37c95 100644 --- a/spec/models/user_callout_spec.rb +++ b/spec/models/user_callout_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' describe UserCallout do - it_behaves_like 'Unique enum values' + it_behaves_like 'having unique enum values' let!(:callout) { create(:user_callout) } diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index cbde085006d..e5490e0a156 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -4,7 +4,7 @@ describe User do include ProjectForksHelper include TermsHelper - it_behaves_like 'Unique enum values' + it_behaves_like 'having unique enum values' describe 'modules' do subject { described_class } diff --git a/spec/support/active_record_enum.rb b/spec/support/active_record_enum.rb index 8c3cc8d1804..fb1189c7f17 100644 --- a/spec/support/active_record_enum.rb +++ b/spec/support/active_record_enum.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -shared_examples 'Unique enum values' do +shared_examples 'having unique enum values' do described_class.defined_enums.each do |name, enum| it "has unique values in #{name.inspect}" do duplicated = enum.group_by(&:last).select { |key, value| value.size > 1 }