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
Kazuhiko Shiozaki
gitlab-ce
Commits
fcc1ba5b
Commit
fcc1ba5b
authored
Jun 17, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix spinach group
parent
e12c9ee2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
app/models/users_group.rb
app/models/users_group.rb
+1
-1
features/steps/group/group.rb
features/steps/group/group.rb
+3
-3
No files found.
app/models/users_group.rb
View file @
fcc1ba5b
...
@@ -37,6 +37,6 @@ class UsersGroup < ActiveRecord::Base
...
@@ -37,6 +37,6 @@ class UsersGroup < ActiveRecord::Base
delegate
:name
,
:username
,
:email
,
to: :user
,
prefix:
true
delegate
:name
,
:username
,
:email
,
to: :user
,
prefix:
true
def
human_access
def
human_access
UsersGroup
.
group_access_roles
.
index
(
self
.
group_access
)
UsersGroup
.
group_access_roles
.
key
(
self
.
group_access
)
end
end
end
end
features/steps/group/group.rb
View file @
fcc1ba5b
...
@@ -39,11 +39,11 @@ class Groups < Spinach::FeatureSteps
...
@@ -39,11 +39,11 @@ class Groups < Spinach::FeatureSteps
And
'I select user "John" from list with role "Reporter"'
do
And
'I select user "John" from list with role "Reporter"'
do
user
=
User
.
find_by_name
(
"John"
)
user
=
User
.
find_by_name
(
"John"
)
within
"
#new_team_member
"
do
within
"
.new_users_group
"
do
select2
(
user
.
id
,
from:
"#user_ids"
,
multiple:
true
)
select2
(
user
.
id
,
from:
"#user_ids"
,
multiple:
true
)
select
"Reporter"
,
from:
"
project
_access"
select
"Reporter"
,
from:
"
group
_access"
end
end
click_button
"Add"
click_button
"Add
users into group
"
end
end
Then
'I should see user "John" in team list'
do
Then
'I should see user "John" in team list'
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