Fix tests for the new autosave routing

Route Save and autosave through the new Node methods
update now promotes the current autosave into the draft via
save_draft! rather than writing submitted params directly; autosave
gets its own PUT member route so PATCH update can mean "deliberate
save" specifically, matching every other custom action on this
resource. Both now require the lock to already be held rather than
acquiring it themselves, which is a deliberate narrowing: through the
real UI this is always true, since neither can fire before edit has
loaded. Two existing tests called update directly with no prior
edit, which the old code tolerated by acquiring the lock as a side
effect; updated to call edit first instead of loosening the
guarantee back open.
NodesController#edit itself is unchanged and still calls the old
find_or_create_draft, so drafts are still created eagerly on entering
edit for now -- switching that over is the next step, not this one.

1 files changed, 29 insertions, 10 deletions

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index a72be68..042963b 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -11,7 +11,8 @@ class NodesController < ApplicationController
                               :update,
                               :destroy,
                               :publish,
-                              :unlock
+                              :unlock,
+                              :autosave
                             ]
 
   def index
@@ -72,17 +73,35 @@ class NodesController < ApplicationController
 
   def update
     @node.update(node_params)
-    @draft = @node.find_or_create_draft current_user
-    @draft.tag_list = params[:tag_list]
-    if @draft.update( page_params )
-      flash[:notice] = "Draft has been saved: #{Time.now}"
-      respond_to do |format|
-        format.html { redirect_to edit_node_path(@node) }
-        format.js
-      end
+    @node.autosave!( page_params.merge(:tag_list => params[:tag_list]), current_user )
+    @node.save_draft!(current_user)
+
+    flash[:notice] = "Draft has been saved: #{Time.now}"
+
+    if params[:commit] == "Save + Unlock + Exit"
+      @node.unlock!
+      redirect_to node_path(@node)
     else
-      render :action => :edit
+      redirect_to edit_node_path(@node)
     end
+  rescue LockedByAnotherUser => e
+    flash[:error] = e.message
+    redirect_to node_path(@node)
+  rescue ActiveRecord::RecordInvalid
+    @page = @node.autosave || @node.draft || @node.head
+    render :action => :edit
+  end
+
+  def autosave
+    @node.update(node_params)
+    @node.autosave!( page_params.merge(:tag_list => params[:tag_list]), current_user )
+    head :ok
+  rescue LockedByAnotherUser => e
+    render plain: e.message, status: :locked
+  rescue ActiveRecord::RecordInvalid => e
+    render plain: e.message, status: :unprocessable_entity
+  rescue StandardError => e
+    render plain: "Autosave failed", status: :internal_server_error
   end
 
   def destroy