summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorJasper Maes <jaspermaes.jm@gmail.com>2018-07-08 12:42:37 +0200
committerJasper Maes <jaspermaes.jm@gmail.com>2018-07-08 13:01:20 +0200
commitd17e131f68939d3c74891fb381fbbf9e908c23ab (patch)
treefd7dd229ded5ed08925f327204b75a470052c6e6 /spec
parent96eb6fd33b5dfc4910d8bd93e697d6b6eb70b991 (diff)
downloadgitlab-ce-d17e131f68939d3c74891fb381fbbf9e908c23ab.tar.gz
Rails5 mysql fix milliseconds problem in pull request importer spec
Diffstat (limited to 'spec')
-rw-r--r--spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb b/spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb
index 51fad6c6838..b2e544e6fed 100644
--- a/spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb
+++ b/spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb
@@ -27,9 +27,9 @@ describe Gitlab::GithubImport::Importer::PullRequestsImporter do
milestone: double(:milestone, number: 4),
user: double(:user, id: 4, login: 'alice'),
assignee: double(:user, id: 4, login: 'alice'),
- created_at: Time.zone.now,
- updated_at: Time.zone.now,
- merged_at: Time.zone.now
+ created_at: 1.second.ago,
+ updated_at: 1.second.ago,
+ merged_at: 1.second.ago
)
end