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
fa877b63
Commit
fa877b63
authored
Jun 17, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
UsersGroup specs. Fixed db/schema
parent
95965d3f
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
63 additions
and
45 deletions
+63
-45
app/models/users_group.rb
app/models/users_group.rb
+3
-1
app/views/groups/people.html.haml
app/views/groups/people.html.haml
+1
-1
db/schema.rb
db/schema.rb
+33
-37
spec/factories/users_groups.rb
spec/factories/users_groups.rb
+3
-5
spec/models/users_group_spec.rb
spec/models/users_group_spec.rb
+23
-1
No files found.
app/models/users_group.rb
View file @
fa877b63
...
@@ -15,7 +15,7 @@ class UsersGroup < ActiveRecord::Base
...
@@ -15,7 +15,7 @@ class UsersGroup < ActiveRecord::Base
}
}
end
end
attr_accessible
:group_access
,
:
group_id
,
:
user_id
attr_accessible
:group_access
,
:user_id
belongs_to
:user
belongs_to
:user
belongs_to
:project
belongs_to
:project
...
@@ -33,6 +33,8 @@ class UsersGroup < ActiveRecord::Base
...
@@ -33,6 +33,8 @@ class UsersGroup < ActiveRecord::Base
validates
:user_id
,
presence:
true
validates
:user_id
,
presence:
true
validates
:group_id
,
presence:
true
validates
:group_id
,
presence:
true
delegate
:name
,
:username
,
:email
,
to: :user
,
prefix:
true
def
human_group_access
def
human_group_access
UsersGroup
.
group_access_roles
.
index
(
self
.
group_access
)
UsersGroup
.
group_access_roles
.
index
(
self
.
group_access
)
end
end
...
...
app/views/groups/people.html.haml
View file @
fa877b63
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
=
render
(
@project
?
"new_member"
:
"new_group_member"
)
=
render
(
@project
?
"new_member"
:
"new_group_member"
)
.ui-box
.ui-box
%h5
.title
%h5
.title
Team
#{
@group
.
name
}
Team
%small
%small
(
#{
@users_groups
.
count
}
)
(
#{
@users_groups
.
count
}
)
%ul
.well-list
%ul
.well-list
...
...
db/schema.rb
View file @
fa877b63
...
@@ -53,8 +53,8 @@ ActiveRecord::Schema.define(:version => 20130617095603) do
...
@@ -53,8 +53,8 @@ ActiveRecord::Schema.define(:version => 20130617095603) do
t
.
integer
"assignee_id"
t
.
integer
"assignee_id"
t
.
integer
"author_id"
t
.
integer
"author_id"
t
.
integer
"project_id"
t
.
integer
"project_id"
t
.
datetime
"created_at"
,
:null
=>
false
t
.
datetime
"created_at"
t
.
datetime
"updated_at"
,
:null
=>
false
t
.
datetime
"updated_at"
t
.
integer
"position"
,
:default
=>
0
t
.
integer
"position"
,
:default
=>
0
t
.
string
"branch_name"
t
.
string
"branch_name"
t
.
text
"description"
t
.
text
"description"
...
@@ -71,8 +71,8 @@ ActiveRecord::Schema.define(:version => 20130617095603) do
...
@@ -71,8 +71,8 @@ ActiveRecord::Schema.define(:version => 20130617095603) do
create_table
"keys"
,
:force
=>
true
do
|
t
|
create_table
"keys"
,
:force
=>
true
do
|
t
|
t
.
integer
"user_id"
t
.
integer
"user_id"
t
.
datetime
"created_at"
,
:null
=>
false
t
.
datetime
"created_at"
t
.
datetime
"updated_at"
,
:null
=>
false
t
.
datetime
"updated_at"
t
.
text
"key"
t
.
text
"key"
t
.
string
"title"
t
.
string
"title"
t
.
string
"identifier"
t
.
string
"identifier"
...
@@ -89,8 +89,8 @@ ActiveRecord::Schema.define(:version => 20130617095603) do
...
@@ -89,8 +89,8 @@ ActiveRecord::Schema.define(:version => 20130617095603) do
t
.
integer
"author_id"
t
.
integer
"author_id"
t
.
integer
"assignee_id"
t
.
integer
"assignee_id"
t
.
string
"title"
t
.
string
"title"
t
.
datetime
"created_at"
,
:null
=>
false
t
.
datetime
"created_at"
t
.
datetime
"updated_at"
,
:null
=>
false
t
.
datetime
"updated_at"
t
.
text
"st_commits"
,
:limit
=>
2147483647
t
.
text
"st_commits"
,
:limit
=>
2147483647
t
.
text
"st_diffs"
,
:limit
=>
2147483647
t
.
text
"st_diffs"
,
:limit
=>
2147483647
t
.
integer
"milestone_id"
t
.
integer
"milestone_id"
...
@@ -139,8 +139,8 @@ ActiveRecord::Schema.define(:version => 20130617095603) do
...
@@ -139,8 +139,8 @@ ActiveRecord::Schema.define(:version => 20130617095603) do
t
.
text
"note"
t
.
text
"note"
t
.
string
"noteable_type"
t
.
string
"noteable_type"
t
.
integer
"author_id"
t
.
integer
"author_id"
t
.
datetime
"created_at"
,
:null
=>
false
t
.
datetime
"created_at"
t
.
datetime
"updated_at"
,
:null
=>
false
t
.
datetime
"updated_at"
t
.
integer
"project_id"
t
.
integer
"project_id"
t
.
string
"attachment"
t
.
string
"attachment"
t
.
string
"line_code"
t
.
string
"line_code"
...
@@ -158,8 +158,8 @@ ActiveRecord::Schema.define(:version => 20130617095603) do
...
@@ -158,8 +158,8 @@ ActiveRecord::Schema.define(:version => 20130617095603) do
t
.
string
"name"
t
.
string
"name"
t
.
string
"path"
t
.
string
"path"
t
.
text
"description"
t
.
text
"description"
t
.
datetime
"created_at"
,
:null
=>
false
t
.
datetime
"created_at"
t
.
datetime
"updated_at"
,
:null
=>
false
t
.
datetime
"updated_at"
t
.
integer
"creator_id"
t
.
integer
"creator_id"
t
.
string
"default_branch"
t
.
string
"default_branch"
t
.
boolean
"issues_enabled"
,
:default
=>
true
,
:null
=>
false
t
.
boolean
"issues_enabled"
,
:default
=>
true
,
:null
=>
false
...
@@ -206,8 +206,8 @@ ActiveRecord::Schema.define(:version => 20130617095603) do
...
@@ -206,8 +206,8 @@ ActiveRecord::Schema.define(:version => 20130617095603) do
t
.
text
"content"
t
.
text
"content"
t
.
integer
"author_id"
,
:null
=>
false
t
.
integer
"author_id"
,
:null
=>
false
t
.
integer
"project_id"
t
.
integer
"project_id"
t
.
datetime
"created_at"
,
:null
=>
false
t
.
datetime
"created_at"
t
.
datetime
"updated_at"
,
:null
=>
false
t
.
datetime
"updated_at"
t
.
string
"file_name"
t
.
string
"file_name"
t
.
datetime
"expires_at"
t
.
datetime
"expires_at"
t
.
boolean
"private"
,
:default
=>
true
,
:null
=>
false
t
.
boolean
"private"
,
:default
=>
true
,
:null
=>
false
...
@@ -228,9 +228,6 @@ ActiveRecord::Schema.define(:version => 20130617095603) do
...
@@ -228,9 +228,6 @@ ActiveRecord::Schema.define(:version => 20130617095603) do
t
.
datetime
"created_at"
t
.
datetime
"created_at"
end
end
add_index
"taggings"
,
[
"tag_id"
],
:name
=>
"index_taggings_on_tag_id"
add_index
"taggings"
,
[
"taggable_id"
,
"taggable_type"
,
"context"
],
:name
=>
"index_taggings_on_taggable_id_and_taggable_type_and_context"
create_table
"tags"
,
:force
=>
true
do
|
t
|
create_table
"tags"
,
:force
=>
true
do
|
t
|
t
.
string
"name"
t
.
string
"name"
end
end
...
@@ -263,7 +260,7 @@ ActiveRecord::Schema.define(:version => 20130617095603) do
...
@@ -263,7 +260,7 @@ ActiveRecord::Schema.define(:version => 20130617095603) do
create_table
"users"
,
:force
=>
true
do
|
t
|
create_table
"users"
,
:force
=>
true
do
|
t
|
t
.
string
"email"
,
:default
=>
""
,
:null
=>
false
t
.
string
"email"
,
:default
=>
""
,
:null
=>
false
t
.
string
"encrypted_password"
,
:default
=>
""
,
:null
=>
false
t
.
string
"encrypted_password"
,
:
limit
=>
128
,
:
default
=>
""
,
:null
=>
false
t
.
string
"reset_password_token"
t
.
string
"reset_password_token"
t
.
datetime
"reset_password_sent_at"
t
.
datetime
"reset_password_sent_at"
t
.
datetime
"remember_created_at"
t
.
datetime
"remember_created_at"
...
@@ -272,8 +269,8 @@ ActiveRecord::Schema.define(:version => 20130617095603) do
...
@@ -272,8 +269,8 @@ ActiveRecord::Schema.define(:version => 20130617095603) do
t
.
datetime
"last_sign_in_at"
t
.
datetime
"last_sign_in_at"
t
.
string
"current_sign_in_ip"
t
.
string
"current_sign_in_ip"
t
.
string
"last_sign_in_ip"
t
.
string
"last_sign_in_ip"
t
.
datetime
"created_at"
,
:null
=>
false
t
.
datetime
"created_at"
t
.
datetime
"updated_at"
,
:null
=>
false
t
.
datetime
"updated_at"
t
.
string
"name"
t
.
string
"name"
t
.
boolean
"admin"
,
:default
=>
false
,
:null
=>
false
t
.
boolean
"admin"
,
:default
=>
false
,
:null
=>
false
t
.
integer
"projects_limit"
,
:default
=>
10
t
.
integer
"projects_limit"
,
:default
=>
10
...
@@ -299,13 +296,12 @@ ActiveRecord::Schema.define(:version => 20130617095603) do
...
@@ -299,13 +296,12 @@ ActiveRecord::Schema.define(:version => 20130617095603) do
add_index
"users"
,
[
"admin"
],
:name
=>
"index_users_on_admin"
add_index
"users"
,
[
"admin"
],
:name
=>
"index_users_on_admin"
add_index
"users"
,
[
"email"
],
:name
=>
"index_users_on_email"
,
:unique
=>
true
add_index
"users"
,
[
"email"
],
:name
=>
"index_users_on_email"
,
:unique
=>
true
add_index
"users"
,
[
"extern_uid"
,
"provider"
],
:name
=>
"index_users_on_extern_uid_and_provider"
,
:unique
=>
true
add_index
"users"
,
[
"name"
],
:name
=>
"index_users_on_name"
add_index
"users"
,
[
"name"
],
:name
=>
"index_users_on_name"
add_index
"users"
,
[
"reset_password_token"
],
:name
=>
"index_users_on_reset_password_token"
,
:unique
=>
true
add_index
"users"
,
[
"reset_password_token"
],
:name
=>
"index_users_on_reset_password_token"
,
:unique
=>
true
add_index
"users"
,
[
"username"
],
:name
=>
"index_users_on_username"
add_index
"users"
,
[
"username"
],
:name
=>
"index_users_on_username"
create_table
"users_groups"
,
:force
=>
true
do
|
t
|
create_table
"users_groups"
,
:force
=>
true
do
|
t
|
t
.
integer
"
access_level
"
,
:null
=>
false
t
.
integer
"
group_access
"
,
:null
=>
false
t
.
integer
"group_id"
,
:null
=>
false
t
.
integer
"group_id"
,
:null
=>
false
t
.
integer
"user_id"
,
:null
=>
false
t
.
integer
"user_id"
,
:null
=>
false
t
.
datetime
"created_at"
,
:null
=>
false
t
.
datetime
"created_at"
,
:null
=>
false
...
@@ -315,8 +311,8 @@ ActiveRecord::Schema.define(:version => 20130617095603) do
...
@@ -315,8 +311,8 @@ ActiveRecord::Schema.define(:version => 20130617095603) do
create_table
"users_projects"
,
:force
=>
true
do
|
t
|
create_table
"users_projects"
,
:force
=>
true
do
|
t
|
t
.
integer
"user_id"
,
:null
=>
false
t
.
integer
"user_id"
,
:null
=>
false
t
.
integer
"project_id"
,
:null
=>
false
t
.
integer
"project_id"
,
:null
=>
false
t
.
datetime
"created_at"
,
:null
=>
false
t
.
datetime
"created_at"
t
.
datetime
"updated_at"
,
:null
=>
false
t
.
datetime
"updated_at"
t
.
integer
"project_access"
,
:default
=>
0
,
:null
=>
false
t
.
integer
"project_access"
,
:default
=>
0
,
:null
=>
false
t
.
integer
"notification_level"
,
:default
=>
3
,
:null
=>
false
t
.
integer
"notification_level"
,
:default
=>
3
,
:null
=>
false
end
end
...
@@ -328,8 +324,8 @@ ActiveRecord::Schema.define(:version => 20130617095603) do
...
@@ -328,8 +324,8 @@ ActiveRecord::Schema.define(:version => 20130617095603) do
create_table
"web_hooks"
,
:force
=>
true
do
|
t
|
create_table
"web_hooks"
,
:force
=>
true
do
|
t
|
t
.
string
"url"
t
.
string
"url"
t
.
integer
"project_id"
t
.
integer
"project_id"
t
.
datetime
"created_at"
,
:null
=>
false
t
.
datetime
"created_at"
t
.
datetime
"updated_at"
,
:null
=>
false
t
.
datetime
"updated_at"
t
.
string
"type"
,
:default
=>
"ProjectHook"
t
.
string
"type"
,
:default
=>
"ProjectHook"
t
.
integer
"service_id"
t
.
integer
"service_id"
end
end
...
...
spec/factories/users_groups.rb
View file @
fa877b63
# Read about factories at https://github.com/thoughtbot/factory_girl
FactoryGirl
.
define
do
FactoryGirl
.
define
do
factory
:users_group
do
factory
:users_group
do
access_level
1
group_access
{
UsersGroup
::
OWNER
}
group
_id
1
group
user
_id
1
user
end
end
end
end
spec/models/users_group_spec.rb
View file @
fa877b63
require
'spec_helper'
require
'spec_helper'
describe
UsersGroup
do
describe
UsersGroup
do
pending
"add some examples to (or delete)
#{
__FILE__
}
"
describe
"Associations"
do
it
{
should
belong_to
(
:group
)
}
it
{
should
belong_to
(
:user
)
}
end
describe
"Mass assignment"
do
it
{
should_not
allow_mass_assignment_of
(
:group_id
)
}
end
describe
"Validation"
do
let!
(
:users_group
)
{
create
(
:users_group
)
}
it
{
should
validate_presence_of
(
:user
)
}
it
{
should
validate_uniqueness_of
(
:user_id
).
scoped_to
(
:group_id
).
with_message
(
/already exists/
)
}
it
{
should
validate_presence_of
(
:group
)
}
it
{
should
ensure_inclusion_of
(
:group_access
).
in_array
(
UsersGroup
.
group_access_roles
.
values
)
}
end
describe
"Delegate methods"
do
it
{
should
respond_to
(
:user_name
)
}
it
{
should
respond_to
(
:user_email
)
}
end
end
end
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