diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2019-07-26 14:57:12 +0000 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2019-07-26 14:57:12 +0000 |
commit | bd1a5a9f422df267725bd5fbd254f3c1f16fd596 (patch) | |
tree | c32866892bab7a9aeb2def1d76dafd4a17bcb521 /spec/finders/labels_finder_spec.rb | |
parent | 900ef6fc316c7d4024545b5d08598c61fa9f3936 (diff) | |
parent | 1ce5bcacdbf56682e05fa63875203bf4d10584bc (diff) | |
download | gitlab-ce-bd1a5a9f422df267725bd5fbd254f3c1f16fd596.tar.gz |
Merge branch 'remove-nested-groups-checks' into 'master'
Remove code related to object hierarchy and MySQL
Closes #65056 and #65055
See merge request gitlab-org/gitlab-ce!31095
Diffstat (limited to 'spec/finders/labels_finder_spec.rb')
-rw-r--r-- | spec/finders/labels_finder_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/finders/labels_finder_spec.rb b/spec/finders/labels_finder_spec.rb index 98b4933fef6..ba41ded112a 100644 --- a/spec/finders/labels_finder_spec.rb +++ b/spec/finders/labels_finder_spec.rb @@ -89,7 +89,7 @@ describe LabelsFinder do end end - context 'when including labels from group ancestors', :nested_groups do + context 'when including labels from group ancestors' do it 'returns labels from group and its ancestors' do private_group_1.add_developer(user) private_subgroup_1.add_developer(user) @@ -108,7 +108,7 @@ describe LabelsFinder do end end - context 'when including labels from group descendants', :nested_groups do + context 'when including labels from group descendants' do it 'returns labels from group and its descendants' do private_group_1.add_developer(user) private_subgroup_1.add_developer(user) @@ -128,7 +128,7 @@ describe LabelsFinder do end end - context 'filtering by project_id', :nested_groups do + context 'filtering by project_id' do context 'when include_ancestor_groups is true' do let!(:sub_project) { create(:project, namespace: private_subgroup_1 ) } let!(:project_label) { create(:label, project: sub_project, title: 'Label 5') } |