diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-01-02 13:44:33 +0000 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-01-02 13:44:33 +0000 |
| commit | 313aa339b9b2cda26c9160f70444f107e2aafef4 (patch) | |
| tree | a8d942d33787dca176a2c5bcc62678c04c9c8738 | |
| parent | 8dc2163ce580f1d71be1cf45e5dfcb2b4763d7bb (diff) | |
| parent | d69b7bec9583fcbddaf563c44b2483408b459a07 (diff) | |
| download | gitlab-ce-313aa339b9b2cda26c9160f70444f107e2aafef4.tar.gz | |
Merge branch 'remove-timezone-assertion-datetime-on-tooltips-spec' into 'master'
Remove time zone information from assertion in timeago tooltips spec
Closes #26183
See merge request !8374
| -rw-r--r-- | spec/features/dashboard/datetime_on_tooltips_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/dashboard/datetime_on_tooltips_spec.rb b/spec/features/dashboard/datetime_on_tooltips_spec.rb index 44dfc2dff45..dc9d09fa396 100644 --- a/spec/features/dashboard/datetime_on_tooltips_spec.rb +++ b/spec/features/dashboard/datetime_on_tooltips_spec.rb @@ -6,7 +6,7 @@ feature 'Tooltips on .timeago dates', feature: true, js: true do let(:user) { create(:user) } let(:project) { create(:project, name: 'test', namespace: user.namespace) } let(:created_date) { Date.yesterday.to_time } - let(:expected_format) { created_date.strftime('%b %-d, %Y %l:%M%P UTC') } + let(:expected_format) { created_date.strftime('%b %-d, %Y %l:%M%P') } context 'on the activity tab' do before do |