diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-27 12:51:49 +0300 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-27 12:51:49 +0300 |
commit | 1e04603f9322125ae0d725e1bca6da76a1337729 (patch) | |
tree | 1890de8cfcddce7bc35437da644244557f9d16a3 /spec | |
parent | 214e601a9f01b5ee525f0f3d3396ab6ff4961b07 (diff) | |
parent | f2695aa84b68cd905eff90c598e452cbf63d98ed (diff) |
Merge branch '43275-improve-variables-validation-message' into 'master'
Resolve "Improve Variables validation message"
Closes #43275
See merge request gitlab-org/gitlab-ce!17135
Diffstat (limited to 'spec')
-rw-r--r-- | spec/models/ci/group_variable_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/ci/variable_spec.rb | 2 | ||||
-rw-r--r-- | spec/support/features/variable_list_shared_examples.rb | 2 |
3 files changed, 4 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 diff --git a/spec/support/features/variable_list_shared_examples.rb b/spec/support/features/variable_list_shared_examples.rb index 0d8f7a7aae6..f7f851eb1eb 100644 --- a/spec/support/features/variable_list_shared_examples.rb +++ b/spec/support/features/variable_list_shared_examples.rb @@ -261,6 +261,8 @@ shared_examples 'variable list' do click_button('Save variables') wait_for_requests + expect(all('.js-ci-variable-list-section .js-ci-variable-error-box ul li').count).to eq(1) + # We check the first row because it re-sorts to alphabetical order on refresh page.within('.js-ci-variable-list-section') do expect(find('.js-ci-variable-error-box')).to have_content(/Validation failed Variables have duplicate values \(.+\)/) |