diff options
| author | Phil Hughes <me@iamphill.com> | 2018-02-27 10:03:19 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-02-27 10:03:19 +0000 |
| commit | 27ca41ac3c9442312f440d78f70628d0ac6826ff (patch) | |
| tree | efde2a9ba11741c94edf288cdae18cd4379a5515 /spec/models | |
| parent | 9167989f3e9a8e5ee4c84600102e67d5799a9feb (diff) | |
| parent | a4885b8f37602c399efff028b0a733ef80fbe7ab (diff) | |
| download | gitlab-ce-refactor-commit-show.tar.gz | |
Merge branch 'master' into 'refactor-commit-show'refactor-commit-show
# Conflicts:
# config/webpack.config.js
Diffstat (limited to 'spec/models')
| -rw-r--r-- | spec/models/ci/group_variable_spec.rb | 2 | ||||
| -rw-r--r-- | spec/models/ci/variable_spec.rb | 2 |
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 |