Download as
Browse Code »

Commit 1c5a393c959303839566a5fdbef9fa1bfaea2f63

Authored by Dmitriy Zaporozhets
2 parents 52ae0544 b8502cba
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #3406 from docwhat/in_projects 

Fixed UsersProject.in_projects
Showing 2 changed files with 21 additions and 2 deletions   Show diff stats
app/models/users_project.rb
  Diff comments   View file @1c5a393
@@ -38,7 +38,7 @@ class UsersProject < ActiveRecord::Base @@ -38,7 +38,7 @@ class UsersProject < ActiveRecord::Base
38 scope :masters, -> { where(project_access: MASTER) } 38 scope :masters, -> { where(project_access: MASTER) }
39 39
40 scope :in_project, ->(project) { where(project_id: project.id) } 40 scope :in_project, ->(project) { where(project_id: project.id) }
41 - scope :in_projects, ->(projects) { where(project_id: project_ids) } 41 + scope :in_projects, ->(projects) { where(project_id: projects.map { |p| p.id }) }
42 scope :with_user, ->(user) { where(user_id: user.id) } 42 scope :with_user, ->(user) { where(user_id: user.id) }
43 43
44 class << self 44 class << self
spec/models/user_team_spec.rb
  Diff comments   View file @1c5a393
@@ -14,5 +14,24 @@ @@ -14,5 +14,24 @@
14 require 'spec_helper' 14 require 'spec_helper'
15 15
16 describe UserTeam do 16 describe UserTeam do
17 - pending "add some examples to (or delete) #{__FILE__}" 17 + let(:team) { FactoryGirl.create :user_team }
  18 +
  19 + context ".add_member" do
  20 + let(:user) { FactoryGirl.create :user }
  21 +
  22 + it "should work" do
  23 + team.add_member(user, UsersProject::DEVELOPER, false)
  24 + team.members.should include(user)
  25 + end
  26 + end
  27 +
  28 + context ".remove_member" do
  29 + let(:user) { FactoryGirl.create :user }
  30 + before { team.add_member(user, UsersProject::DEVELOPER, false) }
  31 +
  32 + it "should work" do
  33 + team.remove_member(user)
  34 + team.members.should_not include(user)
  35 + end
  36 + end
18 end 37 end