kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Huge replace of old users_project and users_group references

Browse source 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets 2014-09-14 19:32:51 +03:00
parent eb4a9bfbca
commit c69b8e0459
No known key found for this signature in database
GPG key ID: 627C5F589F467F17
62 changed files with 392 additions and 470 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/admin.js.coffee
View file

@ -46,10 +46,10 @@ class Admin
modal.hide()
$('.change-owner-link').show()
$('li.users_project').bind 'ajax:success', ->
$('li.project_member').bind 'ajax:success', ->
Turbolinks.visit(location.href)
$('li.users_group').bind 'ajax:success', ->
$('li.group_member').bind 'ajax:success', ->
Turbolinks.visit(location.href)
@Admin = Admin

2
app/assets/javascripts/groups.js.coffee
View file

@ -1,6 +1,6 @@
class GroupMembers
constructor: ->
$('li.users_group').bind 'ajax:success', ->
$('li.group_member').bind 'ajax:success', ->
$(this).fadeOut()
@GroupMembers = GroupMembers

4
app/controllers/admin/groups_controller.rb
View file

@ -8,7 +8,7 @@ class Admin::GroupsController < Admin::ApplicationController
end
def show
@members = @group.members.order("group_access DESC").page(params[:members_page]).per(30)
@members = @group.members.order("access_level DESC").page(params[:members_page]).per(30)
@projects = @group.projects.page(params[:projects_page]).per(30)
end
@ -40,7 +40,7 @@ class Admin::GroupsController < Admin::ApplicationController
end
def project_teams_update
@group.add_users(params[:user_ids].split(','), params[:group_access])
@group.add_users(params[:user_ids].split(','), params[:access_level])
redirect_to [:admin, @group], notice: 'Users were successfully added.'
end

4
app/controllers/admin/projects_controller.rb
View file

@ -16,10 +16,10 @@ class Admin::ProjectsController < Admin::ApplicationController
def show
if @group
@group_members = @group.members.order("group_access DESC").page(params[:group_members_page]).per(30)
@group_members = @group.members.order("access_level DESC").page(params[:group_members_page]).per(30)
end
@project_members = @project.users_projects.page(params[:project_members_page]).per(30)
@project_members = @project.project_members.page(params[:project_members_page]).per(30)
end
def transfer

6
app/controllers/groups_controller.rb
View file

@ -65,15 +65,15 @@ class GroupsController < ApplicationController
def members
@project = group.projects.find(params[:project_id]) if params[:project_id]
@members = group.users_groups
@members = group.group_members
if params[:search].present?
users = group.users.search(params[:search]).to_a
@members = @members.where(user_id: users)
end
@members = @members.order('group_access DESC').page(params[:page]).per(50)
@users_group = UsersGroup.new
@members = @members.order('access_level DESC').page(params[:page]).per(50)
@users_group = GroupMember.new
end
def edit

4
app/controllers/profiles/groups_controller.rb
View file

@ -2,11 +2,11 @@ class Profiles::GroupsController < ApplicationController
layout "profile"
def index
@user_groups = current_user.users_groups.page(params[:page]).per(20)
@user_groups = current_user.group_members.page(params[:page]).per(20)
end
def leave
@users_group = group.users_groups.where(user_id: current_user.id).first
@users_group = group.group_members.where(user_id: current_user.id).first
if can?(current_user, :destroy, @users_group)
@users_group.destroy
redirect_to(profile_groups_path, info: "You left #{group.name} group.")

8
app/controllers/profiles/notifications_controller.rb
View file

@ -3,8 +3,8 @@ class Profiles::NotificationsController < ApplicationController
def show
@notification = current_user.notification
@users_projects = current_user.users_projects
@users_groups = current_user.users_groups
@users_projects = current_user.project_members
@users_groups = current_user.group_members
end
def update
@ -14,11 +14,11 @@ class Profiles::NotificationsController < ApplicationController
current_user.notification_level = params[:notification_level]
current_user.save
elsif type == 'group'
users_group = current_user.users_groups.find(params[:notification_id])
users_group = current_user.group_members.find(params[:notification_id])
users_group.notification_level = params[:notification_level]
users_group.save
else
users_project = current_user.users_projects.find(params[:notification_id])
users_project = current_user.project_members.find(params[:notification_id])
users_project.notification_level = params[:notification_level]
users_project.save
end

14
app/controllers/projects/team_members_controller.rb
View file

@ -6,17 +6,17 @@ class Projects::TeamMembersController < Projects::ApplicationController
def index
@group = @project.group
@users_projects = @project.users_projects.order('project_access DESC')
@users_projects = @project.project_members.order('access_level DESC')
end
def new
@user_project_relation = project.users_projects.new
@user_project_relation = project.project_members.new
end
def create
users = User.where(id: params[:user_ids].split(','))
@project.team << [users, params[:project_access]]
@project.team << [users, params[:access_level]]
if params[:redirect_to]
redirect_to params[:redirect_to]
@ -26,7 +26,7 @@ class Projects::TeamMembersController < Projects::ApplicationController
end
def update
@user_project_relation = project.users_projects.find_by(user_id: member)
@user_project_relation = project.project_members.find_by(user_id: member)
@user_project_relation.update_attributes(member_params)
unless @user_project_relation.valid?
@ -36,7 +36,7 @@ class Projects::TeamMembersController < Projects::ApplicationController
end
def destroy
@user_project_relation = project.users_projects.find_by(user_id: member)
@user_project_relation = project.project_members.find_by(user_id: member)
@user_project_relation.destroy
respond_to do |format|
@ -46,7 +46,7 @@ class Projects::TeamMembersController < Projects::ApplicationController
end
def leave
project.users_projects.find_by(user_id: current_user).destroy
project.project_members.find_by(user_id: current_user).destroy
respond_to do |format|
format.html { redirect_to :back }
@ -69,6 +69,6 @@ class Projects::TeamMembersController < Projects::ApplicationController
end
def member_params
params.require(:team_member).permit(:user_id, :project_access)
params.require(:team_member).permit(:user_id, :access_level)
end
end

10
app/controllers/users_groups_controller.rb
View file

@ -1,4 +1,4 @@
class UsersGroupsController < ApplicationController
class GroupMembersController < ApplicationController
before_filter :group
# Authorize
@ -7,18 +7,18 @@ class UsersGroupsController < ApplicationController
layout 'group'
def create
@group.add_users(params[:user_ids].split(','), params[:group_access])
@group.add_users(params[:user_ids].split(','), params[:access_level])
redirect_to members_group_path(@group), notice: 'Users were successfully added.'
end
def update
@member = @group.users_groups.find(params[:id])
@member = @group.group_members.find(params[:id])
@member.update_attributes(member_params)
end
def destroy
@users_group = @group.users_groups.find(params[:id])
@users_group = @group.group_members.find(params[:id])
if can?(current_user, :destroy, @users_group) # May fail if last owner.
@users_group.destroy
respond_to do |format|
@ -43,6 +43,6 @@ class UsersGroupsController < ApplicationController
end
def member_params
params.require(:users_group).permit(:group_access, :user_id)
params.require(:users_group).permit(:access_level, :user_id)
end
end

6
app/finders/projects_finder.rb
View file

@ -19,10 +19,8 @@ class ProjectsFinder
# Return ALL group projects
group.projects
else
projects_members = UsersProject.where(
project_id: group.projects,
user_id: current_user
)
projects_members = ProjectMember.in_projects(group.projects).
with_user(current_user)
if projects_members.any?
# User is a project member

4
app/mailers/emails/groups.rb
View file

@ -1,7 +1,7 @@
module Emails
module Groups
def group_access_granted_email(user_group_id)
@membership = UsersGroup.find(user_group_id)
def access_level_granted_email(user_group_id)
@membership = GroupMember.find(user_group_id)
@group = @membership.group
@target_url = group_url(@group)
mail(to: @membership.user.email,

4
app/mailers/emails/projects.rb
View file

@ -1,7 +1,7 @@
module Emails
module Projects
def project_access_granted_email(user_project_id)
@users_project = UsersProject.find user_project_id
def access_level_granted_email(user_project_id)
@users_project = ProjectMember.find user_project_id
@project = @users_project.project
@target_url = project_url(@project)
mail(to: @users_project.user.email,

2
app/models/ability.rb
View file

@ -14,7 +14,7 @@ class Ability
when "MergeRequest" then merge_request_abilities(user, subject)
when "Group" then group_abilities(user, subject)
when "Namespace" then namespace_abilities(user, subject)
when "UsersGroup" then users_group_abilities(user, subject)
when "GroupMember" then users_group_abilities(user, subject)
else []
end.concat(global_abilities(user))
end

2
app/models/concerns/notifiable.rb
View file

@ -1,6 +1,6 @@
# == Notifiable concern
#
# Contains notification functionality shared between UsersProject and UsersGroup
# Contains notification functionality
#
module Notifiable
extend ActiveSupport::Concern

20
app/models/group.rb
View file

@ -17,8 +17,8 @@ require 'carrierwave/orm/activerecord'
require 'file_size_validator'
class Group < Namespace
has_many :users_groups, dependent: :destroy
has_many :users, through: :users_groups
has_many :group_members, dependent: :destroy, as: :source, class_name: 'GroupMember'
has_many :users, through: :group_members
validate :avatar_type, if: ->(user) { user.avatar_changed? }
validates :avatar, file_size: { maximum: 100.kilobytes.to_i }
@ -30,22 +30,22 @@ class Group < Namespace
end
def owners
@owners ||= users_groups.owners.map(&:user)
@owners ||= group_members.owners.map(&:user)
end
def add_users(user_ids, group_access)
def add_users(user_ids, access_level)
user_ids.compact.each do |user_id|
user = self.users_groups.find_or_initialize_by(user_id: user_id)
user.update_attributes(group_access: group_access)
user = self.group_members.find_or_initialize_by(user_id: user_id)
user.update_attributes(access_level: access_level)
end
end
def add_user(user, group_access)
self.users_groups.create(user_id: user.id, group_access: group_access)
def add_user(user, access_level)
self.group_members.create(user_id: user.id, access_level: access_level)
end
def add_owner(user)
self.add_user(user, UsersGroup::OWNER)
self.add_user(user, Gitlab::Access::OWNER)
end
def has_owner?(user)
@ -61,7 +61,7 @@ class Group < Namespace
end
def members
users_groups
group_members
end
def avatar_type

2
app/models/group_member.rb
View file

@ -1,2 +0,0 @@
class GroupMember < Member
end

14
app/models/member.rb
View file

@ -8,11 +8,13 @@ class Member < ActiveRecord::Base
validates :user, presence: true
validates :source, presence: true
validates :user_id, uniqueness: { scope: [:source_type, :source_id], message: "already exists in source" }
validates :access_level, inclusion: { in: Gitlab::Access.values }, presence: true
validates :access_level, inclusion: { in: Gitlab::Access.all_values }, presence: true
scope :guests, -> { where(group_access: GUEST) }
scope :reporters, -> { where(group_access: REPORTER) }
scope :developers, -> { where(group_access: DEVELOPER) }
scope :masters, -> { where(group_access: MASTER) }
scope :owners, -> { where(group_access: OWNER) }
scope :guests, -> { where(access_level: GUEST) }
scope :reporters, -> { where(access_level: REPORTER) }
scope :developers, -> { where(access_level: DEVELOPER) }
scope :masters, -> { where(access_level: MASTER) }
scope :owners, -> { where(access_level: OWNER) }
delegate :name, :username, :email, to: :user, prefix: true
end

40
app/models/members/group_member.rb Normal file
View file

@ -0,0 +1,40 @@
class GroupMember < Member
SOURCE_TYPE = 'Group'
# Make sure group member points only to group as it source
default_value_for :source_type, SOURCE_TYPE
validates_format_of :source_type, with: /\AGroup\z/
default_scope { where(source_type: SOURCE_TYPE) }
scope :with_group, ->(group) { where(source_id: group.id) }
scope :with_user, ->(user) { where(user_id: user.id) }
after_create :notify_create
after_update :notify_update
def self.access_level_roles
Gitlab::Access.options_with_owner
end
def group
source
end
def access_field
access_level
end
def notify_create
notification_service.new_group_member(self)
end
def notify_update
if access_level_changed?
notification_service.update_group_member(self)
end
end
def notification_service
NotificationService.new
end
end

133
app/models/members/project_member.rb Normal file
View file

@ -0,0 +1,133 @@
class ProjectMember < Member
SOURCE_TYPE = 'Project'
include Gitlab::ShellAdapter
# Make sure project member points only to project as it source
default_value_for :source_type, SOURCE_TYPE
validates_format_of :source_type, with: /\AProject\z/
default_scope { where(source_type: SOURCE_TYPE) }
after_create :post_create_hook
after_update :post_update_hook
after_destroy :post_destroy_hook
scope :in_project, ->(project) { where(source_id: project.id) }
scope :in_projects, ->(projects) { where(source_id: projects.pluck(:id)) }
scope :with_user, ->(user) { where(user_id: user.id) }
class << self
# Add users to project teams with passed access option
#
# access can be an integer representing a access code
# or symbol like :master representing role
#
# Ex.
# add_users_into_projects(
# project_ids,
# user_ids,
# ProjectMember::MASTER
# )
#
# add_users_into_projects(
# project_ids,
# user_ids,
# :master
# )
#
def add_users_into_projects(project_ids, user_ids, access)
access_level = if roles_hash.has_key?(access)
roles_hash[access]
elsif roles_hash.values.include?(access.to_i)
access
else
raise "Non valid access"
end
ProjectMember.transaction do
project_ids.each do |project_id|
user_ids.each do |user_id|
member = ProjectMember.new(access_level: access_level, user_id: user_id)
member.source_id = project_id
member.save
end
end
end
true
rescue
false
end
def truncate_teams(project_ids)
ProjectMember.transaction do
members = ProjectMember.where(source_id: project_ids)
members.each do |member|
member.destroy
end
end
true
rescue
false
end
def truncate_team project
truncate_teams [project.id]
end
def roles_hash
Gitlab::Access.sym_options
end
def access_roles
Gitlab::Access.options
end
end
def access_field
access_level
end
def owner?
project.owner == user
end
def post_create_hook
Event.create(
project_id: self.project.id,
action: Event::JOINED,
author_id: self.user.id
)
notification_service.new_team_member(self) unless owner?
system_hook_service.execute_hooks_for(self, :create)
end
def post_update_hook
notification_service.update_team_member(self) if self.access_level_changed?
end
def post_destroy_hook
Event.create(
project_id: self.project.id,
action: Event::LEFT,
author_id: self.user.id
)
system_hook_service.execute_hooks_for(self, :destroy)
end
def notification_service
NotificationService.new
end
def system_hook_service
SystemHooksService.new
end
def project
source
end
end

2
app/models/project_member.rb
View file

@ -1,2 +0,0 @@
class ProjectMember < Member
end

22
app/models/project_team.rb
View file

@ -32,12 +32,12 @@ class ProjectTeam
end
def find_tm(user_id)
tm = project.users_projects.find_by(user_id: user_id)
tm = project.project_members.find_by(user_id: user_id)
# If user is not in project members
# we should check for group membership
if group && !tm
tm = group.users_groups.find_by(user_id: user_id)
tm = group.group_members.find_by(user_id: user_id)
end
tm
@ -52,7 +52,7 @@ class ProjectTeam
end
def add_users_ids(user_ids, access)
UsersProject.add_users_into_projects(
ProjectMember.add_users_into_projects(
[project.id],
user_ids,
access
@ -61,7 +61,7 @@ class ProjectTeam
# Remove all users from project team
def truncate
UsersProject.truncate_team(project)
ProjectMember.truncate_team(project)
end
def users
@ -91,8 +91,8 @@ class ProjectTeam
def import(source_project)
target_project = project
source_team = source_project.users_projects.to_a
target_user_ids = target_project.users_projects.pluck(:user_id)
source_team = source_project.project_members.to_a
target_user_ids = target_project.project_members.pluck(:user_id)
source_team.reject! do |tm|
# Skip if user already present in team
@ -106,7 +106,7 @@ class ProjectTeam
new_tm
end
UsersProject.transaction do
ProjectMember.transaction do
source_team.each do |tm|
tm.save
end
@ -135,10 +135,10 @@ class ProjectTeam
def max_tm_access(user_id)
access = []
access << project.users_projects.find_by(user_id: user_id).try(:access_field)
access << project.project_members.find_by(user_id: user_id).try(:access_field)
if group
access << group.users_groups.find_by(user_id: user_id).try(:access_field)
access << group.group_members.find_by(user_id: user_id).try(:access_field)
end
access.compact.max
@ -147,8 +147,8 @@ class ProjectTeam
private
def fetch_members(level = nil)
project_members = project.users_projects
group_members = group ? group.users_groups : []
project_members = project.project_members
group_members = group ? group.group_members : []
if level
project_members = project_members.send(level)

16
app/models/user.rb
View file

@ -81,10 +81,12 @@ class User < ActiveRecord::Base
has_many :emails, dependent: :destroy
# Groups
has_many :users_groups, dependent: :destroy
has_many :groups, through: :users_groups
has_many :owned_groups, -> { where users_groups: { group_access: UsersGroup::OWNER } }, through: :users_groups, source: :group
has_many :masters_groups, -> { where users_groups: { group_access: UsersGroup::MASTER } }, through: :users_groups, source: :group
has_many :members, dependent: :destroy
has_many :project_members, source: 'ProjectMember'
has_many :group_members, source: 'GroupMember'
has_many :groups, through: :group_members
has_many :owned_groups, -> { where group_members: { access_level: Gitlab::Access::OWNER } }, through: :group_members, source: :group
has_many :masters_groups, -> { where group_members: { access_level: Gitlab::Access::MASTER } }, through: :group_members, source: :group
# Projects
has_many :groups_projects, through: :groups, source: :projects
@ -140,7 +142,7 @@ class User < ActiveRecord::Base
state_machine :state, initial: :active do
after_transition any => :blocked do |user, transition|
# Remove user from all projects and
user.users_projects.find_each do |membership|
user.project_members.find_each do |membership|
# skip owned resources
next if membership.project.owner == user
@ -148,7 +150,7 @@ class User < ActiveRecord::Base
end
# Remove user from all groups
user.users_groups.find_each do |membership|
user.group_members.find_each do |membership|
# skip owned resources
next if membership.group.last_owner?(user)
@ -295,7 +297,7 @@ class User < ActiveRecord::Base
# Team membership in authorized projects
def tm_in_authorized_projects
UsersProject.where(project_id: authorized_projects.map(&:id), user_id: self.id)
ProjectMember.where(source_id: authorized_projects.map(&:id), user_id: self.id)
end
def is_admin?

61
app/models/users_group.rb
View file

@ -1,61 +0,0 @@
# == Schema Information
#
# Table name: users_groups
#
# id :integer not null, primary key
# group_access :integer not null
# group_id :integer not null
# user_id :integer not null
# created_at :datetime
# updated_at :datetime
# notification_level :integer default(3), not null
#
class UsersGroup < ActiveRecord::Base
include Notifiable
include Gitlab::Access
def self.group_access_roles
Gitlab::Access.options_with_owner
end
belongs_to :user
belongs_to :group
scope :guests, -> { where(group_access: GUEST) }
scope :reporters, -> { where(group_access: REPORTER) }
scope :developers, -> { where(group_access: DEVELOPER) }
scope :masters, -> { where(group_access: MASTER) }
scope :owners, -> { where(group_access: OWNER) }
scope :with_group, ->(group) { where(group_id: group.id) }
scope :with_user, ->(user) { where(user_id: user.id) }
after_create :notify_create
after_update :notify_update
validates :group_access, inclusion: { in: UsersGroup.group_access_roles.values }, presence: true
validates :user_id, presence: true
validates :group_id, presence: true
validates :user_id, uniqueness: { scope: [:group_id], message: "already exists in group" }
delegate :name, :username, :email, to: :user, prefix: true
def access_field
group_access
end
def notify_create
notification_service.new_group_member(self)
end
def notify_update
if group_access_changed?
notification_service.update_group_member(self)
end
end
def notification_service
NotificationService.new
end
end

152
app/models/users_project.rb
View file

@ -1,152 +0,0 @@
# == Schema Information
#
# Table name: users_projects
#
# id :integer not null, primary key
# user_id :integer not null
# project_id :integer not null
# created_at :datetime
# updated_at :datetime
# project_access :integer default(0), not null
# notification_level :integer default(3), not null
#
class UsersProject < ActiveRecord::Base
include Gitlab::ShellAdapter
include Notifiable
include Gitlab::Access
belongs_to :user
belongs_to :project
validates :user, presence: true
validates :user_id, uniqueness: { scope: [:project_id], message: "already exists in project" }
validates :project_access, inclusion: { in: Gitlab::Access.values }, presence: true
validates :project, presence: true
delegate :name, :username, :email, to: :user, prefix: true
scope :guests, -> { where(project_access: GUEST) }
scope :reporters, -> { where(project_access: REPORTER) }
scope :developers, -> { where(project_access: DEVELOPER) }
scope :masters, -> { where(project_access: MASTER) }
scope :in_project, ->(project) { where(project_id: project.id) }
scope :in_projects, ->(projects) { where(project_id: projects.map { |p| p.id }) }
scope :with_user, ->(user) { where(user_id: user.id) }
after_create :post_create_hook
after_update :post_update_hook
after_destroy :post_destroy_hook
class << self
# Add users to project teams with passed access option
#
# access can be an integer representing a access code
# or symbol like :master representing role
#
# Ex.
# add_users_into_projects(
# project_ids,
# user_ids,
# UsersProject::MASTER
# )
#
# add_users_into_projects(
# project_ids,
# user_ids,
# :master
# )
#
def add_users_into_projects(project_ids, user_ids, access)
project_access = if roles_hash.has_key?(access)
roles_hash[access]
elsif roles_hash.values.include?(access.to_i)
access
else
raise "Non valid access"
end
UsersProject.transaction do
project_ids.each do |project_id|
user_ids.each do |user_id|
users_project = UsersProject.new(project_access: project_access, user_id: user_id)
users_project.project_id = project_id
users_project.save
end
end
end
true
rescue
false
end
def truncate_teams(project_ids)
UsersProject.transaction do
users_projects = UsersProject.where(project_id: project_ids)
users_projects.each do |users_project|
users_project.destroy
end
end
true
rescue
false
end
def truncate_team project
truncate_teams [project.id]
end
def roles_hash
Gitlab::Access.sym_options
end
def access_roles
Gitlab::Access.options
end
end
def access_field
project_access
end
def owner?
project.owner == user
end
def post_create_hook
Event.create(
project_id: self.project.id,
action: Event::JOINED,
author_id: self.user.id
)
notification_service.new_team_member(self) unless owner?
system_hook_service.execute_hooks_for(self, :create)
end
def post_update_hook
notification_service.update_team_member(self) if self.project_access_changed?
end
def post_destroy_hook
Event.create(
project_id: self.project.id,
action: Event::LEFT,
author_id: self.user.id
)
system_hook_service.execute_hooks_for(self, :destroy)
end
def notification_service
NotificationService.new
end
def system_hook_service
SystemHooksService.new
end
end

16
app/services/notification_service.rb
View file

@ -158,19 +158,19 @@ class NotificationService
end
def new_team_member(users_project)
mailer.project_access_granted_email(users_project.id)
mailer.access_level_granted_email(users_project.id)
end
def update_team_member(users_project)
mailer.project_access_granted_email(users_project.id)
mailer.access_level_granted_email(users_project.id)
end
def new_group_member(users_group)
mailer.group_access_granted_email(users_group.id)
mailer.access_level_granted_email(users_group.id)
end
def update_group_member(users_group)
mailer.group_access_granted_email(users_group.id)
mailer.access_level_granted_email(users_group.id)
end
def project_was_moved(project)
@ -199,7 +199,7 @@ class NotificationService
end
def users_project_notification(project, notification_level=nil)
project_members = project.users_projects
project_members = project.project_members
if notification_level
project_members.where(notification_level: notification_level).pluck(:user_id)
@ -210,7 +210,7 @@ class NotificationService
def users_group_notification(project, notification_level)
if project.group
project.group.users_groups.where(notification_level: notification_level).pluck(:user_id)
project.group.group_members.where(notification_level: notification_level).pluck(:user_id)
else
[]
end
@ -267,10 +267,10 @@ class NotificationService
users.reject do |user|
next user.notification.disabled? unless project
tm = project.users_projects.find_by(user_id: user.id)
tm = project.project_members.find_by(user_id: user.id)
if !tm && project.group
tm = project.group.users_groups.find_by(user_id: user.id)
tm = project.group.group_members.find_by(user_id: user.id)
end
# reject users who globally disabled notification and has no membership

5
app/services/projects/create_service.rb
View file

@ -42,10 +42,7 @@ module Projects
system_hook_service.execute_hooks_for(@project, :create)
unless @project.group
@project.users_projects.create(
project_access: UsersProject::MASTER,
user: current_user
)
@project.team << [current_user, :master]
end
@project.update_column(:last_activity_at, @project.created_at)

2
app/services/projects/fork_service.rb
View file

@ -27,7 +27,7 @@ module Projects
#First save the DB entries as they can be rolled back if the repo fork fails
project.build_forked_project_link(forked_to_project_id: project.id, forked_from_project_id: @from_project.id)
if project.save
project.users_projects.create(project_access: UsersProject::MASTER, user: current_user)
project.team << [current_user, :master]
end
#Now fork the repo
unless gitlab_shell.fork_repository(@from_project.path_with_namespace, project.namespace.path)

6
app/services/system_hooks_service.rb
View file

@ -50,14 +50,14 @@ class SystemHooksService
email: model.email,
user_id: model.id
})
when UsersProject
when ProjectMember
data.merge!({
project_name: model.project.name,
project_path: model.project.path,
project_id: model.project_id,
user_name: model.user.name,
user_email: model.user.email,
project_access: model.human_access,
access_level: model.human_access,
project_visibility: Project.visibility_levels.key(model.project.visibility_level_field).downcase
})
end
@ -65,7 +65,7 @@ class SystemHooksService
def build_event_name(model, event)
case model
when UsersProject
when ProjectMember
return "user_add_to_team" if event == :create
return "user_remove_from_team" if event == :destroy
else

4
app/views/admin/groups/show.html.haml
View file

@ -62,7 +62,7 @@
%div
= users_select_tag(:user_ids, multiple: true)
%div.prepend-top-10
= select_tag :group_access, options_for_select(UsersGroup.group_access_roles), class: "project-access-select select2"
= select_tag :access_level, options_for_select(GroupMember.access_level_roles), class: "project-access-select select2"
%hr
= submit_tag 'Add users into group', class: "btn btn-create"
.panel.panel-default
@ -70,7 +70,7 @@
%h3.panel-title
Members
%span.badge
#{@group.users_groups.count}
#{@group.group_members.count}
%ul.well-list.group-users-list
- @members.each do |member|
- user = member.user

4
app/views/admin/projects/show.html.haml
View file

@ -95,7 +95,7 @@
.panel.panel-default
.panel-heading
%strong #{@group.name}
group members (#{@group.users_groups.count})
group members (#{@group.group_members.count})
.pull-right
= link_to admin_group_path(@group), class: 'btn btn-small' do
%i.icon-edit
@ -117,7 +117,7 @@
%ul.well-list.team_members
- @project_members.each do |users_project|
- user = users_project.user
%li.users_project
%li.project_member
.list-item-name
%strong
= link_to user.name, admin_user_path(user)

8
app/views/admin/users/show.html.haml
View file

@ -159,13 +159,13 @@
= render 'users/profile', user: @user
#groups.tab-pane
- if @user.users_groups.present?
- if @user.group_members.present?
.panel.panel-default
.panel-heading Groups:
%ul.well-list
- @user.users_groups.each do |user_group|
- @user.group_members.each do |user_group|
- group = user_group.group
%li.users_group
%li.group_member
%span{class: ("list-item-name" unless user_group.owner?)}
%strong= link_to group.name, admin_group_path(group)
.pull-right
@ -197,7 +197,7 @@
%ul.well-list
- @joined_projects.sort_by(&:name_with_namespace).each do |project|
- tm = project.team.find_tm(@user.id)
%li.users_project
%li.project_member
.list-item-name
= link_to admin_project_path(project), class: dom_class(project) do
= project.name_with_namespace

4
app/views/groups/_new_group_member.html.haml
View file

@ -4,8 +4,8 @@
.col-sm-10= users_select_tag(:user_ids, multiple: true, class: 'input-large')
.form-group
= f.label :group_access, "Group Access", class: 'control-label'
.col-sm-10= select_tag :group_access, options_for_select(UsersGroup.group_access_roles, @users_group.group_access), class: "project-access-select select2"
= f.label :access_level, "Group Access", class: 'control-label'
.col-sm-10= select_tag :access_level, options_for_select(GroupMember.access_level_roles, @users_group.access_level), class: "project-access-select select2"
.form-actions
= f.submit 'Add users into group', class: "btn btn-create"

2
app/views/profiles/notifications/_settings.html.haml
View file

@ -6,7 +6,7 @@
= notification_icon(notification)
%span.str-truncated
- if membership.kind_of? UsersGroup
- if membership.kind_of? GroupMember
= link_to membership.group.name, membership.group
- else
= link_to_project(membership.project)

4
app/views/projects/team_members/_form.html.haml
View file

@ -16,8 +16,8 @@
%p 2. Set access level for them
.form-group
= f.label :project_access, "Project Access", class: 'control-label'
.col-sm-10= select_tag :project_access, options_for_select(Gitlab::Access.options, @user_project_relation.project_access), class: "project-access-select select2"
= f.label :access_level, "Project Access", class: 'control-label'
.col-sm-10= select_tag :access_level, options_for_select(Gitlab::Access.options, @user_project_relation.access_level), class: "project-access-select select2"
.form-actions
= f.submit 'Add users', class: "btn btn-create"

4
app/views/projects/team_members/_group_members.html.haml
View file

@ -1,4 +1,4 @@
- group_users_count = @group.users_groups.count
- group_users_count = @group.group_members.count
.panel.panel-default
.panel-heading
%strong #{@group.name}
@ -7,7 +7,7 @@
= link_to members_group_path(@group), class: 'btn btn-small' do
%i.icon-edit
%ul.well-list
- @group.users_groups.order('group_access DESC').limit(20).each do |member|
- @group.group_members.order('access_level DESC').limit(20).each do |member|
= render 'users_groups/users_group', member: member, show_controls: false
- if group_users_count > 20
%li

2
app/views/projects/team_members/_team_member.html.haml
View file

@ -5,7 +5,7 @@
- unless @project.personal? && user == current_user
.pull-left
= form_for(member, as: :team_member, url: project_team_member_path(@project, member.user)) do |f|
= f.select :project_access, options_for_select(UsersProject.access_roles, member.project_access), {}, class: "medium project-access-select span2 trigger-submit"
= f.select :access_level, options_for_select(ProjectMember.access_roles, member.access_level), {}, class: "medium project-access-select span2 trigger-submit"
&nbsp;
= link_to project_team_member_path(@project, user), data: { confirm: remove_from_project_team_message(@project, user)}, method: :delete, class: "btn-tiny btn btn-remove", title: 'Remove user from team' do
%i.icon-minus.icon-white

2
app/views/users_groups/_users_group.html.haml
View file

@ -27,5 +27,5 @@
.edit-member.hide.js-toggle-content
= form_for [@group, member], remote: true do |f|
.alert.prepend-top-20
= f.select :group_access, options_for_select(UsersGroup.group_access_roles, member.group_access)
= f.select :access_level, options_for_select(GroupMember.access_level_roles, member.access_level)
= f.submit 'Save', class: 'btn btn-save btn-small'

6
config/application.rb
View file

@ -12,7 +12,11 @@ module Gitlab
# -- all .rb files in that directory are automatically loaded.
# Custom directories with classes and modules you want to be autoloadable.
config.autoload_paths += %W(#{config.root}/lib #{config.root}/app/finders #{config.root}/app/models/concerns #{config.root}/app/models/project_services)
config.autoload_paths += %W(#{config.root}/lib
#{config.root}/app/finders
#{config.root}/app/models/concerns
#{config.root}/app/models/project_services
#{config.root}/app/models/members)
# Only load the plugins named here, in the order given (default is alphabetical).
# :all can be used as a placeholder for all plugins not explicitly named.

8
lib/api/entities.rb
View file

@ -54,7 +54,7 @@ module API
class ProjectMember < UserBasic
expose :project_access, as: :access_level do |user, options|
options[:project].users_projects.find_by(user_id: user.id).project_access
options[:project].project_members.find_by(user_id: user.id).project_access
end
end
@ -68,7 +68,7 @@ module API
class GroupMember < UserBasic
expose :group_access, as: :access_level do |user, options|
options[:group].users_groups.find_by(user_id: user.id).group_access
options[:group].group_members.find_by(user_id: user.id).group_access
end
end
@ -182,12 +182,12 @@ module API
class ProjectWithAccess < Project
expose :permissions do
expose :project_access, using: Entities::ProjectAccess do |project, options|
project.users_projects.find_by(user_id: options[:user].id)
project.project_members.find_by(user_id: options[:user].id)
end
expose :group_access, using: Entities::GroupAccess do |project, options|
if project.group
project.group.users_groups.find_by(user_id: options[:user].id)
project.group.group_members.find_by(user_id: options[:user].id)
end
end
end

8
lib/api/groups.rb
View file

@ -104,7 +104,7 @@ module API
# GET /groups/:id/members
get ":id/members" do
group = find_group(params[:id])
members = group.users_groups
members = group.group_members
users = (paginate members).collect(&:user)
present users, with: Entities::GroupMember, group: group
end
@ -123,11 +123,11 @@ module API
render_api_error!("Wrong access level", 422)
end
group = find_group(params[:id])
if group.users_groups.find_by(user_id: params[:user_id])
if group.group_members.find_by(user_id: params[:user_id])
render_api_error!("Already exists", 409)
end
group.add_users([params[:user_id]], params[:access_level])
member = group.users_groups.find_by(user_id: params[:user_id])
member = group.group_members.find_by(user_id: params[:user_id])
present member.user, with: Entities::GroupMember, group: group
end
@ -141,7 +141,7 @@ module API
# DELETE /groups/:id/members/:user_id
delete ":id/members/:user_id" do
group = find_group(params[:id])
member = group.users_groups.find_by(user_id: params[:user_id])
member = group.group_members.find_by(user_id: params[:user_id])
if member.nil?
render_api_error!("404 Not Found - user_id:#{params[:user_id]} not a member of group #{group.name}",404)
else

6
lib/api/project_members.rb
View file

@ -56,7 +56,7 @@ module API
# either the user is already a team member or a new one
team_member = user_project.team_member_by_id(params[:user_id])
if team_member.nil?
team_member = user_project.users_projects.new(
team_member = user_project.project_members.new(
user_id: params[:user_id],
project_access: params[:access_level]
)
@ -82,7 +82,7 @@ module API
authorize! :admin_project, user_project
required_attributes! [:access_level]
team_member = user_project.users_projects.find_by(user_id: params[:user_id])
team_member = user_project.project_members.find_by(user_id: params[:user_id])
not_found!("User can not be found") if team_member.nil?
if team_member.update_attributes(project_access: params[:access_level])
@ -102,7 +102,7 @@ module API
# DELETE /projects/:id/members/:user_id
delete ":id/members/:user_id" do
authorize! :admin_project, user_project
team_member = user_project.users_projects.find_by(user_id: params[:user_id])
team_member = user_project.project_members.find_by(user_id: params[:user_id])
unless team_member.nil?
team_member.destroy
else

4
lib/gitlab/access.rb
View file

@ -16,6 +16,10 @@ module Gitlab
options.values
end
def all_values
options_with_owner.values
end
def options
{
"Guest" => GUEST,

12
lib/tasks/gitlab/bulk_add_permission.rake
View file

@ -7,10 +7,10 @@ namespace :gitlab do
projects_ids = Project.pluck(:id)
puts "Importing #{user_ids.size} users into #{projects_ids.size} projects"
UsersProject.add_users_into_projects(projects_ids, user_ids, UsersProject::DEVELOPER)
ProjectMember.add_users_into_projects(projects_ids, user_ids, ProjectMember::DEVELOPER)
puts "Importing #{admin_ids.size} admins into #{projects_ids.size} projects"
UsersProject.add_users_into_projects(projects_ids, admin_ids, UsersProject::MASTER)
ProjectMember.add_users_into_projects(projects_ids, admin_ids, ProjectMember::MASTER)
end
desc "GITLAB | Add a specific user to all projects (as a developer)"
@ -18,7 +18,7 @@ namespace :gitlab do
user = User.find_by(email: args.email)
project_ids = Project.pluck(:id)
puts "Importing #{user.email} users into #{project_ids.size} projects"
UsersProject.add_users_into_projects(project_ids, Array.wrap(user.id), UsersProject::DEVELOPER)
ProjectMember.add_users_into_projects(project_ids, Array.wrap(user.id), ProjectMember::DEVELOPER)
end
desc "GITLAB | Add all users to all groups (admin users are added as owners)"
@ -30,8 +30,8 @@ namespace :gitlab do
puts "Importing #{user_ids.size} users into #{groups.size} groups"
puts "Importing #{admin_ids.size} admins into #{groups.size} groups"
groups.each do |group|
group.add_users(user_ids, UsersGroup::DEVELOPER)
group.add_users(admin_ids, UsersGroup::OWNER)
group.add_users(user_ids, GroupMember::DEVELOPER)
group.add_users(admin_ids, GroupMember::OWNER)
end
end
@ -41,7 +41,7 @@ namespace :gitlab do
groups = Group.all
puts "Importing #{user.email} users into #{groups.size} groups"
groups.each do |group|
group.add_users(Array.wrap(user.id), UsersGroup::DEVELOPER)
group.add_users(Array.wrap(user.id), GroupMember::DEVELOPER)
end
end
end

6
lib/tasks/gitlab/check.rake
View file

@ -195,12 +195,12 @@ namespace :gitlab do
end
def check_orphaned_users_groups
print "Database contains orphaned UsersGroups? ... "
if UsersGroup.where("user_id not in (select id from users)").count > 0
print "Database contains orphaned GroupMembers? ... "
if GroupMember.where("user_id not in (select id from users)").count > 0
puts "yes".red
try_fixing_it(
"You can delete the orphaned records using something along the lines of:",
sudo_gitlab("bundle exec rails runner -e production 'UsersGroup.where(\"user_id NOT IN (SELECT id FROM users)\").delete_all'")
sudo_gitlab("bundle exec rails runner -e production 'GroupMember.where(\"user_id NOT IN (SELECT id FROM users)\").delete_all'")
)
else
puts "no".green

2
spec/factories.rb
View file

@ -42,7 +42,7 @@ FactoryGirl.define do
factory :users_project do
user
project
project_access { UsersProject::MASTER }
project_access { ProjectMember::MASTER }
end
factory :issue do

2
spec/factories/users_groups.rb
View file

@ -13,7 +13,7 @@
FactoryGirl.define do
factory :users_group do
group_access { UsersGroup::OWNER }
group_access { GroupMember::OWNER }
group
user
end

2
spec/helpers/gitlab_markdown_helper_spec.rb
View file

@ -12,7 +12,7 @@ describe GitlabMarkdownHelper do
let(:issue) { create(:issue, project: project) }
let(:merge_request) { create(:merge_request, source_project: project, target_project: project) }
let(:snippet) { create(:project_snippet, project: project) }
let(:member) { project.users_projects.where(user_id: user).first }
let(:member) { project.project_members.where(user_id: user).first }
before do
# Helper expects a @project instance variable

29
spec/models/users_group_spec.rb → spec/models/group_member_spec.rb
View file

@ -13,30 +13,7 @@
require 'spec_helper'
describe UsersGroup do
describe "Associations" do
it { should belong_to(:group) }
it { should belong_to(:user) }
end
describe "Mass assignment" do
end
describe "Validation" do
let!(:users_group) { create(:users_group) }
it { should validate_presence_of(:user_id) }
it { should validate_uniqueness_of(:user_id).scoped_to(:group_id).with_message(/already exists/) }
it { should validate_presence_of(:group_id) }
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
describe GroupMember do
context 'notification' do
describe "#after_create" do
it "should send email to user" do
@ -55,12 +32,12 @@ describe UsersGroup do
it "should send email to user" do
@membership.should_receive(:notification_service)
@membership.update_attribute(:group_access, UsersGroup::MASTER)
@membership.update_attribute(:group_access, GroupMember::MASTER)
end
it "does not send an email when the access level has not changed" do
@membership.should_not_receive(:notification_service)
@membership.update_attribute(:group_access, UsersGroup::OWNER)
@membership.update_attribute(:group_access, GroupMember::OWNER)
end
end
end

16
spec/models/group_spec.rb
View file

@ -39,26 +39,26 @@ describe Group do
describe :add_users do
let(:user) { create(:user) }
before { group.add_user(user, UsersGroup::MASTER) }
before { group.add_user(user, GroupMember::MASTER) }
it { group.users_groups.masters.map(&:user).should include(user) }
it { group.group_members.masters.map(&:user).should include(user) }
end
describe :add_users do
let(:user) { create(:user) }
before { group.add_users([user.id], UsersGroup::GUEST) }
before { group.add_users([user.id], GroupMember::GUEST) }
it "should update the group permission" do
group.users_groups.guests.map(&:user).should include(user)
group.add_users([user.id], UsersGroup::DEVELOPER)
group.users_groups.developers.map(&:user).should include(user)
group.users_groups.guests.map(&:user).should_not include(user)
group.group_members.guests.map(&:user).should include(user)
group.add_users([user.id], GroupMember::DEVELOPER)
group.group_members.developers.map(&:user).should include(user)
group.group_members.guests.map(&:user).should_not include(user)
end
end
describe :avatar_type do
let(:user) { create(:user) }
before { group.add_user(user, UsersGroup::MASTER) }
before { group.add_user(user, GroupMember::MASTER) }
it "should be true if avatar is image" do
group.update_attribute(:avatar, 'uploads/avatar.png')

5
spec/models/members_spec.rb
View file

@ -12,4 +12,9 @@ describe Member do
it { should validate_presence_of(:source) }
it { should ensure_inclusion_of(:access_level).in_array(Gitlab::Access.values) }
end
describe "Delegate methods" do
it { should respond_to(:user_name) }
it { should respond_to(:user_email) }
end
end

14
spec/models/note_spec.rb
View file

@ -321,8 +321,8 @@ describe Note do
describe :read do
before do
@p1.users_projects.create(user: @u2, project_access: UsersProject::GUEST)
@p2.users_projects.create(user: @u3, project_access: UsersProject::GUEST)
@p1.project_members.create(user: @u2, project_access: ProjectMember::GUEST)
@p2.project_members.create(user: @u3, project_access: ProjectMember::GUEST)
end
it { @abilities.allowed?(@u1, :read_note, @p1).should be_false }
@ -332,8 +332,8 @@ describe Note do
describe :write do
before do
@p1.users_projects.create(user: @u2, project_access: UsersProject::DEVELOPER)
@p2.users_projects.create(user: @u3, project_access: UsersProject::DEVELOPER)
@p1.project_members.create(user: @u2, project_access: ProjectMember::DEVELOPER)
@p2.project_members.create(user: @u3, project_access: ProjectMember::DEVELOPER)
end
it { @abilities.allowed?(@u1, :write_note, @p1).should be_false }
@ -343,9 +343,9 @@ describe Note do
describe :admin do
before do
@p1.users_projects.create(user: @u1, project_access: UsersProject::REPORTER)
@p1.users_projects.create(user: @u2, project_access: UsersProject::MASTER)
@p2.users_projects.create(user: @u3, project_access: UsersProject::MASTER)
@p1.project_members.create(user: @u1, project_access: ProjectMember::REPORTER)
@p1.project_members.create(user: @u2, project_access: ProjectMember::MASTER)
@p2.project_members.create(user: @u3, project_access: ProjectMember::MASTER)
end
it { @abilities.allowed?(@u1, :admin_note, @p1).should be_false }

31
spec/models/users_project_spec.rb → spec/models/project_member_spec.rb
View file

@ -13,30 +13,7 @@
require 'spec_helper'
describe UsersProject do
describe "Associations" do
it { should belong_to(:project) }
it { should belong_to(:user) }
end
describe "Mass assignment" do
end
describe "Validation" do
let!(:users_project) { create(:users_project) }
it { should validate_presence_of(:user) }
it { should validate_uniqueness_of(:user_id).scoped_to(:project_id).with_message(/already exists/) }
it { should validate_presence_of(:project) }
it { should ensure_inclusion_of(:project_access).in_array(UsersProject.access_roles.values) }
end
describe "Delegate methods" do
it { should respond_to(:user_name) }
it { should respond_to(:user_email) }
end
describe ProjectMember do
describe :import_team do
before do
@abilities = Six.new
@ -78,10 +55,10 @@ describe UsersProject do
@user_1 = create :user
@user_2 = create :user
UsersProject.add_users_into_projects(
ProjectMember.add_users_into_projects(
[@project_1.id, @project_2.id],
[@user_1.id, @user_2.id],
UsersProject::MASTER
ProjectMember::MASTER
)
end
@ -104,7 +81,7 @@ describe UsersProject do
@project_1.team << [ @user_1, :developer]
@project_2.team << [ @user_2, :reporter]
UsersProject.truncate_teams([@project_1.id, @project_2.id])
ProjectMember.truncate_teams([@project_1.id, @project_2.id])
end
it { @project_1.users.should be_empty }

16
spec/models/project_security_spec.rb
View file

@ -30,7 +30,7 @@ describe Project do
describe "Guest Rules" do
before do
@p1.users_projects.create(project: @p1, user: @u2, project_access: UsersProject::GUEST)
@p1.project_members.create(project: @p1, user: @u2, project_access: ProjectMember::GUEST)
end
it "should allow for project user any guest actions" do
@ -42,7 +42,7 @@ describe Project do
describe "Report Rules" do
before do
@p1.users_projects.create(project: @p1, user: @u2, project_access: UsersProject::REPORTER)
@p1.project_members.create(project: @p1, user: @u2, project_access: ProjectMember::REPORTER)
end
it "should allow for project user any report actions" do
@ -54,8 +54,8 @@ describe Project do
describe "Developer Rules" do
before do
@p1.users_projects.create(project: @p1, user: @u2, project_access: UsersProject::REPORTER)
@p1.users_projects.create(project: @p1, user: @u3, project_access: UsersProject::DEVELOPER)
@p1.project_members.create(project: @p1, user: @u2, project_access: ProjectMember::REPORTER)
@p1.project_members.create(project: @p1, user: @u3, project_access: ProjectMember::DEVELOPER)
end
it "should deny for developer master-specific actions" do
@ -73,8 +73,8 @@ describe Project do
describe "Master Rules" do
before do
@p1.users_projects.create(project: @p1, user: @u2, project_access: UsersProject::DEVELOPER)
@p1.users_projects.create(project: @p1, user: @u3, project_access: UsersProject::MASTER)
@p1.project_members.create(project: @p1, user: @u2, project_access: ProjectMember::DEVELOPER)
@p1.project_members.create(project: @p1, user: @u3, project_access: ProjectMember::MASTER)
end
it "should deny for developer master-specific actions" do
@ -92,8 +92,8 @@ describe Project do
describe "Admin Rules" do
before do
@p1.users_projects.create(project: @p1, user: @u2, project_access: UsersProject::DEVELOPER)
@p1.users_projects.create(project: @p1, user: @u3, project_access: UsersProject::MASTER)
@p1.project_members.create(project: @p1, user: @u2, project_access: ProjectMember::DEVELOPER)
@p1.project_members.create(project: @p1, user: @u3, project_access: ProjectMember::MASTER)
end
it "should deny for masters admin-specific actions" do

2
spec/models/system_hook_spec.rb
View file

@ -58,7 +58,7 @@ describe SystemHook do
user = create(:user)
project = create(:project)
project.team << [user, :master]
project.users_projects.destroy_all
project.project_members.destroy_all
WebMock.should have_requested(:post, @system_hook.url).with(body: /user_remove_from_team/).once
end
end

2
spec/models/user_spec.rb
View file

@ -182,7 +182,7 @@ describe User do
@group = create :group
@group.add_owner(@user)
@group.add_user(@user2, UsersGroup::OWNER)
@group.add_user(@user2, GroupMember::OWNER)
end
it { @user2.several_namespaces?.should be_true }

4
spec/requests/api/branches_spec.rb
View file

@ -7,8 +7,8 @@ describe API::API, api: true do
let(:user) { create(:user) }
let(:user2) { create(:user) }
let!(:project) { create(:project, creator_id: user.id) }
let!(:master) { create(:users_project, user: user, project: project, project_access: UsersProject::MASTER) }
let!(:guest) { create(:users_project, user: user2, project: project, project_access: UsersProject::GUEST) }
let!(:master) { create(:users_project, user: user, project: project, project_access: ProjectMember::MASTER) }
let!(:guest) { create(:users_project, user: user2, project: project, project_access: ProjectMember::GUEST) }
let!(:branch_name) { 'feature' }
let!(:branch_sha) { '0b4bc9a49b562e85de7cc9e834518ea6828729b9' }

4
spec/requests/api/commits_spec.rb
View file

@ -6,8 +6,8 @@ describe API::API, api: true do
let(:user) { create(:user) }
let(:user2) { create(:user) }
let!(:project) { create(:project, creator_id: user.id) }
let!(:master) { create(:users_project, user: user, project: project, project_access: UsersProject::MASTER) }
let!(:guest) { create(:users_project, user: user2, project: project, project_access: UsersProject::GUEST) }
let!(:master) { create(:users_project, user: user, project: project, project_access: ProjectMember::MASTER) }
let!(:guest) { create(:users_project, user: user2, project: project, project_access: ProjectMember::GUEST) }
before { project.team << [user, :reporter] }

36
spec/requests/api/groups_spec.rb
View file

@ -174,10 +174,10 @@ describe API::API, api: true do
let(:guest) { create(:user) }
let!(:group_with_members) do
group = create(:group)
group.add_users([reporter.id], UsersGroup::REPORTER)
group.add_users([developer.id], UsersGroup::DEVELOPER)
group.add_users([master.id], UsersGroup::MASTER)
group.add_users([guest.id], UsersGroup::GUEST)
group.add_users([reporter.id], GroupMember::REPORTER)
group.add_users([developer.id], GroupMember::DEVELOPER)
group.add_users([master.id], GroupMember::MASTER)
group.add_users([guest.id], GroupMember::GUEST)
group
end
let!(:group_no_members) { create(:group) }
@ -195,11 +195,11 @@ describe API::API, api: true do
response.status.should == 200
json_response.should be_an Array
json_response.size.should == 5
json_response.find { |e| e['id']==owner.id }['access_level'].should == UsersGroup::OWNER
json_response.find { |e| e['id']==reporter.id }['access_level'].should == UsersGroup::REPORTER
json_response.find { |e| e['id']==developer.id }['access_level'].should == UsersGroup::DEVELOPER
json_response.find { |e| e['id']==master.id }['access_level'].should == UsersGroup::MASTER
json_response.find { |e| e['id']==guest.id }['access_level'].should == UsersGroup::GUEST
json_response.find { |e| e['id']==owner.id }['access_level'].should == GroupMember::OWNER
json_response.find { |e| e['id']==reporter.id }['access_level'].should == GroupMember::REPORTER
json_response.find { |e| e['id']==developer.id }['access_level'].should == GroupMember::DEVELOPER
json_response.find { |e| e['id']==master.id }['access_level'].should == GroupMember::MASTER
json_response.find { |e| e['id']==guest.id }['access_level'].should == GroupMember::GUEST
end
end
@ -213,29 +213,29 @@ describe API::API, api: true do
describe "POST /groups/:id/members" do
context "when not a member of the group" do
it "should not add guest as member of group_no_members when adding being done by person outside the group" do
post api("/groups/#{group_no_members.id}/members", reporter), user_id: guest.id, access_level: UsersGroup::MASTER
post api("/groups/#{group_no_members.id}/members", reporter), user_id: guest.id, access_level: GroupMember::MASTER
response.status.should == 403
end
end
context "when a member of the group" do
it "should return ok and add new member" do
count_before=group_no_members.users_groups.count
count_before=group_no_members.group_members.count
new_user = create(:user)
post api("/groups/#{group_no_members.id}/members", owner), user_id: new_user.id, access_level: UsersGroup::MASTER
post api("/groups/#{group_no_members.id}/members", owner), user_id: new_user.id, access_level: GroupMember::MASTER
response.status.should == 201
json_response['name'].should == new_user.name
json_response['access_level'].should == UsersGroup::MASTER
group_no_members.users_groups.count.should == count_before + 1
json_response['access_level'].should == GroupMember::MASTER
group_no_members.group_members.count.should == count_before + 1
end
it "should return error if member already exists" do
post api("/groups/#{group_with_members.id}/members", owner), user_id: master.id, access_level: UsersGroup::MASTER
post api("/groups/#{group_with_members.id}/members", owner), user_id: master.id, access_level: GroupMember::MASTER
response.status.should == 409
end
it "should return a 400 error when user id is not given" do
post api("/groups/#{group_no_members.id}/members", owner), access_level: UsersGroup::MASTER
post api("/groups/#{group_no_members.id}/members", owner), access_level: GroupMember::MASTER
response.status.should == 400
end
@ -262,10 +262,10 @@ describe API::API, api: true do
context "when a member of the group" do
it "should delete guest's membership of group" do
count_before=group_with_members.users_groups.count
count_before=group_with_members.group_members.count
delete api("/groups/#{group_with_members.id}/members/#{guest.id}", owner)
response.status.should == 200
group_with_members.users_groups.count.should == count_before - 1
group_with_members.group_members.count.should == count_before - 1
end
it "should return a 404 error when user id is not known" do

34
spec/requests/api/project_members_spec.rb
View file

@ -6,8 +6,8 @@ describe API::API, api: true do
let(:user2) { create(:user) }
let(:user3) { create(:user) }
let(:project) { create(:project, creator_id: user.id, namespace: user.namespace) }
let(:users_project) { create(:users_project, user: user, project: project, project_access: UsersProject::MASTER) }
let(:users_project2) { create(:users_project, user: user3, project: project, project_access: UsersProject::DEVELOPER) }
let(:users_project) { create(:users_project, user: user, project: project, project_access: ProjectMember::MASTER) }
let(:users_project2) { create(:users_project, user: user3, project: project, project_access: ProjectMember::DEVELOPER) }
describe "GET /projects/:id/members" do
before { users_project }
@ -42,7 +42,7 @@ describe API::API, api: true do
get api("/projects/#{project.id}/members/#{user.id}", user)
response.status.should == 200
json_response['username'].should == user.username
json_response['access_level'].should == UsersProject::MASTER
json_response['access_level'].should == ProjectMember::MASTER
end
it "should return a 404 error if user id not found" do
@ -55,29 +55,29 @@ describe API::API, api: true do
it "should add user to project team" do
expect {
post api("/projects/#{project.id}/members", user), user_id: user2.id,
access_level: UsersProject::DEVELOPER
}.to change { UsersProject.count }.by(1)
access_level: ProjectMember::DEVELOPER
}.to change { ProjectMember.count }.by(1)
response.status.should == 201
json_response['username'].should == user2.username
json_response['access_level'].should == UsersProject::DEVELOPER
json_response['access_level'].should == ProjectMember::DEVELOPER
end
it "should return a 201 status if user is already project member" do
post api("/projects/#{project.id}/members", user), user_id: user2.id,
access_level: UsersProject::DEVELOPER
access_level: ProjectMember::DEVELOPER
expect {
post api("/projects/#{project.id}/members", user), user_id: user2.id,
access_level: UsersProject::DEVELOPER
}.not_to change { UsersProject.count }.by(1)
access_level: ProjectMember::DEVELOPER
}.not_to change { ProjectMember.count }.by(1)
response.status.should == 201
json_response['username'].should == user2.username
json_response['access_level'].should == UsersProject::DEVELOPER
json_response['access_level'].should == ProjectMember::DEVELOPER
end
it "should return a 400 error when user id is not given" do
post api("/projects/#{project.id}/members", user), access_level: UsersProject::MASTER
post api("/projects/#{project.id}/members", user), access_level: ProjectMember::MASTER
response.status.should == 400
end
@ -96,14 +96,14 @@ describe API::API, api: true do
before { users_project2 }
it "should update project team member" do
put api("/projects/#{project.id}/members/#{user3.id}", user), access_level: UsersProject::MASTER
put api("/projects/#{project.id}/members/#{user3.id}", user), access_level: ProjectMember::MASTER
response.status.should == 200
json_response['username'].should == user3.username
json_response['access_level'].should == UsersProject::MASTER
json_response['access_level'].should == ProjectMember::MASTER
end
it "should return a 404 error if user_id is not found" do
put api("/projects/#{project.id}/members/1234", user), access_level: UsersProject::MASTER
put api("/projects/#{project.id}/members/1234", user), access_level: ProjectMember::MASTER
response.status.should == 404
end
@ -125,14 +125,14 @@ describe API::API, api: true do
it "should remove user from project team" do
expect {
delete api("/projects/#{project.id}/members/#{user3.id}", user)
}.to change { UsersProject.count }.by(-1)
}.to change { ProjectMember.count }.by(-1)
end
it "should return 200 if team member is not part of a project" do
delete api("/projects/#{project.id}/members/#{user3.id}", user)
expect {
delete api("/projects/#{project.id}/members/#{user3.id}", user)
}.to_not change { UsersProject.count }.by(1)
}.to_not change { ProjectMember.count }.by(1)
end
it "should return 200 if team member already removed" do
@ -144,7 +144,7 @@ describe API::API, api: true do
it "should return 200 OK when the user was not member" do
expect {
delete api("/projects/#{project.id}/members/1000000", user)
}.to change { UsersProject.count }.by(0)
}.to change { ProjectMember.count }.by(0)
response.status.should == 200
json_response['message'].should == "Access revoked"
json_response['id'].should == 1000000

4
spec/requests/api/projects_spec.rb
View file

@ -8,8 +8,8 @@ describe API::API, api: true do
let(:admin) { create(:admin) }
let(:project) { create(:project, creator_id: user.id, namespace: user.namespace) }
let(:snippet) { create(:project_snippet, author: user, project: project, title: 'example') }
let(:users_project) { create(:users_project, user: user, project: project, project_access: UsersProject::MASTER) }
let(:users_project2) { create(:users_project, user: user3, project: project, project_access: UsersProject::DEVELOPER) }
let(:users_project) { create(:users_project, user: user, project: project, project_access: ProjectMember::MASTER) }
let(:users_project2) { create(:users_project, user: user3, project: project, project_access: ProjectMember::DEVELOPER) }
describe "GET /projects" do
before { project }

4
spec/requests/api/repositories_spec.rb
View file

@ -8,8 +8,8 @@ describe API::API, api: true do
let(:user) { create(:user) }
let(:user2) { create(:user) }
let!(:project) { create(:project, creator_id: user.id) }
let!(:master) { create(:users_project, user: user, project: project, project_access: UsersProject::MASTER) }
let!(:guest) { create(:users_project, user: user2, project: project, project_access: UsersProject::GUEST) }
let!(:master) { create(:users_project, user: user, project: project, project_access: ProjectMember::MASTER) }
let!(:guest) { create(:users_project, user: user2, project: project, project_access: ProjectMember::GUEST) }
before { project.team << [user, :reporter] }

6
spec/services/notification_service_spec.rb
View file

@ -64,12 +64,12 @@ describe NotificationService do
before do
note.project.namespace_id = group.id
note.project.group.add_user(@u_watcher, UsersGroup::MASTER)
note.project.group.add_user(@u_watcher, GroupMember::MASTER)
note.project.save
user_project = note.project.users_projects.find_by_user_id(@u_watcher.id)
user_project = note.project.project_members.find_by_user_id(@u_watcher.id)
user_project.notification_level = Notification::N_PARTICIPATING
user_project.save
user_group = note.project.group.users_groups.find_by_user_id(@u_watcher.id)
user_group = note.project.group.group_members.find_by_user_id(@u_watcher.id)
user_group.notification_level = Notification::N_GLOBAL
user_group.save
end