Commit bd0d32bc authored by Douwe Maan's avatar Douwe Maan

Merge branch 'ac-fix-11236' into 'master'

Fix broken tests after CE-EE merge  for API::Namespaces GET /namespaces

Closes #11236

See merge request gitlab-org/gitlab-ee!11274
parents f600a548 3cfcd789
......@@ -20,10 +20,12 @@ describe API::Namespaces do
expect(group_kind_json_response.keys).to contain_exactly('id', 'kind', 'name', 'path', 'full_path',
'parent_id', 'members_count_with_descendants',
'plan', 'shared_runners_minutes_limit',
'avatar_url', 'web_url',
'extra_shared_runners_minutes_limit', 'billable_members_count')
expect(user_kind_json_response.keys).to contain_exactly('id', 'kind', 'name', 'path', 'full_path',
'parent_id', 'plan', 'shared_runners_minutes_limit',
'avatar_url', 'web_url',
'extra_shared_runners_minutes_limit', 'billable_members_count')
end
end
......@@ -38,7 +40,7 @@ describe API::Namespaces do
expect(owned_group_response.keys).to contain_exactly('id', 'kind', 'name', 'path', 'full_path',
'plan', 'parent_id', 'members_count_with_descendants',
'billable_members_count')
'avatar_url', 'web_url', 'billable_members_count')
end
it "returns correct attributes when user cannot admin group" do
......@@ -49,7 +51,7 @@ describe API::Namespaces do
guest_group_response = json_response.find { |resource| resource['id'] == group1.id }
expect(guest_group_response.keys).to contain_exactly('id', 'kind', 'name', 'path', 'full_path', 'parent_id',
'billable_members_count')
'avatar_url', 'web_url', 'billable_members_count')
end
end
......
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