From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 14 Aug 2024 13:38:28 +0000 (+0100)
Subject: Merge pull request #5056 from AntonKhorev/diary-og-description
X-Git-Tag: live~706
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/735a5cf9e25b81d03db80ca4393aa34ea74d612a?ds=inline;hp=-c

Merge pull request #5056 from AntonKhorev/diary-og-description

Set og:description meta tag to diary entry description
---

735a5cf9e25b81d03db80ca4393aa34ea74d612a
diff --combined test/controllers/diary_entries_controller_test.rb
index ced241a7f,1ea183400..e98342e10
--- a/test/controllers/diary_entries_controller_test.rb
+++ b/test/controllers/diary_entries_controller_test.rb
@@@ -163,7 -163,7 +163,7 @@@ class DiaryEntriesControllerTest < Acti
                                                  :longitude => "2.2", :language_code => "en" })
      end
      assert_redirected_to :action => :index, :display_name => user.display_name
 -    entry = DiaryEntry.order(:id).last
 +    entry = DiaryEntry.last
      assert_equal user.id, entry.user_id
      assert_equal "New Title", entry.title
      assert_equal "This is a new body for the diary entry", entry.body
@@@ -189,7 -189,7 +189,7 @@@
                                                  :longitude => "2.2", :language_code => "de" })
      end
      assert_redirected_to :action => :index, :display_name => user.display_name
 -    entry = DiaryEntry.order(:id).last
 +    entry = DiaryEntry.last
      assert_equal user.id, entry.user_id
      assert_equal "New Title", entry.title
      assert_equal "This is a new body for the diary entry", entry.body
@@@ -217,7 -217,7 +217,7 @@@
                                :diary_entry => { :title => spammy_title, :body => spammy_body, :language_code => "en" })
      end
      assert_redirected_to :action => :index, :display_name => user.display_name
 -    entry = DiaryEntry.order(:id).last
 +    entry = DiaryEntry.last
      assert_equal user.id, entry.user_id
      assert_equal spammy_title, entry.title
      assert_equal spammy_body, entry.body
@@@ -744,6 -744,28 +744,28 @@@
      assert_dom "head meta[property='og:image:alt']", :count => 0
    end
  
+   def test_show_no_og_description
+     user = create(:user)
+     diary_entry = create(:diary_entry, :user => user, :body => "![nope](https://example.com/nope.jpg)")
+ 
+     get diary_entry_path(user, diary_entry)
+     assert_response :success
+     assert_dom "head meta[property='og:description']" do
+       assert_dom "> @content", I18n.t("layouts.intro_text")
+     end
+   end
+ 
+   def test_show_og_description
+     user = create(:user)
+     diary_entry = create(:diary_entry, :user => user, :body => "# Hello\n\n![hello](https://example.com/hello.jpg)\n\nFirst paragraph.\n\nSecond paragraph.")
+ 
+     get diary_entry_path(user, diary_entry)
+     assert_response :success
+     assert_dom "head meta[property='og:description']" do
+       assert_dom "> @content", "First paragraph."
+     end
+   end
+ 
    def test_hide
      user = create(:user)
      diary_entry = create(:diary_entry, :user => user)