diff options
author | Ruben Davila <rdavila84@gmail.com> | 2017-06-26 00:42:44 -0500 |
---|---|---|
committer | Ruben Davila <rdavila84@gmail.com> | 2017-06-26 00:42:44 -0500 |
commit | a89c1bf645e4ca0ccc5df9d26c196652a247e82a (patch) | |
tree | c47afeb059d03cea8968a2ef3fcf83671cbf7515 /spec/features/dashboard | |
parent | f0886918845f8292889db7e30033b7051147f3b0 (diff) | |
download | gitlab-ce-a89c1bf645e4ca0ccc5df9d26c196652a247e82a.tar.gz |
Fix application error when Project#last_activity_at is nil34276-fix-dashboard-page-when-last-activity-at-is-nil
Diffstat (limited to 'spec/features/dashboard')
-rw-r--r-- | spec/features/dashboard/projects_spec.rb | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/spec/features/dashboard/projects_spec.rb b/spec/features/dashboard/projects_spec.rb index 2a8185ca669..f29186f368d 100644 --- a/spec/features/dashboard/projects_spec.rb +++ b/spec/features/dashboard/projects_spec.rb @@ -15,13 +15,25 @@ RSpec.describe 'Dashboard Projects', feature: true do expect(page).to have_content('awesome stuff') end - it 'shows the last_activity_at attribute as the update date' do - now = Time.now - project.update_column(:last_activity_at, now) + context 'when last_repository_updated_at, last_activity_at and update_at are present' do + it 'shows the last_repository_updated_at attribute as the update date' do + project.update_attributes!(last_repository_updated_at: Time.now, last_activity_at: 1.hour.ago) - visit dashboard_projects_path + visit dashboard_projects_path + + expect(page).to have_xpath("//time[@datetime='#{project.last_repository_updated_at.getutc.iso8601}']") + end + end - expect(page).to have_xpath("//time[@datetime='#{now.getutc.iso8601}']") + context 'when last_repository_updated_at and last_activity_at are missing' do + it 'shows the updated_at attribute as the update date' do + project.update_attributes!(last_repository_updated_at: nil, last_activity_at: nil) + project.touch + + visit dashboard_projects_path + + expect(page).to have_xpath("//time[@datetime='#{project.updated_at.getutc.iso8601}']") + end end context 'when on Starred projects tab' do |