diff options
author | Robert Marshall <rmarshall@gitlab.com> | 2019-03-01 00:17:03 -0500 |
---|---|---|
committer | Robert Marshall <rmarshall@gitlab.com> | 2019-03-01 00:33:36 -0500 |
commit | 278c25dd38492b7d956b11fcee053e7c17709766 (patch) | |
tree | 67dfc0ee7835d9af6c42f1f11502ddb407190a1f | |
parent | e809f6dd9ba3420c0a7bcdaff4d9623c21ed1a55 (diff) | |
download | gitlab-ce-58374-merge-request-tooltip-fails-in-march.tar.gz |
Merge Status Tool Tip Fails in March58374-merge-request-tooltip-fails-in-march
- The pattern matcher in the merge status tooltip was not
using the proper syntax to match a wildcard.
- The test fails in the month of March. One month ago from
March 1 is Feb 1. Rails DateTime thinks 1 month is 30 days.
28 days != 1 month. Fixed to use 14 days so it always works.
Resolves gitlab-org/gitlab-ce#58374
Signed-off-by: Robert Marshall <rmarshall@gitlab.com>
-rw-r--r-- | spec/views/projects/issues/_merge_requests_status.html.haml_spec.rb | 4 |
1 files changed, 2 insertions, 2 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..a3a584ca47e 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 @@ -3,12 +3,12 @@ require 'spec_helper' describe 'projects/issues/_merge_requests_status.html.haml' do it 'shows date of status change in tooltip' do - merge_request = create(:merge_request, created_at: 1.month.ago) + merge_request = create(:merge_request, created_at: 14.days.ago) render partial: 'projects/issues/merge_requests_status', locals: { merge_request: merge_request, css_class: '' } - expect(rendered).to match("Opened.*about 1 month ago") + expect(rendered).to match(/Opened.*14 days ago/) end it 'shows only status in tooltip if date is not set' do |