Merge branch 'simplicitybg-customize-post-view'

comfy · May 10, 2018 · ca48f52 · ca48f52
2 parents 99824c7 + a7c2e20
commit ca48f52
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/app/controllers/comfy/blog/posts_controller.rb b/app/controllers/comfy/blog/posts_controller.rb
@@ -23,9 +23,7 @@ def index
   def show
     load_post
 
-    render  inline: @cms_post.content_cache,
-            layout: app_layout,
-            content_type: "text/html"
+    render layout: app_layout
 
   rescue ActiveRecord::RecordNotFound
     render cms_page: "/404", status: 404

diff --git a/app/views/comfy/blog/posts/show.html.haml b/app/views/comfy/blog/posts/show.html.haml
@@ -0,0 +1,8 @@
+%h1= @cms_post.title
+
+%p
+  - label = Comfy::Blog::Post.human_attribute_name(:published_on)
+  - time  = @cms_post.published_at.to_formatted_s(:short)
+  = "#{label}: #{time}"
+
+= @cms_post.content_cache.html_safe
diff --git a/test/controllers/comfy/blog/posts_controller_test.rb b/test/controllers/comfy/blog/posts_controller_test.rb
@@ -91,9 +91,18 @@ def test_get_index_is_sorted
 
   def test_get_show
     @post.update_column(:content_cache, "blog post content")
+
+    expected = <<~HTML
+      <h1>Default Title</h1>
+      <p>
+      Published on: 01 Jan 01:23
+      </p>
+      blog post content
+    HTML
+
     get comfy_blog_post_path(@site.path, @post.year, @post.month, @post.slug)
     assert_response :success
-    assert_equal "blog post content", response.body
+    assert_equal expected, response.body
   end
 
   def test_get_show_unpublished