diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 04:45:44 +0300 |
commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /spec/lib/gitlab/log_timestamp_formatter_spec.rb | |
parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'spec/lib/gitlab/log_timestamp_formatter_spec.rb')
-rw-r--r-- | spec/lib/gitlab/log_timestamp_formatter_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/gitlab/log_timestamp_formatter_spec.rb b/spec/lib/gitlab/log_timestamp_formatter_spec.rb index e06baa2324f..b51d0fec15e 100644 --- a/spec/lib/gitlab/log_timestamp_formatter_spec.rb +++ b/spec/lib/gitlab/log_timestamp_formatter_spec.rb @@ -8,7 +8,7 @@ RSpec.describe Gitlab::LogTimestampFormatter do let(:formatted_timestamp) { Time.now.utc.iso8601(3) } it 'logs the timestamp in UTC and ISO8601.3 format' do - Timecop.freeze(Time.now) do + freeze_time do expect(subject.call('', Time.now, '', '')).to include formatted_timestamp end end |