Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42

1 files changed, 9 insertions, 1 deletions

diff --git a/spec/serializers/member_user_entity_spec.rb b/spec/serializers/member_user_entity_spec.rb
index b505571cbf2..0e6d4bcc3fb 100644
--- a/spec/serializers/member_user_entity_spec.rb
+++ b/spec/serializers/member_user_entity_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe MemberUserEntity do
-  let_it_be(:user) { create(:user) }
+  let_it_be(:user) { create(:user, last_activity_on: Date.today) }
   let_it_be(:emoji) { 'slight_smile' }
   let_it_be(:user_status) { create(:user_status, user: user, emoji: emoji) }
 
@@ -36,4 +36,12 @@ RSpec.describe MemberUserEntity do
   it 'correctly exposes `status.emoji`' do
     expect(entity_hash[:status][:emoji]).to match(emoji)
   end
+
+  it 'correctly exposes `created_at`' do
+    expect(entity_hash[:created_at]).to be(user.created_at)
+  end
+
+  it 'correctly exposes `last_activity_on`' do
+    expect(entity_hash[:last_activity_on]).to be(user.last_activity_on)
+  end
 end