Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
1cbfc8d0
Commit
1cbfc8d0
authored
Jun 14, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix tab tests. Prevent 500 if user.last_sign_in_at is nil
parent
74c8a635
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
app/views/admin/users/show.html.haml
app/views/admin/users/show.html.haml
+4
-1
features/steps/project/project_active_tab.rb
features/steps/project/project_active_tab.rb
+4
-4
No files found.
app/views/admin/users/show.html.haml
View file @
1cbfc8d0
...
@@ -46,7 +46,10 @@
...
@@ -46,7 +46,10 @@
%li
%li
%span
.light
Last sign-in at:
%span
.light
Last sign-in at:
%strong
%strong
-
if
@admin_user
.
last_sign_in_at
=
@admin_user
.
last_sign_in_at
.
stamp
(
"Nov 12, 2031"
)
=
@admin_user
.
last_sign_in_at
.
stamp
(
"Nov 12, 2031"
)
-
else
never
-
if
@admin_user
.
ldap_user?
-
if
@admin_user
.
ldap_user?
%li
%li
...
...
features/steps/project/project_active_tab.rb
View file @
1cbfc8d0
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment