From a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 16 Jun 2021 18:25:58 +0000 Subject: Add latest changes from gitlab-org/gitlab@14-0-stable-ee --- .../namespaces/linear_traversal_examples.rb | 23 +++++++++++++ .../namespaces/traversal_examples.rb | 38 ++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 spec/support/shared_examples/namespaces/linear_traversal_examples.rb (limited to 'spec/support/shared_examples/namespaces') diff --git a/spec/support/shared_examples/namespaces/linear_traversal_examples.rb b/spec/support/shared_examples/namespaces/linear_traversal_examples.rb new file mode 100644 index 00000000000..2fd90c36953 --- /dev/null +++ b/spec/support/shared_examples/namespaces/linear_traversal_examples.rb @@ -0,0 +1,23 @@ +# frozen_string_literal: true + +# Traversal examples common to linear and recursive methods are in +# spec/support/shared_examples/namespaces/traversal_examples.rb + +RSpec.shared_examples 'linear namespace traversal' do + context 'when use_traversal_ids feature flag is enabled' do + before do + stub_feature_flags(use_traversal_ids: true) + end + + context 'scopes' do + describe '.as_ids' do + let_it_be(:namespace1) { create(:group) } + let_it_be(:namespace2) { create(:group) } + + subject { Namespace.where(id: [namespace1, namespace2]).as_ids.pluck(:id) } + + it { is_expected.to contain_exactly(namespace1.id, namespace2.id) } + end + end + end +end diff --git a/spec/support/shared_examples/namespaces/traversal_examples.rb b/spec/support/shared_examples/namespaces/traversal_examples.rb index 77a1705627e..ccc64c80fd4 100644 --- a/spec/support/shared_examples/namespaces/traversal_examples.rb +++ b/spec/support/shared_examples/namespaces/traversal_examples.rb @@ -17,6 +17,28 @@ RSpec.shared_examples 'namespace traversal' do end end + describe '#root_ancestor' do + let_it_be(:group) { create(:group) } + let_it_be(:nested_group) { create(:group, parent: group) } + let_it_be(:deep_nested_group) { create(:group, parent: nested_group) } + + it 'returns the correct root ancestor' do + expect(group.root_ancestor).to eq(group) + expect(nested_group.root_ancestor).to eq(group) + expect(deep_nested_group.root_ancestor).to eq(group) + end + + describe '#recursive_root_ancestor' do + let(:groups) { [group, nested_group, deep_nested_group] } + + it "is equivalent to #recursive_root_ancestor" do + groups.each do |group| + expect(group.root_ancestor).to eq(group.recursive_root_ancestor) + end + end + end + end + describe '#self_and_hierarchy' do let!(:group) { create(:group, path: 'git_lab') } let!(:nested_group) { create(:group, parent: group) } @@ -122,4 +144,20 @@ RSpec.shared_examples 'namespace traversal' do it_behaves_like 'recursive version', :self_and_descendants end end + + describe '#self_and_descendant_ids' do + let!(:group) { create(:group, path: 'git_lab') } + let!(:nested_group) { create(:group, parent: group) } + let!(:deep_nested_group) { create(:group, parent: nested_group) } + + subject { group.self_and_descendant_ids.pluck(:id) } + + it { is_expected.to contain_exactly(group.id, nested_group.id, deep_nested_group.id) } + + describe '#recursive_self_and_descendant_ids' do + let(:groups) { [group, nested_group, deep_nested_group] } + + it_behaves_like 'recursive version', :self_and_descendant_ids + end + end end -- cgit v1.2.3