Merged bug fixes r3412 to r3414.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.9-stable@3432 e93f8b46-1217-0410-a6f0-8f06a7374b81

test/fixtures/wiki_contents.yml

@@ -71,4 +71,28 @@ wiki_contents_006:
   version: 1
   author_id: 1
   comments: 
+wiki_contents_007: 
+  text: This is a child page
+  updated_on: 2007-03-08 00:18:07 +01:00
+  page_id: 7
+  id: 7
+  version: 1
+  author_id: 1
+  comments: 
+wiki_contents_008: 
+  text: This is a parent page
+  updated_on: 2007-03-08 00:18:07 +01:00
+  page_id: 8
+  id: 8
+  version: 1
+  author_id: 1
+  comments: 
+wiki_contents_009: 
+  text: This is a child page
+  updated_on: 2007-03-08 00:18:07 +01:00
+  page_id: 9
+  id: 9
+  version: 1
+  author_id: 1
+  comments: 
   

test/fixtures/wiki_pages.yml

@@ -41,4 +41,25 @@ wiki_pages_006:
   wiki_id: 1
   protected: false
   parent_id: 2
+wiki_pages_007: 
+  created_on: 2007-03-08 00:18:07 +01:00
+  title: Child_page_1
+  id: 7
+  wiki_id: 2
+  protected: false
+  parent_id: 8
+wiki_pages_008: 
+  created_on: 2007-03-08 00:18:07 +01:00
+  title: Parent_page
+  id: 8
+  wiki_id: 2
+  protected: false
+  parent_id: 
+wiki_pages_009: 
+  created_on: 2007-03-08 00:18:07 +01:00
+  title: Child_page_2
+  id: 9
+  wiki_id: 2
+  protected: false
+  parent_id: 8
   

test/functional/issue_relations_controller_test.rb

@@ -40,6 +40,24 @@ class IssueRelationsControllerTest < ActionController::TestCase
     end
   end
   
+  def test_new_should_accept_id_with_hash
+    assert_difference 'IssueRelation.count' do
+      @request.session[:user_id] = 3
+      post :new, :issue_id => 1, 
+                 :relation => {:issue_to_id => '#2', :relation_type => 'relates', :delay => ''}
+    end
+  end
+  
+  def test_new_should_not_break_with_non_numerical_id
+    assert_no_difference 'IssueRelation.count' do
+      assert_nothing_raised do
+        @request.session[:user_id] = 3
+        post :new, :issue_id => 1, 
+                   :relation => {:issue_to_id => 'foo', :relation_type => 'relates', :delay => ''}
+      end
+    end
+  end
+  
   def test_should_create_relations_with_visible_issues_only
     Setting.cross_project_issue_relations = '1'
     assert_nil Issue.visible(User.find(3)).find_by_id(4)

test/unit/project_test.rb

@@ -723,16 +723,24 @@ class ProjectTest < ActiveSupport::TestCase
       assert_equal "Start page", @project.wiki.start_page
     end
 
-    should "copy wiki pages and content" do
-      assert @project.copy(@source_project)
-
+    should "copy wiki pages and content with hierarchy" do
+      assert_difference 'WikiPage.count', @source_project.wiki.pages.size do
+        assert @project.copy(@source_project)
+      end
+      
       assert @project.wiki
-      assert_equal 1, @project.wiki.pages.length
+      assert_equal @source_project.wiki.pages.size, @project.wiki.pages.size
 
       @project.wiki.pages.each do |wiki_page|
         assert wiki_page.content
         assert !@source_project.wiki.pages.include?(wiki_page)
       end
+      
+      parent = @project.wiki.find_page('Parent_page')
+      child1 = @project.wiki.find_page('Child_page_1')
+      child2 = @project.wiki.find_page('Child_page_2')
+      assert_equal parent, child1.parent
+      assert_equal parent, child2.parent
     end
 
     should "copy issue categories" do