Fix tab tests. Prevent 500 if user.last_sign_in_at is nil

2 files changed, 8 insertions, 5 deletions

diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml
index 1b5340d687d..6cf7152e5f7 100644
--- a/app/views/admin/users/show.html.haml
+++ b/app/views/admin/users/show.html.haml
@@ -46,7 +46,10 @@
         %li
           %span.light Last sign-in at:
           %strong
-            = @admin_user.last_sign_in_at.stamp("Nov 12, 2031")
+            - if @admin_user.last_sign_in_at
+              = @admin_user.last_sign_in_at.stamp("Nov 12, 2031")
+            - else
+              never
 
         - if @admin_user.ldap_user?
           %li
diff --git a/features/steps/project/project_active_tab.rb b/features/steps/project/project_active_tab.rb
index 4c6d890fe4b..5170ab82e8a 100644
--- a/features/steps/project/project_active_tab.rb
+++ b/features/steps/project/project_active_tab.rb
@@ -45,7 +45,7 @@ class ProjectActiveTab < Spinach::FeatureSteps
   # Sub Tabs: Home
 
   Given 'I click the "Team" tab' do
-    click_link('Team')
+    click_link('Project Members')
   end
 
   Given 'I click the "Attachments" tab' do
@@ -61,7 +61,7 @@ class ProjectActiveTab < Spinach::FeatureSteps
   end
 
   Given 'I click the "Hooks" tab' do
-    click_link('Hooks')
+    click_link('Web Hooks')
   end
 
   Given 'I click the "Deploy Keys" tab' do
@@ -73,7 +73,7 @@ class ProjectActiveTab < Spinach::FeatureSteps
   end
 
   Then 'the active sub tab should be Team' do
-    ensure_active_sub_tab('Team')
+    ensure_active_sub_tab('Project Members')
   end
 
   Then 'the active sub tab should be Attachments' do
@@ -89,7 +89,7 @@ class ProjectActiveTab < Spinach::FeatureSteps
   end
 
   Then 'the active sub tab should be Hooks' do
-    ensure_active_sub_tab('Hooks')
+    ensure_active_sub_tab('Web Hooks')
   end
 
   Then 'the active sub tab should be Deploy Keys' do