Skip to content
Snippets Groups Projects
Commit 1ce5bcac authored by Heinrich Lee Yu's avatar Heinrich Lee Yu :basketball:
Browse files

Remove code related to object hierarchy in MySQL

These are not required because MySQL is not
supported anymore
parent ba997f3c
No related branches found
No related tags found
No related merge requests found
Showing
with 37 additions and 37 deletions
Loading
Loading
@@ -58,7 +58,7 @@ describe 'Project > Members > Invite group', :js do
end
end
 
context 'for a project in a subgroup', :nested_groups do
context 'for a project in a subgroup' do
let!(:group_to_share_with) { create(:group) }
let(:root_group) { create(:group) }
let(:subgroup) { create(:group, parent: root_group) }
Loading
Loading
@@ -181,7 +181,7 @@ describe 'Project > Members > Invite group', :js do
group_to_share_with.add_maintainer(maintainer)
end
 
it 'the groups dropdown does not show ancestors', :nested_groups do
it 'the groups dropdown does not show ancestors' do
visit project_settings_members_path(project)
 
click_on 'invite-group-tab'
Loading
Loading
Loading
Loading
@@ -294,7 +294,7 @@ describe 'New project' do
end
end
 
context 'from manifest file', :postgresql do
context 'from manifest file' do
before do
first('.import_manifest').click
end
Loading
Loading
Loading
Loading
@@ -126,7 +126,7 @@ describe "Projects > Settings > Pipelines settings" do
end
end
 
context 'when auto devops is turned on group parent level', :nested_groups do
context 'when auto devops is turned on group parent level' do
before do
group = create(:group, parent: create(:group, :auto_devops_enabled))
project.update!(namespace: group)
Loading
Loading
Loading
Loading
@@ -68,7 +68,7 @@ describe 'Projects > Settings > User transfers a project', :js do
end
end
 
context 'when nested groups are available', :nested_groups do
context 'when nested groups are available' do
it 'allows transferring a project to a subgroup' do
subgroup = create(:group, parent: group)
 
Loading
Loading
require 'spec_helper'
 
describe 'Subgroup Issuables', :js, :nested_groups do
describe 'Subgroup Issuables', :js do
let!(:group) { create(:group, name: 'group') }
let!(:subgroup) { create(:group, parent: group, name: 'subgroup') }
let!(:project) { create(:project, namespace: subgroup, name: 'project') }
Loading
Loading
Loading
Loading
@@ -26,7 +26,7 @@ describe 'User creates a project', :js do
expect(page).to have_content(project.url_to_repo)
end
 
context 'in a subgroup they do not own', :nested_groups do
context 'in a subgroup they do not own' do
let(:parent) { create(:group) }
let!(:subgroup) { create(:group, parent: parent) }
 
Loading
Loading
Loading
Loading
@@ -314,7 +314,7 @@ describe 'Project' do
end
end
 
context 'for subgroups', :js, :nested_groups do
context 'for subgroups', :js do
let(:group) { create(:group) }
let(:subgroup) { create(:group, parent: group) }
let(:project) { create(:project, :repository, group: subgroup) }
Loading
Loading
Loading
Loading
@@ -50,7 +50,7 @@ describe Autocomplete::UsersFinder do
it { is_expected.to match_array([user1]) }
end
 
context 'when passed a subgroup', :nested_groups do
context 'when passed a subgroup' do
let(:grandparent) { create(:group, :public) }
let(:parent) { create(:group, :public, parent: grandparent) }
let(:child) { create(:group, :public, parent: parent) }
Loading
Loading
Loading
Loading
@@ -32,7 +32,7 @@ describe ClusterAncestorsFinder, '#execute' do
is_expected.to eq([project_cluster, group_cluster, instance_cluster])
end
 
context 'nested groups', :nested_groups do
context 'nested groups' do
let(:group) { create(:group, parent: parent_group) }
let(:parent_group) { create(:group) }
 
Loading
Loading
@@ -65,7 +65,7 @@ describe ClusterAncestorsFinder, '#execute' do
is_expected.to eq([group_cluster, instance_cluster])
end
 
context 'nested groups', :nested_groups do
context 'nested groups' do
let(:group) { create(:group, parent: parent_group) }
let(:parent_group) { create(:group) }
 
Loading
Loading
Loading
Loading
@@ -19,7 +19,7 @@ describe GroupDescendantsFinder do
expect(finder.has_children?).to be_truthy
end
 
context 'when there are subgroups', :nested_groups do
context 'when there are subgroups' do
it 'is true when there are projects' do
create(:group, parent: group)
 
Loading
Loading
@@ -99,7 +99,7 @@ describe GroupDescendantsFinder do
)
end
 
context 'with nested groups', :nested_groups do
context 'with nested groups' do
let!(:subgroup1) { create(:group, parent: group, name: 'a', path: 'sub-a') }
let!(:subgroup2) { create(:group, parent: group, name: 'z', path: 'sub-z') }
 
Loading
Loading
@@ -126,7 +126,7 @@ describe GroupDescendantsFinder do
end
end
 
context 'with nested groups', :nested_groups do
context 'with nested groups' do
let!(:project) { create(:project, namespace: group) }
let!(:subgroup) { create(:group, :private, parent: group) }
 
Loading
Loading
Loading
Loading
@@ -18,7 +18,7 @@ describe GroupMembersFinder, '#execute' do
expect(result.to_a).to match_array([member3, member2, member1])
end
 
it 'returns members for nested group', :nested_groups do
it 'returns members for nested group' do
group.add_developer(user2)
nested_group.request_access(user4)
member1 = group.add_maintainer(user1)
Loading
Loading
@@ -30,7 +30,7 @@ describe GroupMembersFinder, '#execute' do
expect(result.to_a).to match_array([member1, member3, member4])
end
 
it 'returns members for descendant groups if requested', :nested_groups do
it 'returns members for descendant groups if requested' do
member1 = group.add_maintainer(user2)
member2 = group.add_maintainer(user1)
nested_group.add_maintainer(user2)
Loading
Loading
Loading
Loading
@@ -19,7 +19,7 @@ describe GroupProjectsFinder do
context "only owned" do
let(:options) { { only_owned: true } }
 
context 'with subgroups projects', :nested_groups do
context 'with subgroups projects' do
before do
options[:include_subgroups] = true
end
Loading
Loading
@@ -33,7 +33,7 @@ describe GroupProjectsFinder do
end
 
context "all" do
context 'with subgroups projects', :nested_groups do
context 'with subgroups projects' do
before do
options[:include_subgroups] = true
end
Loading
Loading
@@ -78,7 +78,7 @@ describe GroupProjectsFinder do
subgroup_private_project.add_maintainer(current_user)
end
 
context 'with subgroups projects', :nested_groups do
context 'with subgroups projects' do
before do
options[:include_subgroups] = true
end
Loading
Loading
@@ -96,7 +96,7 @@ describe GroupProjectsFinder do
current_user.update(external: true)
end
 
context 'with subgroups projects', :nested_groups do
context 'with subgroups projects' do
before do
options[:include_subgroups] = true
end
Loading
Loading
@@ -111,7 +111,7 @@ describe GroupProjectsFinder do
end
 
context "all" do
context 'with subgroups projects', :nested_groups do
context 'with subgroups projects' do
before do
options[:include_subgroups] = true
end
Loading
Loading
@@ -153,7 +153,7 @@ describe GroupProjectsFinder do
context "only owned" do
let(:options) { { only_owned: true } }
 
context 'with subgroups projects', :nested_groups do
context 'with subgroups projects' do
before do
options[:include_subgroups] = true
end
Loading
Loading
Loading
Loading
@@ -65,7 +65,7 @@ describe GroupsFinder do
end
end
 
context 'subgroups', :nested_groups do
context 'subgroups' do
let(:user) { create(:user) }
let!(:parent_group) { create(:group, :public) }
let!(:public_subgroup) { create(:group, :public, parent: parent_group) }
Loading
Loading
Loading
Loading
@@ -51,7 +51,7 @@ describe IssuesFinder do
end
end
 
context 'when include_subgroup param is true', :nested_groups do
context 'when include_subgroup param is true' do
before do
params[:include_subgroups] = true
end
Loading
Loading
Loading
Loading
@@ -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)
Loading
Loading
@@ -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)
Loading
Loading
@@ -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') }
Loading
Loading
Loading
Loading
@@ -9,7 +9,7 @@ describe MembersFinder, '#execute' do
set(:user3) { create(:user) }
set(:user4) { create(:user) }
 
it 'returns members for project and parent groups', :nested_groups do
it 'returns members for project and parent groups' do
nested_group.request_access(user1)
member1 = group.add_maintainer(user2)
member2 = nested_group.add_maintainer(user3)
Loading
Loading
@@ -20,7 +20,7 @@ describe MembersFinder, '#execute' do
expect(result.to_a).to match_array([member1, member2, member3])
end
 
it 'includes nested group members if asked', :nested_groups do
it 'includes nested group members if asked' do
project = create(:project, namespace: group)
nested_group.request_access(user1)
member1 = group.add_maintainer(user2)
Loading
Loading
@@ -32,7 +32,7 @@ describe MembersFinder, '#execute' do
expect(result.to_a).to match_array([member1, member2, member3])
end
 
context 'when include_invited_groups_members == true', :nested_groups do
context 'when include_invited_groups_members == true' do
subject { described_class.new(project, user2).execute(include_invited_groups_members: true) }
 
set(:linked_group) { create(:group, :public, :access_requestable) }
Loading
Loading
@@ -40,7 +40,7 @@ describe MembersFinder, '#execute' do
set(:linked_group_member) { linked_group.add_developer(user1) }
set(:nested_linked_group_member) { nested_linked_group.add_developer(user2) }
 
it 'includes all the invited_groups members including members inherited from ancestor groups', :nested_groups do
it 'includes all the invited_groups members including members inherited from ancestor groups' do
create(:project_group_link, project: project, group: nested_linked_group)
 
expect(subject).to contain_exactly(linked_group_member, nested_linked_group_member)
Loading
Loading
Loading
Loading
@@ -42,7 +42,7 @@ describe MergeRequestsFinder do
expect(merge_requests).to contain_exactly(merge_request1, merge_request2)
end
 
it 'filters by group including subgroups', :nested_groups do
it 'filters by group including subgroups' do
params = { group_id: group.id, include_subgroups: true }
 
merge_requests = described_class.new(user, params).execute
Loading
Loading
Loading
Loading
@@ -36,7 +36,7 @@ describe TodosFinder do
expect(todos).to match_array([todo1])
end
 
context 'with subgroups', :nested_groups do
context 'with subgroups' do
let(:subgroup) { create(:group, parent: group) }
let!(:todo3) { create(:todo, user: user, group: subgroup, target: issue) }
 
Loading
Loading
Loading
Loading
@@ -2,7 +2,7 @@
 
require 'spec_helper'
 
describe Resolvers::NamespaceProjectsResolver, :nested_groups do
describe Resolvers::NamespaceProjectsResolver do
include GraphqlHelpers
 
let(:current_user) { create(:user) }
Loading
Loading
Loading
Loading
@@ -118,7 +118,7 @@ describe AutoDevopsHelper do
it { is_expected.to eq('instance enabled') }
end
 
context 'with groups', :nested_groups do
context 'with groups' do
before do
receiver.update(parent: parent)
end
Loading
Loading
@@ -170,7 +170,7 @@ describe AutoDevopsHelper do
it { is_expected.to eq('instance enabled') }
end
 
context 'with groups', :nested_groups do
context 'with groups' do
let(:receiver) { create(:project, :repository, namespace: group) }
 
before do
Loading
Loading
@@ -203,7 +203,7 @@ describe AutoDevopsHelper do
it { is_expected.to be_nil }
end
 
context 'with groups', :nested_groups do
context 'with groups' do
let(:receiver) { create(:project, :repository, namespace: group) }
 
context 'when auto devops is disabled on group level' do
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment