summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Niedzielski <adamsunday@gmail.com>2016-12-30 11:32:44 +0100
committerAdam Niedzielski <adamsunday@gmail.com>2016-12-30 11:32:44 +0100
commitd69b7bec9583fcbddaf563c44b2483408b459a07 (patch)
tree78276c51fff2f65454f3604464645002ad9ba299
parentc2173a1464abe4048486ffe350ad65545ce239ce (diff)
downloadgitlab-ce-d69b7bec9583fcbddaf563c44b2483408b459a07.tar.gz
Remove time zone information from assertion in timeago tooltips specremove-timezone-assertion-datetime-on-tooltips-spec
This allows the test to pass when your local time zone is different than UTC. "Date Format" JavaScript library uses a custom, non-standard format when displaying time zone part of the datetime. There is no point in trying to replicate this behavior in Ruby.
-rw-r--r--spec/features/dashboard/datetime_on_tooltips_spec.rb2
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