Support for subforums (#3831).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10142 e93f8b46-1217-0410-a6f0-8f06a7374b81

3 files changed, 128 insertions, 0 deletions

diff --git a/test/functional/boards_controller_test.rb b/test/functional/boards_controller_test.rb
index 1c4ac67d4..8afe4f748 100644
--- a/test/functional/boards_controller_test.rb
+++ b/test/functional/boards_controller_test.rb
@@ -98,6 +98,23 @@ class BoardsControllerTest < ActionController::TestCase
     get :new, :project_id => 1
     assert_response :success
     assert_template 'new'
+
+    assert_select 'select[name=?]', 'board[parent_id]' do
+      assert_select 'option', (Project.find(1).boards.size + 1)
+      assert_select 'option[value=]', :text => ''
+      assert_select 'option[value=1]', :text => 'Help'
+    end
+  end
+
+  def test_new_without_project_boards
+    Project.find(1).boards.delete_all
+    @request.session[:user_id] = 2
+
+    get :new, :project_id => 1
+    assert_response :success
+    assert_template 'new'
+
+    assert_select 'select[name=?]', 'board[parent_id]', 0
   end
 
   def test_create
@@ -111,6 +128,16 @@ class BoardsControllerTest < ActionController::TestCase
     assert_equal 'Testing board creation', board.description
   end
 
+  def test_create_with_parent
+    @request.session[:user_id] = 2
+    assert_difference 'Board.count' do
+      post :create, :project_id => 1, :board => { :name => 'Testing', :description => 'Testing', :parent_id => 2}
+    end
+    assert_redirected_to '/projects/ecookbook/settings/boards'
+    board = Board.first(:order => 'id DESC')
+    assert_equal Board.find(2), board.parent
+  end
+
   def test_create_with_failure
     @request.session[:user_id] = 2
     assert_no_difference 'Board.count' do
@@ -127,6 +154,18 @@ class BoardsControllerTest < ActionController::TestCase
     assert_template 'edit'
   end
 
+  def test_edit_with_parent
+    board = Board.generate!(:project_id => 1, :parent_id => 2)
+    @request.session[:user_id] = 2
+    get :edit, :project_id => 1, :id => board.id
+    assert_response :success
+    assert_template 'edit'
+
+    assert_select 'select[name=?]', 'board[parent_id]' do
+      assert_select 'option[value=2][selected=selected]'
+    end
+  end
+
   def test_update
     @request.session[:user_id] = 2
     assert_no_difference 'Board.count' do
diff --git a/test/object_helpers.rb b/test/object_helpers.rb
index a2d7c958f..85c6d139c 100644
--- a/test/object_helpers.rb
+++ b/test/object_helpers.rb
@@ -99,4 +99,15 @@ module ObjectHelpers
     source.save!
     source
   end
+
+  def Board.generate!(attributes={})
+    @generated_board_name ||= 'Forum 0'
+    @generated_board_name.succ!
+    board = Board.new(attributes)
+    board.name = @generated_board_name if board.name.blank?
+    board.description = @generated_board_name if board.description.blank?
+    yield board if block_given?
+    board.save!
+    board
+  end
 end
diff --git a/test/unit/board_test.rb b/test/unit/board_test.rb
index 86a8e6468..0326cbfb5 100644
--- a/test/unit/board_test.rb
+++ b/test/unit/board_test.rb
@@ -1,3 +1,22 @@
+# encoding: utf-8
+#
+# Redmine - project management software
+# Copyright (C) 2006-2012  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
 require File.expand_path('../../test_helper', __FILE__)
 
 class BoardTest < ActiveSupport::TestCase
@@ -21,6 +40,54 @@ class BoardTest < ActiveSupport::TestCase
     assert_equal @project.boards.size, board.position
   end
 
+  def test_parent_should_be_in_same_project
+    board = Board.new(:project_id => 3, :name => 'Test', :description => 'Test', :parent_id => 1)
+    assert !board.save
+    assert_include "Parent forum is invalid", board.errors.full_messages
+  end
+
+  def test_valid_parents_should_not_include_self_nor_a_descendant
+    board1 = Board.generate!(:project_id => 3)
+    board2 = Board.generate!(:project_id => 3, :parent => board1)
+    board3 = Board.generate!(:project_id => 3, :parent => board2)
+    board4 = Board.generate!(:project_id => 3)
+
+    assert_equal [board4], board1.reload.valid_parents.sort_by(&:id)
+    assert_equal [board1, board4], board2.reload.valid_parents.sort_by(&:id)
+    assert_equal [board1, board2, board4], board3.reload.valid_parents.sort_by(&:id)
+    assert_equal [board1, board2, board3], board4.reload.valid_parents.sort_by(&:id)
+  end
+
+  def test_position_should_be_assigned_with_parent_scope
+    parent1 = Board.generate!(:project_id => 3)
+    parent2 = Board.generate!(:project_id => 3)
+    child1 = Board.generate!(:project_id => 3, :parent => parent1)
+    child2 = Board.generate!(:project_id => 3, :parent => parent1)
+
+    assert_equal 1, parent1.reload.position
+    assert_equal 1, child1.reload.position
+    assert_equal 2, child2.reload.position
+    assert_equal 2, parent2.reload.position
+  end
+
+  def test_board_tree_should_yield_boards_with_level
+    parent1 = Board.generate!(:project_id => 3)
+    parent2 = Board.generate!(:project_id => 3)
+    child1 = Board.generate!(:project_id => 3, :parent => parent1)
+    child2 = Board.generate!(:project_id => 3, :parent => parent1)
+    child3 = Board.generate!(:project_id => 3, :parent => child1)
+
+    tree = Board.board_tree(Project.find(3).boards)
+
+    assert_equal [
+      [parent1, 0],
+      [child1,  1],
+      [child3,  2],
+      [child2,  1],
+      [parent2, 0]
+    ], tree
+  end
+
   def test_destroy
     board = Board.find(1)
     assert_difference 'Message.count', -6 do
@@ -32,4 +99,15 @@ class BoardTest < ActiveSupport::TestCase
     end
     assert_equal 0, Message.count(:conditions => {:board_id => 1})
   end
+
+  def test_destroy_should_nullify_children
+    parent = Board.generate!(:project => @project)
+    child = Board.generate!(:project => @project, :parent => parent)
+    assert_equal parent, child.parent
+
+    assert parent.destroy
+    child.reload
+    assert_nil child.parent
+    assert_nil child.parent_id
+  end
 end