Commit 28c44004 authored by Bob Van Landuyt's avatar Bob Van Landuyt
Browse files

Add pagination for children

parent 8f75faf5af6c
......@@ -46,7 +46,6 @@ def create
def show
@children = GroupChildrenFinder.new(current_user, parent_group: @group, params: params).execute
@children = @children.page(params[:page])
respond_to do |format|
......@@ -71,6 +70,7 @@ def children
end
@children = GroupChildrenFinder.new(current_user, parent_group: parent, params: params).execute
@children = @children.page(params[:page])
respond_to do |format|
format.json do
......
......@@ -466,6 +466,24 @@
end
end
end
context 'pagination' do
let!(:other_subgroup) { create(:group, :public, parent: group) }
let!(:project) { create(:project, :public, namespace: group) }
let!(:first_page_subgroups) { create_list(:group, Kaminari.config.default_per_page, parent: group) }
it 'contains all subgroups' do
get :children, id: group.to_param, sort: 'id', format: :json
expect(assigns(:children)).to contain_exactly(*first_page_subgroups)
end
it 'contains the project and group on the second page' do
get :children, id: group.to_param, sort: 'id', page: 2, format: :json
expect(assigns(:children)).to contain_exactly(other_subgroup, project)
end
end
end
context 'for a POST request' do
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment