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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
496b7da7
Commit
496b7da7
authored
Mar 13, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix spinach tests
parent
1587caa3
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
app/views/admin/teams/members/new.html.haml
app/views/admin/teams/members/new.html.haml
+1
-1
features/steps/admin/admin_teams.rb
features/steps/admin/admin_teams.rb
+3
-3
features/steps/project/project_team_management.rb
features/steps/project/project_team_management.rb
+1
-1
No files found.
app/views/admin/teams/members/new.html.haml
View file @
496b7da7
...
...
@@ -21,7 +21,7 @@
%td
=
@team
.
admin?
(
member
)
?
"Admin"
:
"Member"
%td
%tr
%td
=
select_tag
:user_ids
,
options_from_collection_for_select
(
@users
,
:id
,
:name_with_
email
),
multiple:
true
,
data:
{
placeholder:
'Select users'
},
class:
'chosen span5'
%td
=
select_tag
:user_ids
,
options_from_collection_for_select
(
@users
,
:id
,
:name_with_
username
),
multiple:
true
,
data:
{
placeholder:
'Select users'
},
class:
'chosen span5'
%td
=
select_tag
:default_project_access
,
options_for_select
(
Project
.
access_options
),
{
class:
"project-access-select chosen span3"
}
%td
%span
=
check_box_tag
:group_admin
...
...
features/steps/admin/admin_teams.rb
View file @
496b7da7
...
...
@@ -46,13 +46,13 @@ class AdminTeams < Spinach::FeatureSteps
Then
'I should see only me in members table'
do
members_list
=
find
(
"#members_list .member"
)
members_list
.
should
have_content
(
current_user
.
name
)
members_list
.
should
have_content
(
current_user
.
email
)
members_list
.
should
have_content
(
current_user
.
username
)
end
When
'I select user "John" from user list as "Developer"'
do
@user
||=
User
.
find_by_name
(
"John"
)
within
"#team_members"
do
select
"
#{
@user
.
name
}
(
#{
@user
.
email
}
)"
,
from:
"user_ids"
select
"
#{
@user
.
name
}
(
#{
@user
.
username
}
)"
,
from:
"user_ids"
select
"Developer"
,
from:
"default_project_access"
end
end
...
...
@@ -129,7 +129,7 @@ class AdminTeams < Spinach::FeatureSteps
When
'I select user "Jimm" ub team members list as "Master"'
do
user
=
User
.
find_by_name
(
"Jimm"
)
within
"#team_members"
do
select
"
#{
user
.
name
}
(
#{
user
.
email
}
)"
,
from:
"user_ids"
select
"
#{
user
.
name
}
(
#{
user
.
username
}
)"
,
from:
"user_ids"
select
"Developer"
,
from:
"default_project_access"
end
end
...
...
features/steps/project/project_team_management.rb
View file @
496b7da7
...
...
@@ -21,7 +21,7 @@ class ProjectTeamManagement < Spinach::FeatureSteps
And
'I select "Mike" as "Reporter"'
do
user
=
User
.
find_by_name
(
"Mike"
)
within
"#new_team_member"
do
select
user
.
name
,
:from
=>
"user_ids"
select
"
#{
user
.
name
}
(
#{
user
.
username
}
)"
,
:from
=>
"user_ids"
select
"Reporter"
,
:from
=>
"project_access"
end
click_button
"Add users"
...
...
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