Ensure that Open Graph image url is absolute

diff --git a/app/helpers/open_graph_helper.rb b/app/helpers/open_graph_helper.rb
index 89aeee6b91edf301d02baf88ed32bd2309b5db90..0ce4d626707a49c5d6737cc8f578d8b8d52cbf5b 100644 (file)
--- a/app/helpers/open_graph_helper.rb
+++ b/app/helpers/open_graph_helper.rb
@@ -4,7 +4,7 @@ module OpenGraphHelper
       "og:site_name" => t("layouts.project_name.title"),
       "og:title" => [title, t("layouts.project_name.title")].compact.join(" | "),
       "og:type" => "website",
       "og:site_name" => t("layouts.project_name.title"),
       "og:title" => [title, t("layouts.project_name.title")].compact.join(" | "),
       "og:type" => "website",

-      "og:image" => og_image || image_url("osm_logo_256.png"),
+      "og:image" => og_image ? URI.join(root_url, og_image) : image_url("osm_logo_256.png"),

       "og:url" => url_for(:only_path => false),
       "og:description" => t("layouts.intro_text")
     }
       "og:url" => url_for(:only_path => false),
       "og:description" => t("layouts.intro_text")
     }

diff --git a/test/controllers/diary_entries_controller_test.rb b/test/controllers/diary_entries_controller_test.rb
index 765391d24584eb3de83a343cff3e91632eb03392..b6d11c62aff91e69478bfeaa090e181bc3d2708a 100644 (file)
--- a/test/controllers/diary_entries_controller_test.rb
+++ b/test/controllers/diary_entries_controller_test.rb
@@ -763,6 +763,17 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
     end
   end
 
     end
   end
 

+  def test_show_og_image_with_relative_uri
+    user = create(:user)
+    diary_entry = create(:diary_entry, :user => user, :body => "![some local picture](/picture.jpg)")
+
+    get diary_entry_path(user, diary_entry)
+    assert_response :success
+    assert_dom "head meta[property='og:image']" do
+      assert_dom "> @content", "#{root_url}picture.jpg"
+    end
+  end
+

   def test_hide
     user = create(:user)
     diary_entry = create(:diary_entry, :user => user)
   def test_hide
     user = create(:user)
     diary_entry = create(:diary_entry, :user => user)