Commit 87f5f811 authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Merge branch...

Merge branch '238176-tooltips-on-timeago-dates-on-the-snippets-tab-has-the-datetime-formatted-correctly' into 'master'

Fix timezone in .timeago tests

Closes #238176

See merge request gitlab-org/gitlab!41867
parents e5e4531c 9fc41f1e
......@@ -3,44 +3,53 @@
require 'spec_helper'
RSpec.describe 'Tooltips on .timeago dates', :js 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.in_time_zone.strftime('%b %-d, %Y %l:%M%P') }
let_it_be(:user) { create(:user) }
let_it_be(:project) { create(:project, name: 'test', namespace: user.namespace) }
let(:created_date) { 1.day.ago.beginning_of_minute - 1.hour }
before_all do
project.add_maintainer(user)
end
context 'on the activity tab' do
before do
project.add_maintainer(user)
Event.create( project: project, author_id: user.id, action: :joined,
updated_at: created_date, created_at: created_date)
sign_in user
visit user_activity_path(user)
wait_for_requests
page.find('.js-timeago').hover
end
it 'has the datetime formated correctly' do
expect(page).to have_selector('.local-timeago', text: expected_format)
expect(page).to have_selector('.js-timeago', text: '1 day ago')
page.find('.js-timeago').hover
expect(datetime_in_tooltip).to eq(created_date)
end
end
context 'on the snippets tab' do
before do
project.add_maintainer(user)
create(:snippet, author: user, updated_at: created_date, created_at: created_date)
sign_in user
visit user_snippets_path(user)
wait_for_requests
page.find('.js-timeago.snippet-created-ago').hover
end
it 'has the datetime formated correctly' do
expect(page).to have_selector('.local-timeago', text: expected_format)
expect(page).to have_selector('.js-timeago.snippet-created-ago', text: '1 day ago')
page.find('.js-timeago.snippet-created-ago').hover
expect(datetime_in_tooltip).to eq(created_date)
end
end
def datetime_in_tooltip
datetime_text = page.find('.local-timeago').text
DateTime.parse(datetime_text)
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment