diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-01-25 14:33:37 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-01-25 14:33:37 +0000 |
| commit | f08d756eb3a2ac0f1452362105b4c68e78f21b2f (patch) | |
| tree | 0f0b726de1d9174815e8d50c245f77840031d92b | |
| parent | 4480bef182307c0b389e84685c8bf680105b18ee (diff) | |
| parent | 3263fd9a73d22ef7e7c02305ed9e0717a7f386d0 (diff) | |
| download | gitlab-ce-f08d756eb3a2ac0f1452362105b4c68e78f21b2f.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) |