diff options
| author | erdgeist <erdgeist@erdgeist.org> | 2026-07-10 00:35:24 +0200 |
|---|---|---|
| committer | erdgeist <erdgeist@erdgeist.org> | 2026-07-10 00:35:24 +0200 |
| commit | a25d90335ad3738b6831288190132c2f7498465c (patch) | |
| tree | 5aa7083d9f8c8701644fe60bc7d28542775694b8 /test/models | |
| parent | da0b79a7c1f3116e2b450ecbe50efdf31cf23414 (diff) | |
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].
Diffstat (limited to 'test/models')
| -rw-r--r-- | test/models/page_test.rb | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/test/models/page_test.rb b/test/models/page_test.rb index ad2742f..ac5691a 100644 --- a/test/models/page_test.rb +++ b/test/models/page_test.rb | |||
| @@ -176,4 +176,38 @@ class PageTest < ActiveSupport::TestCase | |||
| 176 | assert_not_equal first_page.id, first_page.node.head_id | 176 | assert_not_equal first_page.id, first_page.node.head_id |
| 177 | assert first_page.published_at.present? | 177 | assert first_page.published_at.present? |
| 178 | end | 178 | end |
| 179 | |||
| 180 | def test_diff_against_inline_keeps_tags_and_marks_only_the_changed_word | ||
| 181 | n = Node.root.children.create! :slug => "diff_against_test" | ||
| 182 | d = n.find_or_create_draft @user1 | ||
| 183 | d.title = "Old heading" | ||
| 184 | d.save! | ||
| 185 | n.publish_draft! | ||
| 186 | |||
| 187 | d2 = n.find_or_create_draft @user1 | ||
| 188 | d2.title = "New heading" | ||
| 189 | d2.save! | ||
| 190 | |||
| 191 | diff = d2.diff_against(n.head) | ||
| 192 | |||
| 193 | assert_match "<del>Old</del>", diff[:title] | ||
| 194 | assert_match "<ins>New</ins>", diff[:title] | ||
| 195 | end | ||
| 196 | |||
| 197 | def test_diff_against_side_by_side_returns_two_annotated_strings | ||
| 198 | n = Node.root.children.create! :slug => "diff_against_sbs_test" | ||
| 199 | d = n.find_or_create_draft @user1 | ||
| 200 | d.title = "Old heading" | ||
| 201 | d.save! | ||
| 202 | n.publish_draft! | ||
| 203 | |||
| 204 | d2 = n.find_or_create_draft @user1 | ||
| 205 | d2.title = "New heading" | ||
| 206 | d2.save! | ||
| 207 | |||
| 208 | old_html, new_html = d2.diff_against(n.head, view: :side_by_side)[:title] | ||
| 209 | |||
| 210 | assert_match "<del>Old</del>", old_html | ||
| 211 | assert_match "<ins>New</ins>", new_html | ||
| 212 | end | ||
| 179 | end | 213 | end |
