Commit 1cbfc8d0af7dabb88da8628d5706f7e721ce90ce
1 parent
74c8a635
Exists in
master
and in
4 other branches
Fix tab tests. Prevent 500 if user.last_sign_in_at is nil
Showing
2 changed files
with
8 additions
and
5 deletions
Show diff stats
app/views/admin/users/show.html.haml
| @@ -46,7 +46,10 @@ | @@ -46,7 +46,10 @@ | ||
| 46 | %li | 46 | %li |
| 47 | %span.light Last sign-in at: | 47 | %span.light Last sign-in at: |
| 48 | %strong | 48 | %strong |
| 49 | - = @admin_user.last_sign_in_at.stamp("Nov 12, 2031") | 49 | + - if @admin_user.last_sign_in_at |
| 50 | + = @admin_user.last_sign_in_at.stamp("Nov 12, 2031") | ||
| 51 | + - else | ||
| 52 | + never | ||
| 50 | 53 | ||
| 51 | - if @admin_user.ldap_user? | 54 | - if @admin_user.ldap_user? |
| 52 | %li | 55 | %li |
features/steps/project/project_active_tab.rb
| @@ -45,7 +45,7 @@ class ProjectActiveTab < Spinach::FeatureSteps | @@ -45,7 +45,7 @@ class ProjectActiveTab < Spinach::FeatureSteps | ||
| 45 | # Sub Tabs: Home | 45 | # Sub Tabs: Home |
| 46 | 46 | ||
| 47 | Given 'I click the "Team" tab' do | 47 | Given 'I click the "Team" tab' do |
| 48 | - click_link('Team') | 48 | + click_link('Project Members') |
| 49 | end | 49 | end |
| 50 | 50 | ||
| 51 | Given 'I click the "Attachments" tab' do | 51 | Given 'I click the "Attachments" tab' do |
| @@ -61,7 +61,7 @@ class ProjectActiveTab < Spinach::FeatureSteps | @@ -61,7 +61,7 @@ class ProjectActiveTab < Spinach::FeatureSteps | ||
| 61 | end | 61 | end |
| 62 | 62 | ||
| 63 | Given 'I click the "Hooks" tab' do | 63 | Given 'I click the "Hooks" tab' do |
| 64 | - click_link('Hooks') | 64 | + click_link('Web Hooks') |
| 65 | end | 65 | end |
| 66 | 66 | ||
| 67 | Given 'I click the "Deploy Keys" tab' do | 67 | Given 'I click the "Deploy Keys" tab' do |
| @@ -73,7 +73,7 @@ class ProjectActiveTab < Spinach::FeatureSteps | @@ -73,7 +73,7 @@ class ProjectActiveTab < Spinach::FeatureSteps | ||
| 73 | end | 73 | end |
| 74 | 74 | ||
| 75 | Then 'the active sub tab should be Team' do | 75 | Then 'the active sub tab should be Team' do |
| 76 | - ensure_active_sub_tab('Team') | 76 | + ensure_active_sub_tab('Project Members') |
| 77 | end | 77 | end |
| 78 | 78 | ||
| 79 | Then 'the active sub tab should be Attachments' do | 79 | Then 'the active sub tab should be Attachments' do |
| @@ -89,7 +89,7 @@ class ProjectActiveTab < Spinach::FeatureSteps | @@ -89,7 +89,7 @@ class ProjectActiveTab < Spinach::FeatureSteps | ||
| 89 | end | 89 | end |
| 90 | 90 | ||
| 91 | Then 'the active sub tab should be Hooks' do | 91 | Then 'the active sub tab should be Hooks' do |
| 92 | - ensure_active_sub_tab('Hooks') | 92 | + ensure_active_sub_tab('Web Hooks') |
| 93 | end | 93 | end |
| 94 | 94 | ||
| 95 | Then 'the active sub tab should be Deploy Keys' do | 95 | Then 'the active sub tab should be Deploy Keys' do |