diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2019-05-03 10:41:32 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2019-05-03 10:41:32 +0000 |
commit | a7e24db6b33997cef44a6627844003ef0ba86aca (patch) | |
tree | 959e88e81c216a9aaf3b1cd64c347fa2b2993cf7 /spec/models/ci/variable_spec.rb | |
parent | 739c0ca11a62a966094feabe892e170b10a65d3c (diff) | |
parent | 84bce2d954f6b633dab6ee56fd3c04338dd55c9a (diff) | |
download | gitlab-ce-46806-env-table.tar.gz |
Merge branch '46806-typed-ci-variables' into '46806-env-table'46806-env-table
# Conflicts:
# app/views/ci/variables/_variable_row.html.haml
Diffstat (limited to 'spec/models/ci/variable_spec.rb')
-rw-r--r-- | spec/models/ci/variable_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/models/ci/variable_spec.rb b/spec/models/ci/variable_spec.rb index d2df6b3344e..a231c7eaed8 100644 --- a/spec/models/ci/variable_spec.rb +++ b/spec/models/ci/variable_spec.rb @@ -5,8 +5,9 @@ require 'spec_helper' describe Ci::Variable do subject { build(:ci_variable) } + it_behaves_like "CI variable" + describe 'validations' do - it { is_expected.to include_module(HasVariable) } it { is_expected.to include_module(Presentable) } it { is_expected.to include_module(Maskable) } it { is_expected.to validate_uniqueness_of(:key).scoped_to(:project_id, :environment_scope).with_message(/\(\w+\) has already been taken/) } |