Merge branch '38060-fix-groups-api-owned-groups' into 'master'

Fix the groups API endpoint to handle ?owned=true correctly

Closes #38060

See merge request gitlab-org/gitlab-ce!14362

2 files changed, 4 insertions, 1 deletions

diff --git a/app/finders/groups_finder.rb b/app/finders/groups_finder.rb
index 88d71b0a87b..0c4c4b10fb6 100644
--- a/app/finders/groups_finder.rb
+++ b/app/finders/groups_finder.rb
@@ -57,7 +57,7 @@ class GroupsFinder < UnionFinder
   end
 
   def owned_groups
-    current_user&.groups || Group.none
+    current_user&.owned_groups || Group.none
   end
 
   def include_public_groups?
diff --git a/spec/requests/api/groups_spec.rb b/spec/requests/api/groups_spec.rb
index 42f0079e173..1671a046fdf 100644
--- a/spec/requests/api/groups_spec.rb
+++ b/spec/requests/api/groups_spec.rb
@@ -159,11 +159,14 @@ describe API::Groups do
 
     context 'when using owned in the request' do
       it 'returns an array of groups the user owns' do
+        group1.add_master(user2)
+
         get api('/groups', user2), owned: true
 
         expect(response).to have_http_status(200)
         expect(response).to include_pagination_headers
         expect(json_response).to be_an Array
+        expect(json_response.length).to eq(1)
         expect(json_response.first['name']).to eq(group2.name)
       end
     end