diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-12-07 19:15:26 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-12-12 14:21:02 +0200 |
| commit | 161d7c02d4ff49d6d91b982faee61b5de00d2631 (patch) | |
| tree | 3200b76fb5f5252928c12997d9c1a47e0b04856b /spec/models/group_spec.rb | |
| parent | 3f768f9a14ad90bbd79d384e3c287db4feea3e35 (diff) | |
| download | gitlab-ce-161d7c02d4ff49d6d91b982faee61b5de00d2631.tar.gz | |
Modify namespace name and path validationdz-remove-namespaces-path-uniq
Currently namespace name and path have uniq validaiton which does not
allow us to use same group name/path inside different groups. This
commit changes validation in next way:
* Allow same namespace name with different parent_id
* Allow same namespace path. Uniq validation should be handled by routes table
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'spec/models/group_spec.rb')
| -rw-r--r-- | spec/models/group_spec.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb index 1613a586a2c..40f1cf92e00 100644 --- a/spec/models/group_spec.rb +++ b/spec/models/group_spec.rb @@ -50,9 +50,8 @@ describe Group, models: true do describe 'validations' do it { is_expected.to validate_presence_of :name } - it { is_expected.to validate_uniqueness_of(:name) } + it { is_expected.to validate_uniqueness_of(:name).scoped_to(:parent_id) } it { is_expected.to validate_presence_of :path } - it { is_expected.to validate_uniqueness_of(:path) } it { is_expected.not_to validate_presence_of :owner } end |