summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorMatija Čupić <matteeyah@gmail.com>2018-02-23 01:19:46 +0100
committerMatija Čupić <matteeyah@gmail.com>2018-02-23 01:19:46 +0100
commitf2695aa84b68cd905eff90c598e452cbf63d98ed (patch)
tree88fa3b334d594b22f51531edf922279ba41fba5f /spec/models
parentc7dac22e52ceb6f47492af0cc57ce3f16894b90f (diff)
downloadgitlab-ce-f2695aa84b68cd905eff90c598e452cbf63d98ed.tar.gz
Include CI Variable Key in its uniqueness validation error message43275-improve-variables-validation-message
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/ci/group_variable_spec.rb2
-rw-r--r--spec/models/ci/variable_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/ci/group_variable_spec.rb b/spec/models/ci/group_variable_spec.rb
index 145189e7469..1b10501701c 100644
--- a/spec/models/ci/group_variable_spec.rb
+++ b/spec/models/ci/group_variable_spec.rb
@@ -5,7 +5,7 @@ describe Ci::GroupVariable do
it { is_expected.to include_module(HasVariable) }
it { is_expected.to include_module(Presentable) }
- it { is_expected.to validate_uniqueness_of(:key).scoped_to(:group_id) }
+ it { is_expected.to validate_uniqueness_of(:key).scoped_to(:group_id).with_message(/\(\w+\) has already been taken/) }
describe '.unprotected' do
subject { described_class.unprotected }
diff --git a/spec/models/ci/variable_spec.rb b/spec/models/ci/variable_spec.rb
index e4ff551151e..875e8b2b682 100644
--- a/spec/models/ci/variable_spec.rb
+++ b/spec/models/ci/variable_spec.rb
@@ -6,7 +6,7 @@ describe Ci::Variable do
describe 'validations' do
it { is_expected.to include_module(HasVariable) }
it { is_expected.to include_module(Presentable) }
- it { is_expected.to validate_uniqueness_of(:key).scoped_to(:project_id, :environment_scope) }
+ it { is_expected.to validate_uniqueness_of(:key).scoped_to(:project_id, :environment_scope).with_message(/\(\w+\) has already been taken/) }
end
describe '.unprotected' do