From d17e131f68939d3c74891fb381fbbf9e908c23ab Mon Sep 17 00:00:00 2001 From: Jasper Maes Date: Sun, 8 Jul 2018 12:42:37 +0200 Subject: [PATCH] Rails5 mysql fix milliseconds problem in pull request importer spec --- changelogs/unreleased/rails5-mysql-fix-pr-importer-spec.yml | 5 +++++ .../github_import/importer/pull_requests_importer_spec.rb | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 changelogs/unreleased/rails5-mysql-fix-pr-importer-spec.yml diff --git a/changelogs/unreleased/rails5-mysql-fix-pr-importer-spec.yml b/changelogs/unreleased/rails5-mysql-fix-pr-importer-spec.yml new file mode 100644 index 00000000000..afd9865ee45 --- /dev/null +++ b/changelogs/unreleased/rails5-mysql-fix-pr-importer-spec.yml @@ -0,0 +1,5 @@ +--- +title: Rails5 mysql fix milliseconds problem in pull request importer spec +merge_request: 20475 +author: Jasper Maes +type: fixed 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 -- GitLab