diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-22 09:08:09 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-22 09:08:09 +0000 |
commit | 4a3ba3e5f261eb09e6b2b4fd44373e7a1c454a72 (patch) | |
tree | 1a94467252ebcc5575c7de6a3590360ce05b9967 /spec/models/members | |
parent | 707c0eca50cf9a5290806ce637be30f4c7288def (diff) | |
download | gitlab-ce-4a3ba3e5f261eb09e6b2b4fd44373e7a1c454a72.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models/members')
-rw-r--r-- | spec/models/members/project_member_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/members/project_member_spec.rb b/spec/models/members/project_member_spec.rb index 79c39b81196..98d8de48dfb 100644 --- a/spec/models/members/project_member_spec.rb +++ b/spec/models/members/project_member_spec.rb @@ -44,7 +44,7 @@ describe ProjectMember do let(:maintainer) { create(:project_member, project: project) } it "creates an expired event when left due to expiry" do - expired = create(:project_member, project: project, expires_at: Time.now - 6.days) + expired = create(:project_member, project: project, expires_at: Time.current - 6.days) expired.destroy expect(Event.recent.first.action).to eq(Event::EXPIRED) end |