Commit 1cbfc8d0 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

parent 74c8a635
...@@ -46,7 +46,10 @@ ...@@ -46,7 +46,10 @@
%li %li
%span.light Last sign-in at: %span.light Last sign-in at:
%strong %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? - if @admin_user.ldap_user?
%li %li
......
...@@ -45,7 +45,7 @@ class ProjectActiveTab < Spinach::FeatureSteps ...@@ -45,7 +45,7 @@ class ProjectActiveTab < Spinach::FeatureSteps
# Sub Tabs: Home # Sub Tabs: Home
Given 'I click the "Team" tab' do Given 'I click the "Team" tab' do
click_link('Team') click_link('Project Members')
end end
Given 'I click the "Attachments" tab' do Given 'I click the "Attachments" tab' do
...@@ -61,7 +61,7 @@ class ProjectActiveTab < Spinach::FeatureSteps ...@@ -61,7 +61,7 @@ class ProjectActiveTab < Spinach::FeatureSteps
end end
Given 'I click the "Hooks" tab' do Given 'I click the "Hooks" tab' do
click_link('Hooks') click_link('Web Hooks')
end end
Given 'I click the "Deploy Keys" tab' do Given 'I click the "Deploy Keys" tab' do
...@@ -73,7 +73,7 @@ class ProjectActiveTab < Spinach::FeatureSteps ...@@ -73,7 +73,7 @@ class ProjectActiveTab < Spinach::FeatureSteps
end end
Then 'the active sub tab should be Team' do Then 'the active sub tab should be Team' do
ensure_active_sub_tab('Team') ensure_active_sub_tab('Project Members')
end end
Then 'the active sub tab should be Attachments' do 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
end end
Then 'the active sub tab should be Hooks' do Then 'the active sub tab should be Hooks' do
ensure_active_sub_tab('Hooks') ensure_active_sub_tab('Web Hooks')
end end
Then 'the active sub tab should be Deploy Keys' do Then 'the active sub tab should be Deploy Keys' do
......
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