diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /spec/models/remote_mirror_spec.rb | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'spec/models/remote_mirror_spec.rb')
-rw-r--r-- | spec/models/remote_mirror_spec.rb | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/spec/models/remote_mirror_spec.rb b/spec/models/remote_mirror_spec.rb index a87cdcf9344..6d163a16e63 100644 --- a/spec/models/remote_mirror_spec.rb +++ b/spec/models/remote_mirror_spec.rb @@ -306,7 +306,7 @@ describe RemoteMirror, :mailer do context 'when it did not update in the last minute' do it 'schedules a RepositoryUpdateRemoteMirrorWorker to run now' do - expect(RepositoryUpdateRemoteMirrorWorker).to receive(:perform_async).with(remote_mirror.id, Time.now) + expect(RepositoryUpdateRemoteMirrorWorker).to receive(:perform_async).with(remote_mirror.id, Time.current) remote_mirror.sync end @@ -314,9 +314,9 @@ describe RemoteMirror, :mailer do context 'when it did update in the last minute' do it 'schedules a RepositoryUpdateRemoteMirrorWorker to run in the next minute' do - remote_mirror.last_update_started_at = Time.now - 30.seconds + remote_mirror.last_update_started_at = Time.current - 30.seconds - expect(RepositoryUpdateRemoteMirrorWorker).to receive(:perform_in).with(RemoteMirror::PROTECTED_BACKOFF_DELAY, remote_mirror.id, Time.now) + expect(RepositoryUpdateRemoteMirrorWorker).to receive(:perform_in).with(RemoteMirror::PROTECTED_BACKOFF_DELAY, remote_mirror.id, Time.current) remote_mirror.sync end @@ -330,7 +330,7 @@ describe RemoteMirror, :mailer do context 'when it did not update in the last 5 minutes' do it 'schedules a RepositoryUpdateRemoteMirrorWorker to run now' do - expect(RepositoryUpdateRemoteMirrorWorker).to receive(:perform_async).with(remote_mirror.id, Time.now) + expect(RepositoryUpdateRemoteMirrorWorker).to receive(:perform_async).with(remote_mirror.id, Time.current) remote_mirror.sync end @@ -338,9 +338,9 @@ describe RemoteMirror, :mailer do context 'when it did update within the last 5 minutes' do it 'schedules a RepositoryUpdateRemoteMirrorWorker to run in the next 5 minutes' do - remote_mirror.last_update_started_at = Time.now - 30.seconds + remote_mirror.last_update_started_at = Time.current - 30.seconds - expect(RepositoryUpdateRemoteMirrorWorker).to receive(:perform_in).with(RemoteMirror::UNPROTECTED_BACKOFF_DELAY, remote_mirror.id, Time.now) + expect(RepositoryUpdateRemoteMirrorWorker).to receive(:perform_in).with(RemoteMirror::UNPROTECTED_BACKOFF_DELAY, remote_mirror.id, Time.current) remote_mirror.sync end @@ -377,9 +377,9 @@ describe RemoteMirror, :mailer do let(:remote_mirror) { create(:project, :repository, :remote_mirror).remote_mirrors.first } it 'resets all the columns when URL changes' do - remote_mirror.update(last_error: Time.now, - last_update_at: Time.now, - last_successful_update_at: Time.now, + remote_mirror.update(last_error: Time.current, + last_update_at: Time.current, + last_successful_update_at: Time.current, update_status: 'started', error_notification_sent: true) @@ -394,14 +394,14 @@ describe RemoteMirror, :mailer do describe '#updated_since?' do let(:remote_mirror) { create(:project, :repository, :remote_mirror).remote_mirrors.first } - let(:timestamp) { Time.now - 5.minutes } + let(:timestamp) { Time.current - 5.minutes } around do |example| Timecop.freeze { example.run } end before do - remote_mirror.update(last_update_started_at: Time.now) + remote_mirror.update(last_update_started_at: Time.current) end context 'when remote mirror does not have status failed' do @@ -410,7 +410,7 @@ describe RemoteMirror, :mailer do end it 'returns false when last update started before the timestamp' do - expect(remote_mirror.updated_since?(Time.now + 5.minutes)).to be false + expect(remote_mirror.updated_since?(Time.current + 5.minutes)).to be false end end |