diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-01-25 14:33:37 +0000 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2017-01-25 16:05:16 +0100 |
| commit | 431983f904f74e593de4591c48fa1ffe7f432408 (patch) | |
| tree | 843d308476a1e3a0db50a75975716c0362b2ed25 | |
| parent | 16f23de64a4def89be069eb0fa7c58fa31bc52b0 (diff) | |
| download | gitlab-ce-431983f904f74e593de4591c48fa1ffe7f432408.tar.gz | |
Merge branch 'fix/cycle-analytics-spec-failure' into 'master'
Fix spec failure due to timestamp ordering issue in mySQL
Closes #26622
See merge request !8778
| -rw-r--r-- | spec/requests/projects/cycle_analytics_events_spec.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/spec/requests/projects/cycle_analytics_events_spec.rb b/spec/requests/projects/cycle_analytics_events_spec.rb index 72978846e93..28b485e4b15 100644 --- a/spec/requests/projects/cycle_analytics_events_spec.rb +++ b/spec/requests/projects/cycle_analytics_events_spec.rb @@ -13,7 +13,12 @@ describe 'cycle analytics events' do allow_any_instance_of(Gitlab::ReferenceExtractor).to receive(:issues).and_return([issue]) - 3.times { create_cycle } + 3.times do |count| + Timecop.freeze(Time.now + count.days) do + create_cycle + end + end + deploy_master login_as(user) |