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
67b82e90
Commit
67b82e90
authored
Apr 12, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix random failing test
parent
ef2c8593
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
13 deletions
+13
-13
app/views/team_members/_team.html.haml
app/views/team_members/_team.html.haml
+4
-3
features/project/team_management.feature
features/project/team_management.feature
+0
-1
features/steps/project/project_team_management.rb
features/steps/project/project_team_management.rb
+9
-9
No files found.
app/views/team_members/_team.html.haml
View file @
67b82e90
-
team
.
each
do
|
access
,
members
|
.ui-box
-
role
=
Project
.
access_options
.
key
(
access
).
pluralize
.ui-box
{
class:
role
.
downcase
}
%h5
.title
=
Project
.
access_options
.
key
(
access
).
pluraliz
e
%s
mall
=
members
.
size
=
rol
e
%s
pan
.light
(
#{
members
.
size
}
)
%ul
.well-list
-
members
.
sort_by
(
&
:user_name
).
each
do
|
team_member
|
=
render
'team_members/team_member'
,
member:
team_member
features/project/team_management.feature
View file @
67b82e90
...
...
@@ -21,7 +21,6 @@ Feature: Project Team management
Scenario
:
Update user access
Given
I should see
"Sam"
in team list as
"Developer"
And
I change
"Sam"
role to
"Reporter"
Then
I visit project
"Shop"
team page
And
I should see
"Sam"
in team list as
"Reporter"
Scenario
:
Cancel team member
...
...
features/steps/project/project_team_management.rb
View file @
67b82e90
...
...
@@ -30,15 +30,15 @@ class ProjectTeamManagement < Spinach::FeatureSteps
end
Then
'I should see "Mike" in team list as "Reporter"'
do
user
=
User
.
find_by_name
(
"Mike"
)
role_id
=
find
(
".user_
#{
user
.
id
}
#team_member_project_access"
).
value
role_id
.
should
==
UsersProject
.
access_roles
[
"Reporter"
].
to_s
within
'.reporters'
do
page
.
should
have_content
(
'Mike'
)
end
end
Given
'I should see "Sam" in team list as "Developer"'
do
user
=
User
.
find_by_name
(
"Sam"
)
role_id
=
find
(
".user_
#{
user
.
id
}
#team_member_project_access"
).
value
role_id
.
should
==
UsersProject
.
access_roles
[
"Developer"
].
to_s
within
'.developers'
do
page
.
should
have_content
(
'Sam'
)
end
end
And
'I change "Sam" role to "Reporter"'
do
...
...
@@ -49,9 +49,9 @@ class ProjectTeamManagement < Spinach::FeatureSteps
end
And
'I should see "Sam" in team list as "Reporter"'
do
user
=
User
.
find_by_name
(
"Sam"
)
role_id
=
find
(
".user_
#{
user
.
id
}
#team_member_project_access"
).
value
role_id
.
should
==
UsersProject
.
access_roles
[
"Reporter"
].
to_s
within
'.reporters'
do
page
.
should
have_content
(
'Sam'
)
end
end
And
'I click link "Remove from team"'
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