Fixes Project#shared_versions for descendants sharing (#465).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3130 e93f8b46-1217-0410-a6f0-8f06a7374b81
pull/351/head
Jean-Philippe Lang 15 years ago
parent 84bf891bb5
commit 5266e328c0
  1. 4
      app/models/project.rb
  2. 50
      test/unit/project_test.rb

@ -340,8 +340,8 @@ class Project < ActiveRecord::Base
" OR (#{Project.table_name}.status = #{Project::STATUS_ACTIVE} AND (" +
" #{Version.table_name}.sharing = 'system'" +
" OR (#{Project.table_name}.lft >= #{root.lft} AND #{Project.table_name}.rgt <= #{root.rgt} AND #{Version.table_name}.sharing = 'tree')" +
" OR (#{Project.table_name}.lft < #{lft} AND #{Project.table_name}.rgt > #{rgt} AND #{Version.table_name}.sharing = 'hierarchy')" +
" OR (#{Project.table_name}.lft > #{lft} AND #{Project.table_name}.rgt < #{rgt} AND #{Version.table_name}.sharing IN ('hierarchy', 'descendants'))" +
" OR (#{Project.table_name}.lft < #{lft} AND #{Project.table_name}.rgt > #{rgt} AND #{Version.table_name}.sharing IN ('hierarchy', 'descendants'))" +
" OR (#{Project.table_name}.lft > #{lft} AND #{Project.table_name}.rgt < #{rgt} AND #{Version.table_name}.sharing = 'hierarchy')" +
"))")
end

@ -317,6 +317,56 @@ class ProjectTest < ActiveSupport::TestCase
assert_equal [1,2], parent.rolled_up_trackers.collect(&:id)
end
def test_shared_versions_none_sharing
p = Project.find(5)
v = Version.create!(:name => 'none_sharing', :project => p, :sharing => 'none')
assert p.shared_versions.include?(v)
assert !p.children.first.shared_versions.include?(v)
assert !p.root.shared_versions.include?(v)
assert !p.siblings.first.shared_versions.include?(v)
assert !p.root.siblings.first.shared_versions.include?(v)
end
def test_shared_versions_descendants_sharing
p = Project.find(5)
v = Version.create!(:name => 'descendants_sharing', :project => p, :sharing => 'descendants')
assert p.shared_versions.include?(v)
assert p.children.first.shared_versions.include?(v)
assert !p.root.shared_versions.include?(v)
assert !p.siblings.first.shared_versions.include?(v)
assert !p.root.siblings.first.shared_versions.include?(v)
end
def test_shared_versions_hierarchy_sharing
p = Project.find(5)
v = Version.create!(:name => 'hierarchy_sharing', :project => p, :sharing => 'hierarchy')
assert p.shared_versions.include?(v)
assert p.children.first.shared_versions.include?(v)
assert p.root.shared_versions.include?(v)
assert !p.siblings.first.shared_versions.include?(v)
assert !p.root.siblings.first.shared_versions.include?(v)
end
def test_shared_versions_tree_sharing
p = Project.find(5)
v = Version.create!(:name => 'tree_sharing', :project => p, :sharing => 'tree')
assert p.shared_versions.include?(v)
assert p.children.first.shared_versions.include?(v)
assert p.root.shared_versions.include?(v)
assert p.siblings.first.shared_versions.include?(v)
assert !p.root.siblings.first.shared_versions.include?(v)
end
def test_shared_versions_system_sharing
p = Project.find(5)
v = Version.create!(:name => 'system_sharing', :project => p, :sharing => 'system')
assert p.shared_versions.include?(v)
assert p.children.first.shared_versions.include?(v)
assert p.root.shared_versions.include?(v)
assert p.siblings.first.shared_versions.include?(v)
assert p.root.siblings.first.shared_versions.include?(v)
end
def test_shared_versions
parent = Project.find(1)

Loading…
Cancel
Save