diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2019-03-01 05:39:19 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-03-12 14:04:46 +0300 |
| commit | fc6cef05fe76fb3675818372ba334d1f719d87fc (patch) | |
| tree | 152833bd31f43d143aea96737dba126b9a5e6675 | |
| parent | 77f5a72bae78b0ae40f9881edf2d2d4786c432e5 (diff) | |
Merge branch 'rs-fix-time-based-broken-master' into 'master'
Freeze date in merge request status view spec
See merge request gitlab-org/gitlab-ce!25671
(cherry picked from commit c994484d17d6a6da929f6a52f1b64dc15c38835c)
a05aba61 Freeze date in merge request status view spec
| -rw-r--r-- | spec/views/projects/issues/_merge_requests_status.html.haml_spec.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/spec/views/projects/issues/_merge_requests_status.html.haml_spec.rb b/spec/views/projects/issues/_merge_requests_status.html.haml_spec.rb index 02c225292ce..9424795749d 100644 --- a/spec/views/projects/issues/_merge_requests_status.html.haml_spec.rb +++ b/spec/views/projects/issues/_merge_requests_status.html.haml_spec.rb @@ -2,6 +2,12 @@ require 'spec_helper' describe 'projects/issues/_merge_requests_status.html.haml' do + around do |ex| + Timecop.freeze(Date.new(2018, 7, 22)) do + ex.run + end + end + it 'shows date of status change in tooltip' do merge_request = create(:merge_request, created_at: 1.month.ago) |