From a25d90335ad3738b6831288190132c2f7498465c Mon Sep 17 00:00:00 2001 From: erdgeist Date: Fri, 10 Jul 2026 00:35:24 +0200 Subject: Retire vendored cacycle_diff.js for a diff-lcs-based diff view Revisions#diff now computes an inline or side-by-side word diff server-side (Page#diff_against, lib/html_word_diff.rb) instead of shipping raw/escaped content to the browser for a 2008-era vendored JS differ to mangle. View mode is picked via a `view` param, settable either on the diff page itself or directly from the revisions#index sticky bar next to "Diff revisions". Also fixes a pre-existing bug in RevisionsController#diff's single- revision branch, which set params[:start]/params[:end] instead of params[:start_revision]/params[:end_revision]. --- test/controllers/revisions_controller_test.rb | 29 +++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'test/controllers') diff --git a/test/controllers/revisions_controller_test.rb b/test/controllers/revisions_controller_test.rb index b4dcd8f..e2fc976 100644 --- a/test/controllers/revisions_controller_test.rb +++ b/test/controllers/revisions_controller_test.rb @@ -59,4 +59,33 @@ class RevisionsControllerTest < ActionController::TestCase assert_equal @node.head, @node.pages.first assert_equal "first", @node.head.reload.body end + + test "diffing two revisions renders real markup with only the changed words marked" do + login_as :quentin + post( + :diff, params: { + :node_id => @node.id, + :start_revision => @node.pages.first.revision, + :end_revision => @node.pages.last.revision + } + ) + assert_response :success + assert_select "del", "first" + assert_select "ins", "second" + assert_no_match /</, response.body + end + + test "diffing two revisions in side by side view renders two columns" do + login_as :quentin + post( + :diff, params: { + :node_id => @node.id, + :start_revision => @node.pages.first.revision, + :end_revision => @node.pages.last.revision, + :view => "side_by_side" + } + ) + assert_response :success + assert_select ".diff_column", 2 + end end -- cgit v1.3