refactored drafts which are now identified by a draft_id on the node rather than by guessing it. i was really that close to make that mistake again.

4 files changed, 79 insertions, 13 deletions

diff --git a/test/fixtures/nodes.yml b/test/fixtures/nodes.yml
index 642d937..8574c1b 100644
--- a/test/fixtures/nodes.yml
+++ b/test/fixtures/nodes.yml
@@ -14,6 +14,7 @@ first_child:
   lft: 2
   rgt: 3
   parent_id: 1
+  draft_id: 100
   slug: first_child
   unique_name: first_child
 
@@ -22,6 +23,7 @@ second_child:
   lft: 4
   rgt: 5
   parent_id: 1
+  draft_id: 101
   slug: second_child
   unique_name: second_child
   
@@ -30,5 +32,6 @@ third_child:
   lft: 6
   rgt: 7
   parent_id: 1
+  draft_id: 102
   slug: third_child
   unique_name: third_child
\ No newline at end of file
diff --git a/test/fixtures/pages.yml b/test/fixtures/pages.yml
index 614b9a6..8171b38 100644
--- a/test/fixtures/pages.yml
+++ b/test/fixtures/pages.yml
@@ -8,4 +8,19 @@ one:
 two:
   id: 2
   revision: 1
+  node_id: 4
+  
+draft1:
+  id: 100
+  revision: 1
+  node_id: 2
+  
+draft2:
+  id: 101
+  revision: 1
+  node_id: 3
+  
+draft3:
+  id: 102
+  revision: 1
   node_id: 4
\ No newline at end of file
diff --git a/test/functional/nodes_controller_test.rb b/test/functional/nodes_controller_test.rb
index d6d579d..85f151a 100644
--- a/test/functional/nodes_controller_test.rb
+++ b/test/functional/nodes_controller_test.rb
@@ -1,8 +1,21 @@
 require 'test_helper'
 
 class NodesControllerTest < ActionController::TestCase
-  # Replace this with your real tests.
-  test "the truth" do
-    assert true
+
+  include AuthenticatedTestHelper
+
+  def test_get_index
+    login_as :quentin
+    get :index
+    assert_response :success
+  end
+  
+  def test_update_a_draft
+    test_node = Node.create! :slug => "test_node"
+    test_node.move_to_child_of Node.root
+    
+    login_as :quentin
+    
+    
   end
 end
diff --git a/test/unit/node_test.rb b/test/unit/node_test.rb
index 549cccd..2558ca3 100644
--- a/test/unit/node_test.rb
+++ b/test/unit/node_test.rb
@@ -11,6 +11,21 @@ class NodeTest < ActiveSupport::TestCase
     @user2 = User.create :login => 'show', :email => "f@b.com", :password => 'foobar', :password_confirmation => 'foobar'
   end
   
+  def test_returning_existing_drafts
+    test_node = Node.create! :slug => "test_node"
+    test_node.move_to_child_of Node.root
+    
+    assert_not_nil test_node.draft
+    assert_equal 1, test_node.pages.length
+    assert_nil test_node.draft.user
+    
+    3.times do 
+      test_node.find_or_create_draft @user1
+    end
+    
+    assert_equal 1, test_node.pages.length
+  end
+  
   def test_user_gets_assigned_to_unlocked_draft
     assert_not_nil @first_child.draft
     assert_nil @first_child.draft.user
@@ -34,6 +49,7 @@ class NodeTest < ActiveSupport::TestCase
   end
   
   def test_publish_draft_on_a_node_without_a_draft_returns_nil
+    
     assert @first_child.publish_draft!
     assert_nil @first_child.publish_draft!
   end
@@ -127,34 +143,34 @@ class NodeTest < ActiveSupport::TestCase
   
   def test_order_of_pages_by_revision
     # This test should make sure the order is the same on different db's
-
-    one   = @second_child.pages.create :title => "one"
+    # Remember, there is already an empty draft
     two   = @second_child.pages.create :title => "two"
     three = @second_child.pages.create :title => "three"
+    four  = @second_child.pages.create :title => "four"
 
     @second_child.pages.reload
 
-    assert_equal [1,2,3], @second_child.pages.map { |x| x.revision }
+    assert_equal [1,2,3,4], @second_child.pages.map { |x| x.revision }
   end
   
   def test_behavior_of_acts_as_list
-    one   = @second_child.pages.create :title => "one"
     two   = @second_child.pages.create :title => "two"
     three = @second_child.pages.create :title => "three"
+    four  = @second_child.pages.create :title => "four"
 
-    assert_equal 1, one.revision
     assert_equal 2, two.revision
     assert_equal 3, three.revision
+    assert_equal 4, four.revision
 
-    assert_equal three, @second_child.pages.last
+    assert_equal four, @second_child.pages.last
 
-    assert one.move_to_bottom
+    assert two.move_to_bottom
 
-    one.reload; two.reload; three.reload;
+    two.reload; three.reload; four.reload;
 
-    assert_equal 3, one.revision
-    assert_equal 1, two.revision
+    assert_equal 4, two.revision
     assert_equal 2, three.revision
+    assert_equal 3, four.revision
   end
   
   def test_retrieving_page_current
@@ -201,4 +217,23 @@ class NodeTest < ActiveSupport::TestCase
     page = Node.find_page("updates/2008/foo", 2)
     assert_equal "Version 2", page.title
   end
+  
+  # Thats a lengthy test to make sure everything works as it should, it was 
+  # created during a bug hunt
+  def test_creating_new_draft
+    test_node = Node.create! :slug => "test_node"
+    test_node.move_to_child_of Node.root
+    test_node.draft.user = @user1
+    test_node.save
+    assert test_node.publish_draft!
+    test_node.reload
+    assert_equal 1, test_node.pages.length
+    assert_not_nil test_node.head
+    assert_nil test_node.draft
+    test_node.find_or_create_draft @user1
+    test_node.reload
+    assert_equal 2, test_node.pages.length
+    assert_not_nil test_node.draft
+    assert test_node.head != test_node.draft
+  end
 end