diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
commit | 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch) | |
tree | 07e7870bca8aed6d61fdcc810731c50d2c40af47 /spec/models/concerns/loaded_in_group_list_spec.rb | |
parent | 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff) |
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'spec/models/concerns/loaded_in_group_list_spec.rb')
-rw-r--r-- | spec/models/concerns/loaded_in_group_list_spec.rb | 58 |
1 files changed, 38 insertions, 20 deletions
diff --git a/spec/models/concerns/loaded_in_group_list_spec.rb b/spec/models/concerns/loaded_in_group_list_spec.rb index c37943022ba..d38e842c666 100644 --- a/spec/models/concerns/loaded_in_group_list_spec.rb +++ b/spec/models/concerns/loaded_in_group_list_spec.rb @@ -3,49 +3,67 @@ require 'spec_helper' RSpec.describe LoadedInGroupList do - let(:parent) { create(:group) } + let_it_be(:parent) { create(:group) } + let_it_be(:group) { create(:group, parent: parent) } + let_it_be(:project) { create(:project, namespace: parent) } - subject(:found_group) { Group.with_selects_for_list.find_by(id: parent.id) } + let(:archived_parameter) { nil } - describe '.with_selects_for_list' do - it 'includes the preloaded counts for groups' do - create(:group, parent: parent) - create(:project, namespace: parent) - parent.add_developer(create(:user)) + before do + parent.add_developer(create(:user)) + end - found_group = Group.with_selects_for_list.find_by(id: parent.id) + subject(:found_group) { Group.with_selects_for_list(archived: archived_parameter).find_by(id: parent.id) } + describe '.with_selects_for_list' do + it 'includes the preloaded counts for groups' do expect(found_group.preloaded_project_count).to eq(1) expect(found_group.preloaded_subgroup_count).to eq(1) expect(found_group.preloaded_member_count).to eq(1) end + context 'with project namespaces' do + let_it_be(:group1) { create(:group, parent: parent) } + let_it_be(:group2) { create(:group, parent: parent) } + let_it_be(:project_namespace) { project.project_namespace } + + it 'does not include project_namespaces in the count of subgroups' do + expect(found_group.preloaded_subgroup_count).to eq(3) + expect(parent.subgroup_count).to eq(3) + end + end + context 'with archived projects' do - it 'counts including archived projects when `true` is passed' do - create(:project, namespace: parent, archived: true) - create(:project, namespace: parent) + let_it_be(:archived_project) { create(:project, namespace: parent, archived: true) } - found_group = Group.with_selects_for_list(archived: 'true').find_by(id: parent.id) + let(:archived_parameter) { true } + it 'counts including archived projects when `true` is passed' do expect(found_group.preloaded_project_count).to eq(2) end - it 'counts only archived projects when `only` is passed' do - create_list(:project, 2, namespace: parent, archived: true) - create(:project, namespace: parent) + context 'when not counting archived projects' do + let(:archived_parameter) { false } + + it 'counts projects without archived ones' do + expect(found_group.preloaded_project_count).to eq(1) + end + end + + context 'with archived only' do + let_it_be(:archived_project2) { create(:project, namespace: parent, archived: true) } - found_group = Group.with_selects_for_list(archived: 'only').find_by(id: parent.id) + let(:archived_parameter) { 'only' } - expect(found_group.preloaded_project_count).to eq(2) + it 'counts only archived projects when `only` is passed' do + expect(found_group.preloaded_project_count).to eq(2) + end end end end describe '#children_count' do it 'counts groups and projects' do - create(:group, parent: parent) - create(:project, namespace: parent) - expect(found_group.children_count).to eq(2) end end |