diff options
| author | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-07-08 12:42:37 +0200 |
|---|---|---|
| committer | Jasper Maes <jaspermaes.jm@gmail.com> | 2018-07-08 13:01:20 +0200 |
| commit | d17e131f68939d3c74891fb381fbbf9e908c23ab (patch) | |
| tree | fd7dd229ded5ed08925f327204b75a470052c6e6 | |
| parent | 96eb6fd33b5dfc4910d8bd93e697d6b6eb70b991 (diff) | |
| download | gitlab-ce-d17e131f68939d3c74891fb381fbbf9e908c23ab.tar.gz | |
Rails5 mysql fix milliseconds problem in pull request importer spec
| -rw-r--r-- | changelogs/unreleased/rails5-mysql-fix-pr-importer-spec.yml | 5 | ||||
| -rw-r--r-- | spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb | 6 |
2 files changed, 8 insertions, 3 deletions
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 |