Commit 1c5a393c authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #3406 from docwhat/in_projects

Fixed UsersProject.in_projects
parents 52ae0544 b8502cba
...@@ -38,7 +38,7 @@ class UsersProject < ActiveRecord::Base ...@@ -38,7 +38,7 @@ class UsersProject < ActiveRecord::Base
scope :masters, -> { where(project_access: MASTER) } scope :masters, -> { where(project_access: MASTER) }
scope :in_project, ->(project) { where(project_id: project.id) } scope :in_project, ->(project) { where(project_id: project.id) }
scope :in_projects, ->(projects) { where(project_id: project_ids) } scope :in_projects, ->(projects) { where(project_id: projects.map { |p| p.id }) }
scope :with_user, ->(user) { where(user_id: user.id) } scope :with_user, ->(user) { where(user_id: user.id) }
class << self class << self
......
...@@ -14,5 +14,24 @@ ...@@ -14,5 +14,24 @@
require 'spec_helper' require 'spec_helper'
describe UserTeam do describe UserTeam do
pending "add some examples to (or delete) #{__FILE__}" let(:team) { FactoryGirl.create :user_team }
context ".add_member" do
let(:user) { FactoryGirl.create :user }
it "should work" do
team.add_member(user, UsersProject::DEVELOPER, false)
team.members.should include(user)
end
end
context ".remove_member" do
let(:user) { FactoryGirl.create :user }
before { team.add_member(user, UsersProject::DEVELOPER, false) }
it "should work" do
team.remove_member(user)
team.members.should_not include(user)
end
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment