Merge branch '22057-fix-api-ossues-sorting-flaky-specs' into 'master'

Ensure specs on sorting of issues in API are deterministic on MySQL ## What does this MR do? Ensure a deterministic order of issues on the existing API issues specs ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? To avoid random failures as described on #22057 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - ~~[ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - ~~[ ] API support added~~ - Tests - ~~[ ] Added for this feature/bug~~ - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22057 See merge request !6306

Merge branch '22057-fix-api-ossues-sorting-flaky-specs' into 'master'
6b88cc64 · Stan Hu · 0a250cf9 · b7814205 · 6b88cc64 · 6b88cc64
Commit 6b88cc64 authored Sep 13, 2016 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

CHANGELOG CHANGELOG +1 -0

issues.rb spec/factories/issues.rb +4 -0

issues_spec.rb spec/requests/api/issues_spec.rb +3 -0

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,6 +19,7 @@ v 8.12.0 (unreleased)
  - Use Search::GlobalService.new in the `GET /projects/search/:query` endpoint
  - Fix pagination on user snippets page
  - Fix sorting of issues in API
+  - Ensure specs on sorting of issues in API are deterministic on MySQL
  - Escape search term before passing it to Regexp.new !6241 (winniehell)
  - Fix pinned sidebar behavior in smaller viewports !6169
  - Fix file permissions change when updating a file on the Gitlab UI !5979

--- a/spec/factories/issues.rb
+++ b/spec/factories/issues.rb
 FactoryGirl.define do
+  sequence :issue_created_at do |n|
+    4.hours.ago + ( 2 * n ).seconds
+  end
+
  factory :issue do
    title
    author

--- a/spec/requests/api/issues_spec.rb
+++ b/spec/requests/api/issues_spec.rb
@@ -18,6 +18,7 @@ describe API::API, api: true  do
           project: project,
           state: :closed,
           milestone: milestone,
+           created_at: generate(:issue_created_at),
           updated_at: 3.hours.ago
  end
  let!(:confidential_issue) do
@@ -26,6 +27,7 @@ describe API::API, api: true  do
           project: project,
           author: author,
           assignee: assignee,
+           created_at: generate(:issue_created_at),
           updated_at: 2.hours.ago
  end
  let!(:issue) do
@@ -34,6 +36,7 @@ describe API::API, api: true  do
           assignee: user,
           project: project,
           milestone: milestone,
+           created_at: generate(:issue_created_at),
           updated_at: 1.hour.ago
  end
  let!(:label) do