Merge branch 'fix/transient-failing-analytics-spec' into 'master'

Fix transient failure on AnalyticsBuildEntity

AnalyticsBuildEntity uses `Time.now` to calculate durations, and on slow running builds could fail this spec. Mocking with `Timecop` should be sufficient to fix this.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/25500

See merge request !8082
This commit is contained in:
James Lopez 2016-12-15 08:55:04 +00:00
commit 74e3927425
1 changed files with 8 additions and 0 deletions

View File

@ -13,6 +13,14 @@ describe AnalyticsBuildEntity do
subject { entity.as_json }
before do
Timecop.freeze
end
after do
Timecop.return
end
it 'contains the URL' do
expect(subject).to include(:url)
end