Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@vanlanduyt.co>2017-10-05 00:04:47 +0300
committerBob Van Landuyt <bob@vanlanduyt.co>2017-10-05 12:10:57 +0300
commitec8a7a36c09f44c44a21444f632389e7d08166cf (patch)
tree38c37bde375339d0e9dccd6e26769d327db39989 /spec/controllers/concerns
parentdda023d66d09b8a3a43a5599bde42ac52eb6fd06 (diff)
Make sure all ancestors are loaded when searching groups
Diffstat (limited to 'spec/controllers/concerns')
-rw-r--r--spec/controllers/concerns/group_tree_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/concerns/group_tree_spec.rb b/spec/controllers/concerns/group_tree_spec.rb
index 5d4fb66b492..2fe041a5ecc 100644
--- a/spec/controllers/concerns/group_tree_spec.rb
+++ b/spec/controllers/concerns/group_tree_spec.rb
@@ -45,12 +45,12 @@ describe GroupTree do
expect(assigns(:groups)).to contain_exactly(subgroup)
end
- it 'allows filtering for subgroups' do
+ it 'allows filtering for subgroups and includes the parents for rendering' do
subgroup = create(:group, :public, parent: group, name: 'filter')
get :index, filter: 'filt', format: :json
- expect(assigns(:groups)).to contain_exactly(subgroup)
+ expect(assigns(:groups)).to contain_exactly(group, subgroup)
end
end