Merge branch 'rd-ee-backport-add-support-for-gl-com-trials' into 'master'

Backport some changes made for this spec in EE

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

spec/requests/api/namespaces_spec.rb

@@ -23,10 +23,10 @@ describe API::Namespaces do
 
         expect(response).to have_gitlab_http_status(200)
         expect(response).to include_pagination_headers
-        expect(group_kind_json_response.keys).to contain_exactly('id', 'kind', 'name', 'path', 'full_path',
-                                                                 'parent_id', 'members_count_with_descendants')
+        expect(group_kind_json_response.keys).to include('id', 'kind', 'name', 'path', 'full_path',
+                                                         'parent_id', 'members_count_with_descendants')
 
-        expect(user_kind_json_response.keys).to contain_exactly('id', 'kind', 'name', 'path', 'full_path', 'parent_id')
+        expect(user_kind_json_response.keys).to include('id', 'kind', 'name', 'path', 'full_path', 'parent_id')
       end
 
       it "admin: returns an array of all namespaces" do
@@ -58,8 +58,8 @@ describe API::Namespaces do
 
         owned_group_response = json_response.find { |resource| resource['id'] == group1.id }
 
-        expect(owned_group_response.keys).to contain_exactly('id', 'kind', 'name', 'path', 'full_path',
-                                                             'parent_id', 'members_count_with_descendants')
+        expect(owned_group_response.keys).to include('id', 'kind', 'name', 'path', 'full_path',
+                                                     'parent_id', 'members_count_with_descendants')
       end
 
       it "returns correct attributes when user cannot admin group" do
@@ -69,7 +69,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')
+        expect(guest_group_response.keys).to include('id', 'kind', 'name', 'path', 'full_path', 'parent_id')
       end
 
       it "user: returns an array of namespaces" do