summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/controllers/nodes_controller_test.rb7
-rw-r--r--test/models/node_test.rb3
2 files changed, 8 insertions, 2 deletions
diff --git a/test/controllers/nodes_controller_test.rb b/test/controllers/nodes_controller_test.rb
index 030cff0..f3e04c2 100644
--- a/test/controllers/nodes_controller_test.rb
+++ b/test/controllers/nodes_controller_test.rb
@@ -101,7 +101,7 @@ class NodesControllerTest < ActionController::TestCase
101 assert_select("#page_body", "World") 101 assert_select("#page_body", "World")
102 102
103 node.reload 103 node.reload
104 assert_equal 2, node.pages.length 104 assert_equal 1, node.pages.length
105 assert_equal "Hello", node.find_or_create_draft( User.first ).title 105 assert_equal "Hello", node.find_or_create_draft( User.first ).title
106 assert_equal "World", node.find_or_create_draft( User.first ).body 106 assert_equal "World", node.find_or_create_draft( User.first ).body
107 end 107 end
@@ -291,6 +291,7 @@ class NodesControllerTest < ActionController::TestCase
291 get :edit, params: { :id => node.id } 291 get :edit, params: { :id => node.id }
292 assert_response :success 292 assert_response :success
293 293
294 put :update, params: { :id => node.id, :page => { :title => "updated" } }
294 put :publish, params: { :id => node.id } 295 put :publish, params: { :id => node.id }
295 296
296 node.reload 297 node.reload
@@ -303,6 +304,7 @@ class NodesControllerTest < ActionController::TestCase
303 node = create_node_with_published_page 304 node = create_node_with_published_page
304 get :edit, params: { :id => node.id } 305 get :edit, params: { :id => node.id }
305 306
307 put :update, params: { :id => node.id, :page => { :title => "updated" } }
306 put :publish, params: { :id => node.id } 308 put :publish, params: { :id => node.id }
307 309
308 node.reload 310 node.reload
@@ -324,7 +326,8 @@ class NodesControllerTest < ActionController::TestCase
324 assert_equal "quentin", node.head.user.login 326 assert_equal "quentin", node.head.user.login
325 327
326 login_as :aaron 328 login_as :aaron
327 get :edit, params: {:id => node.id } 329 get :edit, params: { :id => node.id }
330 put :update, params: { :id => node.id, :page => { :title => "updated" } }
328 331
329 node.reload 332 node.reload
330 assert_equal "quentin", node.head.user.login 333 assert_equal "quentin", node.head.user.login
diff --git a/test/models/node_test.rb b/test/models/node_test.rb
index 2953f8f..bdf556d 100644
--- a/test/models/node_test.rb
+++ b/test/models/node_test.rb
@@ -339,6 +339,9 @@ class NodeTest < ActiveSupport::TestCase
339 assert_equal head_revision, node.head.revision 339 assert_equal head_revision, node.head.revision
340 assert_nil node.autosave 340 assert_nil node.autosave
341 assert_equal 2, node.pages.count 341 assert_equal 2, node.pages.count
342 assert_equal node.head.user, node.draft.user
343 assert_equal @user1, node.draft.editor
344 assert_equal node.head.published_at, node.draft.published_at
342 end 345 end
343 346
344 test "autosave!, save_draft!, and lock_for_editing! raise LockedByAnotherUser for a second user" do 347 test "autosave!, save_draft!, and lock_for_editing! raise LockedByAnotherUser for a second user" do