Refactor users and spec

ee/lib/ee/gitlab/scim/user.rb

@@ -11,13 +11,14 @@ module EE
           identity.user.name
         end
 
-        present_collection true, :email
         expose :email_user, as: :emails, using: '::EE::Gitlab::Scim::Emails'
 
         private
 
+        DEFAULT_SCHEMA = 'urn:ietf:params:scim:schemas:core:2.0:User'
+
         def schemas
-          ["urn:ietf:params:scim:schemas:core:2.0:User"]
+          [DEFAULT_SCHEMA]
         end
 
         def active

ee/lib/ee/gitlab/scim/users.rb

@@ -9,8 +9,7 @@ module EE
         expose :items_per_page, as: :itemsPerPage
         expose :start_index, as: :startIndex
 
-        present_collection true, :Resources
-        expose :resources, as: :Resources, using: ::EE::Gitlab::Scim::User
+        expose :resources, as: :Resources, using: ::EE::Gitlab::Scim::User #, if: ->(identity, _) { identity.present? }
 
         private
 
@@ -23,7 +22,7 @@ module EE
         end
 
         def total_results
-          1
+          resources.count
         end
 
         def items_per_page
@@ -35,9 +34,8 @@ module EE
         end
 
         # We only support a single resource at the moment
-        # Please update `total_results` to `resources.count` once this changes
         def resources
-          [object]
+          object.present? ? [object] : []
         end
       end
     end

ee/spec/lib/gitlab/scim/user_spec.rb

@@ -3,8 +3,8 @@
 require 'spec_helper'
 
 describe ::EE::Gitlab::Scim::User do
-  let(:user) { create(:user) }
-  let(:identity) { create(:group_saml_identity, user: user) }
+  let(:user) { build(:user) }
+  let(:identity) { build(:group_saml_identity, user: user) }
 
   let(:entity) do
     described_class.new(identity)