12 files changed, 83 insertions, 154 deletions

diff --git a/app/models/node.rb b/app/models/node.rb
index 73eefd1..311c5c0 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -145,28 +145,6 @@ class Node < ApplicationRecord
     pairs
   end
 
-  def find_or_create_draft current_user
-    self.wipe_draft!
-    if draft && self.lock_owner == current_user
-      draft
-    elsif draft && self.lock_owner.nil?
-      lock_for! current_user
-      draft.user    = current_user if draft.user.nil?
-      draft.editor  = current_user
-      draft.save
-      draft
-    elsif draft && self.lock_owner != current_user
-      raise(
-        LockedByAnotherUser,
-        "Page is locked by another user who is working on it! " \
-        "Last modification: #{draft.updated_at.to_fs(:db)}"
-      )
-    else
-      lock_for! current_user
-      create_new_draft current_user
-    end
-  end
-
   def create_new_draft user
     empty_page        = self.pages.create!
     empty_page.user   = (self.head ? self.head.user : user)
@@ -249,35 +227,6 @@ class Node < ApplicationRecord
     self
   end
 
-  # Releases whatever's stale and abandoned; never anything actively in
-  # use. Three independent cases share one rule -- nothing is touched
-  # unless it's been sitting untouched for over a day:
-  #  - a lock held with no draft or autosave at all (the editor opened
-  #    the page and never actually wrote anything)
-  #  - a fresh autosave older than a day, never promoted to a draft
-  #  - a draft older than a day that's still identical to head
-  def wipe_draft!
-    return if self.autosave && self.autosave.updated_at > 1.day.ago
-
-    unless self.draft
-      return if self.autosave.nil? && self.locked? && self.updated_at > 1.day.ago
-      self.autosave&.destroy
-      self.autosave_id = nil
-      self.unlock!
-      self.save!
-      return
-    end
-    return unless self.head
-    return unless self.draft.updated_at < 1.day.ago
-    return if self.head.has_changes_to? self.draft
-
-    self.draft.destroy
-    self.draft_id = nil
-    self.unlock!
-    self.save!
-    self.reload
-  end
-
   def restore_revision! revision
     if page = self.pages.find_by_revision(revision)
       self.head = page
diff --git a/test/controllers/admin_controller_test.rb b/test/controllers/admin_controller_test.rb
index 00a51e2..cba4a59 100644
--- a/test/controllers/admin_controller_test.rb
+++ b/test/controllers/admin_controller_test.rb
@@ -17,7 +17,7 @@ class AdminControllerTest < ActionController::TestCase
 
   test "dashboard_search returns matching tags and nodes grouped separately" do
     node = Node.root.children.create!(:slug => "dashboard_search_test")
-    node.find_or_create_draft(User.find_by_login("aaron"))
+    find_or_create_draft(node, User.find_by_login("aaron"))
     node.draft.update(:title => "Biometrics Workshop")
     node.draft.tag_list = "biometrics-workshop"
     node.draft.save!
diff --git a/test/controllers/content_controller_test.rb b/test/controllers/content_controller_test.rb
index 9313783..e8bc55f 100644
--- a/test/controllers/content_controller_test.rb
+++ b/test/controllers/content_controller_test.rb
@@ -39,7 +39,7 @@ class ContentControllerTest < ActionController::TestCase
     fill_pages_with_content
 
     new_node = create_node_under_root "fnord"
-    draft = new_node.find_or_create_draft @user1
+    draft = find_or_create_draft(new_node, @user1)
     draft.body = '[aggregate tags="update" limit="20"]'
     draft.save
     new_node.publish_draft!
@@ -58,7 +58,7 @@ class ContentControllerTest < ActionController::TestCase
     fill_pages_with_content
     
     new_node = create_node_under_root "fnord"
-    draft = new_node.find_or_create_draft @user1
+    draft = find_or_create_draft(new_node, @user1)
     draft.body = '[aggregate tags="update" limit="20" partial="sidebar_title_only"]'
     draft.save
     new_node.publish_draft!
@@ -72,7 +72,7 @@ class ContentControllerTest < ActionController::TestCase
   
   def test_nonexistant_custom_template_defaults_to_standard_template
     new_node = create_node_under_root "fnord"
-    draft = new_node.find_or_create_draft @user1
+    draft = find_or_create_draft(new_node, @user1)
     draft.template_name = "huchibu"
     draft.save
     new_node.publish_draft!
@@ -84,7 +84,7 @@ class ContentControllerTest < ActionController::TestCase
   
   def test_custom_template_no_date_and_author
     new_node = create_node_under_root "fnord"
-    draft = new_node.find_or_create_draft @user1
+    draft = find_or_create_draft(new_node, @user1)
     draft.template_name = "no_date_and_author"
     draft.save
     new_node.publish_draft!
@@ -96,7 +96,7 @@ class ContentControllerTest < ActionController::TestCase
 
   def test_aggregator_without_fill
     new_node = create_node_under_root "fnord"
-    draft = new_node.find_or_create_draft @user1
+    draft = find_or_create_draft(new_node, @user1)
     draft.body = '<aggregate tags="xyzzy_unique_test_tag" limit="20" />'
     draft.save
     new_node.publish_draft!
@@ -114,13 +114,13 @@ class ContentControllerTest < ActionController::TestCase
     end
 
     def fill_pages_with_content
-      d1 = @first_child.find_or_create_draft @user1
+      d1 = find_or_create_draft(@first_child, @user1)
       d1.title = "one"
       d1.tag_list = "update"
       d1.save
       @first_child.publish_draft!
 
-      d2 = @second_child.find_or_create_draft @user1
+      d2 = find_or_create_draft(@second_child, @user1)
       d2.title = "two"
       d2.tag_list = "update"
       d2.save
diff --git a/test/controllers/nodes_controller_test.rb b/test/controllers/nodes_controller_test.rb
index 81e3f45..9da9514 100644
--- a/test/controllers/nodes_controller_test.rb
+++ b/test/controllers/nodes_controller_test.rb
@@ -89,7 +89,7 @@ class NodesControllerTest < ActionController::TestCase
 
     assert_equal 1, node.pages.length
 
-    draft = node.find_or_create_draft( User.first )
+    draft = find_or_create_draft(node, User.first)
     draft.title = "Hello"
     draft.body = "World"
     draft.save
@@ -102,8 +102,8 @@ class NodesControllerTest < ActionController::TestCase
 
     node.reload
     assert_equal 1, node.pages.length
-    assert_equal "Hello", node.find_or_create_draft( User.first ).title
-    assert_equal "World", node.find_or_create_draft( User.first ).body
+    assert_equal "Hello", find_or_create_draft(node, User.first).title
+    assert_equal "World", find_or_create_draft(node, User.first).body
   end
 
   test "editing a locked node raises LockedByAnotherUser Exception" do
@@ -228,7 +228,7 @@ class NodesControllerTest < ActionController::TestCase
   test "unlocking a locked node" do
     login_as :quentin
     node = create_node_with_published_page
-    node.find_or_create_draft User.first
+    find_or_create_draft(node, User.first)
 
     assert node.locked?
 
@@ -250,7 +250,7 @@ class NodesControllerTest < ActionController::TestCase
     Node.root.descendants.destroy_all
     login_as :quentin
     node = create_node_with_published_page
-    node.find_or_create_draft User.first
+    find_or_create_draft(node, User.first)
 
     other_node = Node.root.children.create( :slug => "other" )
 
@@ -274,7 +274,7 @@ class NodesControllerTest < ActionController::TestCase
     Node.root.descendants.destroy_all
     node  = create_node_with_published_page
     assert_equal "quentin", node.head.user.login
-    node.find_or_create_draft users(:quentin)
+    find_or_create_draft(node, users(:quentin))
     assert node.draft.valid?
     assert node.valid?
 
@@ -336,7 +336,7 @@ class NodesControllerTest < ActionController::TestCase
 
   test "unlocking and relocking changes editor if done by another user" do
     node  = create_node_with_published_page
-    draft = node.find_or_create_draft users(:quentin)
+    draft = find_or_create_draft(node, users(:quentin))
     assert_equal draft.user.login, draft.editor.login
     assert node.locked?
     node.unlock!
@@ -481,13 +481,13 @@ class NodesControllerTest < ActionController::TestCase
 
   test "chapters filters by kind, matching head or draft, and shows both by default" do
     erfa_node = Node.root.children.create!(:slug => "chapters_erfa_test")
-    erfa_node.find_or_create_draft(@user1)
+    find_or_create_draft(erfa_node, @user1)
     erfa_node.draft.tag_list = "erfa-detail"
     erfa_node.draft.save!
     erfa_node.publish_draft!
 
     chaostreff_node = Node.root.children.create!(:slug => "chapters_chaostreff_test")
-    chaostreff_node.find_or_create_draft(@user1)
+    find_or_create_draft(chaostreff_node, @user1)
     chaostreff_node.draft.tag_list = "chaostreff-detail"
     chaostreff_node.draft.save!
     chaostreff_node.publish_draft!
@@ -549,13 +549,13 @@ class NodesControllerTest < ActionController::TestCase
 
   test "tags path filters by an arbitrary raw tag, generalizing chapters" do
     presse_node = Node.root.children.create!(:slug => "tags_path_presse_test")
-    presse_node.find_or_create_draft(@user1)
+    find_or_create_draft(presse_node, @user1)
     presse_node.draft.tag_list = "pressemitteilung"
     presse_node.draft.save!
     presse_node.publish_draft!
 
     erfa_node = Node.root.children.create!(:slug => "tags_path_erfa_test")
-    erfa_node.find_or_create_draft(@user1)
+    find_or_create_draft(erfa_node, @user1)
     erfa_node.draft.tag_list = "erfa-detail"
     erfa_node.draft.save!
     erfa_node.publish_draft!
@@ -572,13 +572,13 @@ class NodesControllerTest < ActionController::TestCase
 
   test "tags path with multiple tags matches any of them, not all" do
     erfa_node = Node.root.children.create!(:slug => "tags_path_multi_erfa_test")
-    erfa_node.find_or_create_draft(@user1)
+    find_or_create_draft(erfa_node, @user1)
     erfa_node.draft.tag_list = "erfa-detail"
     erfa_node.draft.save!
     erfa_node.publish_draft!
 
     chaostreff_node = Node.root.children.create!(:slug => "tags_path_multi_chaostreff_test")
-    chaostreff_node.find_or_create_draft(@user1)
+    find_or_create_draft(chaostreff_node, @user1)
     chaostreff_node.draft.tag_list = "chaostreff-detail"
     chaostreff_node.draft.save!
     chaostreff_node.publish_draft!
diff --git a/test/controllers/revisions_controller_test.rb b/test/controllers/revisions_controller_test.rb
index e5726f7..96c6d6c 100644
--- a/test/controllers/revisions_controller_test.rb
+++ b/test/controllers/revisions_controller_test.rb
@@ -10,7 +10,7 @@ class RevisionsControllerTest < ActionController::TestCase
     draft = @node.draft
     draft.body = "first"
     @node.publish_draft!
-    @node.find_or_create_draft @user
+    find_or_create_draft(@node, @user)
     draft = @node.draft
     draft.update(:body => "second")
     @node.publish_draft!
@@ -103,7 +103,7 @@ class RevisionsControllerTest < ActionController::TestCase
 
   test "diffing head against draft by name" do
     login_as :quentin
-    @node.find_or_create_draft(@user)
+    find_or_create_draft(@node, @user)
     @node.draft.update(:body => "draft body")
 
     post(:diff, params: { :node_id => @node.id, :start_revision => "head", :end_revision => "draft" })
@@ -119,7 +119,7 @@ class RevisionsControllerTest < ActionController::TestCase
 
   test "diffing by name shows a clear comparison label instead of a misleading revision picker" do
     login_as :quentin
-    @node.find_or_create_draft(@user)
+    find_or_create_draft(@node, @user)
 
     post(:diff, params: { :node_id => @node.id, :start_revision => "head", :end_revision => "draft" })
     assert_response :success
@@ -130,7 +130,7 @@ class RevisionsControllerTest < ActionController::TestCase
 
   test "pair-switcher buttons carry their params as real hidden fields, not a query string" do
     login_as :quentin
-    @node.find_or_create_draft(@user)
+    find_or_create_draft(@node, @user)
     @node.lock_for_editing!(@user)
     @node.autosave!({ :body => "unsaved" }, @user)
 
@@ -142,7 +142,7 @@ class RevisionsControllerTest < ActionController::TestCase
 
   test "the view toggle is available even when comparing named layers" do
     login_as :quentin
-    @node.find_or_create_draft(@user)
+    find_or_create_draft(@node, @user)
 
     post(:diff, params: { :node_id => @node.id, :start_revision => "head", :end_revision => "draft" })
     assert_response :success
@@ -151,7 +151,7 @@ class RevisionsControllerTest < ActionController::TestCase
 
   test "diffing two revisions also shows tag, template, and asset changes" do
     login_as :quentin
-    @node.find_or_create_draft(@user)
+    find_or_create_draft(@node, @user)
     @node.draft.tag_list = "update"
     @node.draft.save!
 
@@ -175,7 +175,7 @@ class RevisionsControllerTest < ActionController::TestCase
     node.draft.save!
     node.publish_draft!
 
-    node.find_or_create_draft(@user)
+    find_or_create_draft(node, @user)
     Globalize.with_locale(:en) { node.draft.update!(:title => "Changed in English only") }
     node.draft.save!
 
@@ -191,7 +191,7 @@ class RevisionsControllerTest < ActionController::TestCase
     node.draft.save!
     node.publish_draft!
 
-    node.find_or_create_draft(@user)
+    find_or_create_draft(node, @user)
     Globalize.with_locale(:en) { node.draft.update!(:title => "English changed") }
     node.draft.save!
 
diff --git a/test/controllers/rss_controller_test.rb b/test/controllers/rss_controller_test.rb
index 7e28844..3f4b4fb 100644
--- a/test/controllers/rss_controller_test.rb
+++ b/test/controllers/rss_controller_test.rb
@@ -6,7 +6,7 @@ class RssControllerTest < ActionController::TestCase
     @user = User.create :login => 'rsstest', :email => 'rsstest@example.com',
                         :password => 'foobar', :password_confirmation => 'foobar'
     @node = Node.root.children.create! :slug => 'rss_test_node'
-    draft = @node.find_or_create_draft @user
+    draft = find_or_create_draft(@node, @user)
     draft.title = "RSS Update Article"
     draft.tag_list = "update"
     draft.save
diff --git a/test/controllers/shared_previews_controller_test.rb b/test/controllers/shared_previews_controller_test.rb
index 5f2d20d..4ebc785 100644
--- a/test/controllers/shared_previews_controller_test.rb
+++ b/test/controllers/shared_previews_controller_test.rb
@@ -13,7 +13,7 @@ class SharedPreviewsControllerTest < ActionController::TestCase
   test "renders the preview for a brand-new draft on an already-published node" do
     node = Node.root.children.create!(:slug => "shared_preview_published_node_test")
     node.publish_draft!
-    node.find_or_create_draft(User.first)
+    find_or_create_draft(node, User.first)
     node.draft.ensure_preview_token!
 
     get :show, params: { :token => node.draft.preview_token }
diff --git a/test/controllers/tags_controller_test.rb b/test/controllers/tags_controller_test.rb
index 95c0d31..b2d30c5 100644
--- a/test/controllers/tags_controller_test.rb
+++ b/test/controllers/tags_controller_test.rb
@@ -6,7 +6,7 @@ class TagsControllerTest < ActionController::TestCase
     @user = User.create :login => 'tagtest', :email => 'tagtest@example.com',
                         :password => 'foobar', :password_confirmation => 'foobar'
     @node = Node.root.children.create! :slug => 'tag_test_node'
-    draft = @node.find_or_create_draft @user
+    draft = find_or_create_draft(@node, @user)
     draft.title = "Tagged Article"
     draft.tag_list = "testtag"
     draft.save
diff --git a/test/models/event_test.rb b/test/models/event_test.rb
index e98605e..2a671b7 100644
--- a/test/models/event_test.rb
+++ b/test/models/event_test.rb
@@ -5,7 +5,7 @@ class EventTest < ActiveSupport::TestCase
   def setup
     Page.delete_all
     @cal_node       = Node.root.children.create! :slug => "calendar"
-    @draft          = @cal_node.find_or_create_draft User.first
+    @draft          = find_or_create_draft(@cal_node, User.first)
     @draft.title    = "99C3"
     @draft.abstract = "The 99th Chaos Comunication Congress"
     @draft.body     = "Its totally freakin awesome"
diff --git a/test/models/node_test.rb b/test/models/node_test.rb
index 91a4a6d..959387d 100644
--- a/test/models/node_test.rb
+++ b/test/models/node_test.rb
@@ -31,7 +31,7 @@ class NodeTest < ActiveSupport::TestCase
     assert_nil test_node.draft.user
     
     3.times do 
-      test_node.find_or_create_draft @user1
+      find_or_create_draft(test_node, @user1)
     end
     
     assert_equal 1, test_node.pages.length
@@ -40,7 +40,7 @@ class NodeTest < ActiveSupport::TestCase
   def test_user_gets_assigned_to_unlocked_draft
     assert_not_nil @first_child.draft
     assert_nil @first_child.draft.user
-    @first_child.find_or_create_draft @user1
+    find_or_create_draft(@first_child, @user1)
     assert_equal @user1, @first_child.lock_owner
   end
   
@@ -77,7 +77,7 @@ class NodeTest < ActiveSupport::TestCase
     
     @first_child.publish_draft!
     
-    draft1 = @first_child.find_or_create_draft(@user1)
+    draft1 = find_or_create_draft(@first_child, @user1)
     
     I18n.locale = :de
     assert_equal "Hallo",   draft1.title
@@ -109,15 +109,15 @@ class NodeTest < ActiveSupport::TestCase
   def test_find_or_create_draft_if_no_draft_exists
     node = Node.root.children.create :slug => "xyz"
     node.publish_draft!
-    assert_not_nil node.find_or_create_draft( @user1 )
+    assert_not_nil find_or_create_draft(node, @user1)
   end
 
   def test_find_or_create_draft_if_draft_exists_and_is_owned_by_user
     node = Node.root.children.create :slug => "xyz"
     node.publish_draft!
 
-    first_call  = node.find_or_create_draft @user1
-    second_call = node.find_or_create_draft @user1
+    first_call  = find_or_create_draft(node, @user1)
+    second_call = find_or_create_draft(node, @user1)
 
     assert_equal first_call, second_call
     assert_equal 2, node.pages.count
@@ -127,10 +127,10 @@ class NodeTest < ActiveSupport::TestCase
   def test_exception_if_draft_exists_but_locked_by_another_user
     node = Node.root.children.create :slug => "xyz"
     node.publish_draft!
-    node.find_or_create_draft @user1
+    find_or_create_draft(node, @user1)
     assert_equal @user1, node.lock_owner
     assert_raise(LockedByAnotherUser) do
-      node.find_or_create_draft @user2
+      find_or_create_draft(node, @user2)
     end
   end
   
@@ -222,7 +222,7 @@ class NodeTest < ActiveSupport::TestCase
     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
+    find_or_create_draft(test_node, @user1)
     test_node.reload
     assert_equal 2, test_node.pages.length
     assert_not_nil test_node.draft
@@ -232,7 +232,7 @@ class NodeTest < ActiveSupport::TestCase
   test "restoring a revision" do
     test_node = Node.root.children.create! :slug => "test_node"
     create_revisions( test_node, 3 )
-    test_node.find_or_create_draft @user1
+    find_or_create_draft(test_node, @user1)
     test_node.reload
     
     assert_equal 4, test_node.pages.count
@@ -250,7 +250,7 @@ class NodeTest < ActiveSupport::TestCase
     draft.user = users(:aaron)
     draft.save
     node.publish_draft!
-    new_draft = node.find_or_create_draft( users(:quentin) )
+    new_draft = find_or_create_draft(node, users(:quentin))
     assert_equal "aaron", new_draft.user.login
   end
   
@@ -261,7 +261,7 @@ class NodeTest < ActiveSupport::TestCase
     draft.user = users(:aaron)
     draft.save!
     node.publish_draft!
-    new_draft = node.find_or_create_draft( users(:quentin) )
+    new_draft = find_or_create_draft(node, users(:quentin))
     new_draft.user_id = users(:quentin).id
     new_draft.save
     node.publish_draft!
@@ -359,31 +359,6 @@ class NodeTest < ActiveSupport::TestCase
     assert_equal @user1, node.reload.lock_owner
   end
 
-  test "wipe_draft! leaves a fresh autosave and its lock untouched" do
-    node = create_node_with_published_page
-    node.lock_for_editing!(@user1)
-    node.autosave!({ :title => "still typing" }, @user1)
-
-    node.wipe_draft!
-    node.reload
-
-    assert_not_nil node.autosave
-    assert_equal @user1, node.lock_owner
-  end
-
-  test "wipe_draft! destroys a stale, orphaned autosave and releases its lock" do
-    node = create_node_with_published_page
-    node.lock_for_editing!(@user1)
-    node.autosave!({ :title => "abandoned mid-session" }, @user1)
-    node.autosave.update_column(:updated_at, 2.days.ago)
-
-    node.wipe_draft!
-    node.reload
-
-    assert_nil node.autosave
-    assert_nil node.lock_owner
-  end
-
   test "revert! is a safe no-op on a fresh node with only a draft" do
     node = create_node_with_draft
     node.lock_for_editing!(@user1)
@@ -473,7 +448,7 @@ class NodeTest < ActiveSupport::TestCase
   
   def create_revisions node, count
     count.times do
-      node.find_or_create_draft @user1
+      find_or_create_draft(node, @user1)
       node.publish_draft!
     end
   end
@@ -514,7 +489,7 @@ class NodeTest < ActiveSupport::TestCase
 
   test "editor_search matches a partial substring, not just a whole word" do
     node = Node.root.children.create!(:slug => "editor_search_substring_test")
-    node.find_or_create_draft(@user1)
+    find_or_create_draft(node, @user1)
     node.draft.update(:title => "Biometrics Conference")
     node.publish_draft!
 
@@ -530,7 +505,7 @@ class NodeTest < ActiveSupport::TestCase
 
   test "editor_search requires every word to match, but each word can match a different field" do
     node = Node.root.children.create!(:slug => "editor_search_multiword_test")
-    node.find_or_create_draft(@user1)
+    find_or_create_draft(node, @user1)
     node.draft.update(:title => "Backspace e.V. Bamberg", :abstract => "Spiegelgraben 41, 96052 Bamberg")
     node.publish_draft!
 
@@ -540,9 +515,9 @@ class NodeTest < ActiveSupport::TestCase
 
   test "drafts_and_autosaves without a user sorts by recency only" do
     older = Node.root.children.create!(:slug => "drafts_order_older")
-    older.find_or_create_draft(@user1)
+    find_or_create_draft(older, @user1)
     newer = Node.root.children.create!(:slug => "drafts_order_newer")
-    newer.find_or_create_draft(@user1)
+    find_or_create_draft(newer, @user1)
 
     result = Node.drafts_and_autosaves.to_a
     assert result.index(newer) < result.index(older)
@@ -564,7 +539,7 @@ class NodeTest < ActiveSupport::TestCase
 
   test "recently_changed includes a node whose head was recently published" do
     node = Node.root.children.create!(:slug => "recent_changed_published")
-    node.find_or_create_draft(@user1)
+    find_or_create_draft(node, @user1)
     node.autosave!({:title => "v1"}, @user1)
     node.save_draft!(@user1)
     node.publish_draft!
@@ -574,7 +549,7 @@ class NodeTest < ActiveSupport::TestCase
 
   test "recently_changed excludes a node only touched by locking or unlocking after an old publish" do
     node = Node.root.children.create!(:slug => "recent_changed_lock_only")
-    node.find_or_create_draft(@user1)
+    find_or_create_draft(node, @user1)
     node.autosave!({:title => "v1"}, @user1)
     node.save_draft!(@user1)
     node.publish_draft!
diff --git a/test/models/page_test.rb b/test/models/page_test.rb
index 24bc7c5..edb7c37 100644
--- a/test/models/page_test.rb
+++ b/test/models/page_test.rb
@@ -13,15 +13,15 @@ class PageTest < ActiveSupport::TestCase
     n2 = Node.root.children.create! :slug => "two"
     
     # get the drafts and assign a user to it
-    assert_not_nil d1 = n1.find_or_create_draft( @user1 )
-    assert_not_nil d3 = n2.find_or_create_draft( @user1 )
+    assert_not_nil d1 = find_or_create_draft(n1, @user1)
+    assert_not_nil d3 = find_or_create_draft(n2, @user1)
     
     # tag and double publish so we have 4 pages tagged with "update"
     d1.tag_list = "update"
     d1.save
     n1.publish_draft!
   
-    d2 = n1.find_or_create_draft @user1
+    d2 = find_or_create_draft(n1, @user1)
     n1.publish_draft!
     
     
@@ -29,7 +29,7 @@ class PageTest < ActiveSupport::TestCase
     d3.save
     n2.publish_draft!
   
-    d4 = n2.find_or_create_draft @user1
+    d4 = find_or_create_draft(n2, @user1)
     n2.publish_draft!
     
     # Set up two options hashes for the assertions
@@ -49,7 +49,7 @@ class PageTest < ActiveSupport::TestCase
   
   def test_before_save_rewrite_links_in_body
     n = Node.root.children.create :slug => "link_test"
-    d = n.find_or_create_draft @user1
+    d = find_or_create_draft(n, @user1)
     
     before = "<h1>Hello World</h1>\n" \
              "<a href=\"/club\" target=\"_blank\">Linkme</a>"
@@ -67,7 +67,7 @@ class PageTest < ActiveSupport::TestCase
   
   def test_before_save_rewrite_links_in_body_if_no_locale_prefix_present
     n = Node.root.children.create :slug => "link_test"
-    d = n.find_or_create_draft @user1
+    d = find_or_create_draft(n, @user1)
     
     before = "<h1>Hello World</h1>\n" \
              "<a href=\"/de/club\" target=\"_blank\">Linkme</a>"
@@ -85,7 +85,7 @@ class PageTest < ActiveSupport::TestCase
   
   def test_before_save_rewrite_links_skips_on_external_links
     n = Node.root.children.create :slug => "link_test"
-    d = n.find_or_create_draft @user1
+    d = find_or_create_draft(n, @user1)
     
     before = "<h1>Hello World</h1>\n" \
              "<a href=\"http://www.ccc.de/club\" target=\"_blank\">Linkme</a>"
@@ -145,7 +145,7 @@ class PageTest < ActiveSupport::TestCase
 
   test "a page scheduled for future publication is not yet public even after being published" do
     node = Node.root.children.create!(slug: "preview-scheduled-test")
-    draft = node.find_or_create_draft(@user1)
+    draft = find_or_create_draft(node, @user1)
     draft.title = "Scheduled test"
     draft.published_at = 1.day.from_now
     draft.save!
@@ -160,13 +160,13 @@ class PageTest < ActiveSupport::TestCase
 
   test "a superseded page is no longer the head, even though it was once published" do
     node = Node.root.children.create!(slug: "preview-superseded-test")
-    first_draft = node.find_or_create_draft(@user1)
+    first_draft = find_or_create_draft(node, @user1)
     first_draft.title = "First version"
     first_draft.save!
     first_token = first_draft.ensure_preview_token!
     node.publish_draft!
 
-    second_draft = node.find_or_create_draft(@user1)
+    second_draft = find_or_create_draft(node, @user1)
     second_draft.title = "Second version"
     second_draft.save!
     node.publish_draft!
@@ -229,12 +229,12 @@ class PageTest < ActiveSupport::TestCase
 
   def test_diff_against_inline_keeps_tags_and_marks_only_the_changed_word
     n = Node.root.children.create! :slug => "diff_against_test"
-    d = n.find_or_create_draft @user1
+    d = find_or_create_draft(n, @user1)
     d.title = "Old heading"
     d.save!
     n.publish_draft!
 
-    d2 = n.find_or_create_draft @user1
+    d2 = find_or_create_draft(n, @user1)
     d2.title = "New heading"
     d2.save!
 
@@ -246,12 +246,12 @@ class PageTest < ActiveSupport::TestCase
 
   def test_diff_against_side_by_side_returns_two_annotated_strings
     n = Node.root.children.create! :slug => "diff_against_sbs_test"
-    d = n.find_or_create_draft @user1
+    d = find_or_create_draft(n, @user1)
     d.title = "Old heading"
     d.save!
     n.publish_draft!
 
-    d2 = n.find_or_create_draft @user1
+    d2 = find_or_create_draft(n, @user1)
     d2.title = "New heading"
     d2.save!
 
@@ -263,12 +263,12 @@ class PageTest < ActiveSupport::TestCase
 
   test "diff_against handles an inserted paragraph split without corrupting the document" do
     n = Node.root.children.create! :slug => "paragraph_split_test"
-    d = n.find_or_create_draft @user1
+    d = find_or_create_draft(n, @user1)
     d.body = "<p>Der Vortragsraum ist ab 19 Uhr geöffnet, der Zugang erfolgt über den Hinterhof.</p>"
     d.save!
     n.publish_draft!
 
-    d2 = n.find_or_create_draft @user1
+    d2 = find_or_create_draft(n, @user1)
     d2.body = "<p>Der Vortragsraum ist ab 19 Uhr geöffnet,</p>\n<p>der Zugang erfolgt über den Hinterhof.</p>"
     d2.save!
 
@@ -281,13 +281,13 @@ class PageTest < ActiveSupport::TestCase
 
   test "diff_against reports tag and template changes" do
     n = Node.root.children.create! :slug => "field_diff_test"
-    d = n.find_or_create_draft @user1
+    d = find_or_create_draft(n, @user1)
     d.tag_list = "update"
     d.template_name = "standard_template"
     d.save!
     n.publish_draft!
 
-    d2 = n.find_or_create_draft @user1
+    d2 = find_or_create_draft(n, @user1)
     d2.tag_list = "update, pressemitteilung"
     d2.template_name = "title_only"
     d2.save!
@@ -303,7 +303,7 @@ class PageTest < ActiveSupport::TestCase
 
   test "diff_against reports added and removed assets by filename" do
     n = Node.root.children.create! :slug => "asset_diff_test"
-    d = n.find_or_create_draft @user1
+    d = find_or_create_draft(n, @user1)
     d.save!
     n.publish_draft!
 
@@ -311,7 +311,7 @@ class PageTest < ActiveSupport::TestCase
     removed_asset = Asset.create!(:upload_file_name => "removed.pdf", :upload_content_type => "application/pdf", :upload_file_size => 1)
     n.head.update_assets([kept_asset.id, removed_asset.id])
 
-    d2 = n.find_or_create_draft @user1
+    d2 = find_or_create_draft(n, @user1)
     added_asset = Asset.create!(:upload_file_name => "added.png", :upload_content_type => "image/png", :upload_file_size => 1)
     d2.update_assets([kept_asset.id, added_asset.id])
     d2.save!
@@ -324,12 +324,12 @@ class PageTest < ActiveSupport::TestCase
 
   test "diff_against with an explicit locale compares that locale's own translation on each side" do
     n = Node.root.children.create!(:slug => "diff_locale_test")
-    d = n.find_or_create_draft(@user1)
+    d = find_or_create_draft(n, @user1)
     Globalize.with_locale(:en) { d.update!(:title => "Old English") }
     d.save!
     n.publish_draft!
 
-    d2 = n.find_or_create_draft(@user1)
+    d2 = find_or_create_draft(n, @user1)
     Globalize.with_locale(:en) { d2.update!(:title => "New English") }
     d2.save!
 
@@ -341,11 +341,11 @@ class PageTest < ActiveSupport::TestCase
 
   test "diff_against with an explicit locale ignores content in other locales entirely" do
     n = Node.root.children.create!(:slug => "diff_locale_isolation_test")
-    d = n.find_or_create_draft(@user1)
+    d = find_or_create_draft(n, @user1)
     d.save!
     n.publish_draft!
 
-    d2 = n.find_or_create_draft(@user1)
+    d2 = find_or_create_draft(n, @user1)
     Globalize.with_locale(:de) { d2.update!(:title => "Nur Deutsch geändert") }
     d2.save!
 
@@ -356,11 +356,11 @@ class PageTest < ActiveSupport::TestCase
 
   test "locale_diff_summary flags a locale that only exists on one side as changed" do
     n = Node.root.children.create!(:slug => "diff_locale_summary_test")
-    d = n.find_or_create_draft(@user1)
+    d = find_or_create_draft(n, @user1)
     d.save!
     n.publish_draft!
 
-    d2 = n.find_or_create_draft(@user1)
+    d2 = find_or_create_draft(n, @user1)
     Globalize.with_locale(:en) { d2.update!(:title => "New English translation") }
     d2.save!
 
diff --git a/test/test_helper.rb b/test/test_helper.rb
index c494c68..7ab9c8c 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -67,4 +67,9 @@ class ActiveSupport::TestCase
     node.reload
     node
   end
+
+  def find_or_create_draft(node, user)
+    node.lock_for_editing!(user)
+    node.draft || node.create_new_draft(user)
+  end
 end