1 files changed, 22 insertions, 13 deletions

diff --git a/spec/features/dashboard/datetime_on_tooltips_spec.rb b/spec/features/dashboard/datetime_on_tooltips_spec.rb
index ed28ec6099d..a3eacd6147c 100644
--- a/spec/features/dashboard/datetime_on_tooltips_spec.rb
+++ b/spec/features/dashboard/datetime_on_tooltips_spec.rb
@@ -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