diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2019-03-01 02:39:19 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2019-03-01 02:39:19 +0000 |
| commit | c994484d17d6a6da929f6a52f1b64dc15c38835c (patch) | |
| tree | 58baeb2c96d61deccb8902c2b7e0404ce05f9ff7 | |
| parent | 6afc474cacde59a4568a260f97a18e72d5879cb4 (diff) | |
| parent | a05aba61c71d82117d4dfbf60430c0e4313b468b (diff) | |
| download | gitlab-ce-c994484d17d6a6da929f6a52f1b64dc15c38835c.tar.gz | |
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
| -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) |