From: Tom Hughes <tom@compton.nu>
Date: Wed, 14 Aug 2024 18:06:42 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/5075'
X-Git-Tag: live~560
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/257ecde90d81a23b9cfcd2376ee39374b8fa2e7b?hp=d010e280af51bb98513615e3f394019490684880

Merge remote-tracking branch 'upstream/pull/5075'
---

diff --git a/app/assets/javascripts/richtext.js b/app/assets/javascripts/richtext.js
index 1576656ee..e069f6f88 100644
--- a/app/assets/javascripts/richtext.js
+++ b/app/assets/javascripts/richtext.js
@@ -8,6 +8,10 @@ $(document).ready(function () {
     var container = $(this).closest(".richtext_container");
 
     container.find(".tab-pane[id$='_preview']").empty();
+  }).on("invalid", function () {
+    var container = $(this).closest(".richtext_container");
+
+    container.find("button[data-bs-target$='_edit']").tab("show");
   });
 
   /*
diff --git a/test/system/rich_text_test.rb b/test/system/rich_text_test.rb
new file mode 100644
index 000000000..6876718bf
--- /dev/null
+++ b/test/system/rich_text_test.rb
@@ -0,0 +1,16 @@
+require "application_system_test_case"
+
+class RichTextSystemTest < ApplicationSystemTestCase
+  def setup
+    create(:language, :code => "en")
+  end
+
+  test "switches to edit pane on validation failure" do
+    sign_in_as create(:user)
+    visit new_diary_entry_path
+    fill_in "Subject", :with => "My Diary Entry Title"
+    click_on "Preview"
+    click_on "Publish"
+    assert_field "Body"
+  end
+end