comfortable_mexican_sofa 1.12.11 → 2.0.0

data/test/controllers/comfy/admin/cms/translations_controller_test.rb

@@ -0,0 +1,181 @@
+require_relative '../../../../test_helper'
+
+class Comfy::Admin::Cms::TranslationsControllerTest < ActionDispatch::IntegrationTest
+
+  setup do
+    @site         = comfy_cms_sites(:default)
+    @layout       = comfy_cms_layouts(:default)
+    @page         = comfy_cms_pages(:default)
+    @translation  = comfy_cms_translations(:default)
+  end
+
+  def test_get_new
+    r :get, new_comfy_admin_cms_site_page_translation_path(@site, @page)
+    assert_response :success
+    assert assigns(:translation)
+    assert_template :new
+    assert_select "form[action='/admin/sites/#{@site.id}/pages/#{@page.id}/translations']"
+  end
+
+  def test_get_new_with_field_wysiwyg
+    @layout.update_column(:content, "{{cms:wysiwyg test}}")
+    r :get, new_comfy_admin_cms_site_page_translation_path(@site, @page)
+    assert_response :success
+    assert_select "textarea[name='translation[fragments_attributes][0][content]'][data-cms-rich-text]"
+    assert_select "input[type='hidden'][name='translation[fragments_attributes][0][identifier]'][value='test']"
+    assert_select "input[type='hidden'][name='translation[fragments_attributes][0][tag]'][value='wysiwyg']"
+  end
+
+  def test_get_edit
+    r :get, edit_comfy_admin_cms_site_page_translation_path(@site, @page, @translation)
+    assert_response :success
+    assert assigns(:translation)
+    assert_template :edit
+    assert_select "form[action='/admin/sites/#{@site.id}/pages/#{@page.id}/translations/#{@translation.id}']"
+  end
+
+  def test_get_edit_failure
+    r :get, edit_comfy_admin_cms_site_page_translation_path(@site, @page, "invalid")
+    assert_response :redirect
+    assert_redirected_to edit_comfy_admin_cms_site_page_path(@site, @page)
+    assert_equal "Translation not found", flash[:danger]
+  end
+
+  def test_create
+    assert_count_difference [Comfy::Cms::Translation] do
+      path = comfy_admin_cms_site_page_translations_path(@site, @page)
+      r :post, path, params: {translation: {
+        locale: "es",
+        label:  "Test Translation"
+      }}
+      assert_response :redirect
+      translation = Comfy::Cms::Translation.last
+      assert_equal @page, translation.page
+      assert_redirected_to action: :edit, id: translation
+      assert_equal "Translation created", flash[:success]
+    end
+  end
+
+  def test_creation_failure
+    assert_count_no_difference [Comfy::Cms::Translation] do
+      path = comfy_admin_cms_site_page_translations_path(@site, @page)
+      r :post, path, params: {translation: { }}
+      assert_response :success
+      assert_template :new
+      assert_equal "Failed to create translation", flash[:danger]
+    end
+  end
+
+  def test_update
+    path = comfy_admin_cms_site_page_translation_path(@site, @page, @translation)
+    r :put, path, params: {translation: {
+      label: "Updated Translation"
+    }}
+    assert_response :redirect
+    assert_redirected_to action: :edit, site_id: @site, page_id: @page, id: @translation
+    assert_equal "Translation updated", flash[:success]
+    @translation.reload
+    assert_equal "Updated Translation", @translation.label
+  end
+
+  def test_update_failure
+    path = comfy_admin_cms_site_page_translation_path(@site, @page, @translation)
+    r :put, path, params: {translation: {
+      locale: ""
+    }}
+    assert_response :success
+    assert_template :edit
+    @translation.reload
+    assert_not_equal "", @translation.locale
+    assert_equal "Failed to update translation", flash[:danger]
+  end
+
+  def test_destroy
+    assert_count_difference [Comfy::Cms::Translation], -1 do
+      r :delete, comfy_admin_cms_site_page_translation_path(@site, @page, @translation)
+      assert_response :redirect
+      assert_redirected_to edit_comfy_admin_cms_site_page_path(@site, @page)
+      assert_equal "Translation deleted", flash[:success]
+    end
+  end
+
+  def test_get_form_fragments
+    path = form_fragments_comfy_admin_cms_site_page_translation_path(@site, @page, @translation)
+    r :get, path, xhr: true, params: {
+      layout_id: comfy_cms_layouts(:nested).id
+    }
+    assert_response :success
+    assert assigns(:translation)
+    assert_equal 2, assigns(:translation).fragment_nodes.size
+    assert_template :form_fragments
+
+    r :get, path, xhr: true, params: {
+      layout_id: @layout.id
+    }
+    assert_response :success
+    assert assigns(:translation)
+    assert_equal 1, assigns(:translation).fragment_nodes.size
+    assert_template :form_fragments
+  end
+
+  def test_get_form_fragments_for_new_translation
+    path = form_fragments_comfy_admin_cms_site_page_translation_path(@site, @page, 0)
+    r :get, path, xhr: true, params: {
+      layout_id: @layout.id
+    }
+    assert_response :success
+    assert assigns(:translation)
+    assert_equal 1, assigns(:translation).fragment_nodes.size
+    assert_template :form_fragments
+  end
+
+  def test_creation_preview
+    assert_count_no_difference [Comfy::Cms::Translation] do
+      r :post, comfy_admin_cms_site_page_translations_path(@site, @page), params: {
+        preview: 'Preview',
+        translation: {
+          label:      "Test Page",
+          layout_id:  @layout.id,
+          locale:     "fr",
+          fragments_attributes: [
+            { identifier: 'content',
+              content:    'preview content' }
+          ]
+        }
+      }
+      assert_response :success
+      assert_match /preview content/, response.body
+      assert_equal 'text/html', response.content_type
+
+      assert_equal @site, assigns(:cms_site)
+      assert_equal @layout, assigns(:cms_layout)
+      assert assigns(:cms_page)
+      assert assigns(:translation).new_record?
+
+      assert_equal :fr, I18n.locale
+    end
+  end
+
+  def test_update_preview
+    assert_count_no_difference [Comfy::Cms::Page] do
+      r :put, comfy_admin_cms_site_page_translation_path(@site, @page, @translation), params: {
+        preview: 'Preview',
+        translation: {
+        label: 'Updated Label',
+        fragments_attributes: [
+          { identifier: 'content',
+            content:    'preview content' }
+          ]
+        }
+      }
+      assert_response :success
+      assert_match /preview content/, response.body
+      @translation.reload
+      assert_not_equal 'Updated Label', @page.label
+
+      assert_equal @page.site,    assigns(:cms_site)
+      assert_equal @page.layout,  assigns(:cms_layout)
+      assert_equal @page,         assigns(:cms_page)
+    end
+  end
+end

data/test/controllers/comfy/cms/assets_controller_test.rb

@@ -1,58 +1,60 @@
 require_relative '../../../test_helper'
 
-class Comfy::Cms::AssetsControllerTest < ActionController::TestCase
+class Comfy::Cms::AssetsControllerTest < ActionDispatch::IntegrationTest
+
+  def setup
+    @site   = comfy_cms_sites(:default)
+    @layout = comfy_cms_layouts(:default)
+  end
 
   def test_render_css_with_site_with_path
-    site = comfy_cms_sites(:default)
-    site.update_column(:path, 'some/path')
-    get :render_css, :site_id => site, :identifier => comfy_cms_layouts(:default).identifier
+    @site.update_column(:path, 'some/path')
+
+    get comfy_cms_render_css_path(site_id: @site, identifier: @layout.identifier)
     assert_response :success
     assert_match 'text/css', response.content_type
-    assert_equal comfy_cms_layouts(:default).css, response.body
+    assert_equal @layout.css, response.body
   end
 
   def test_render_css_without_cache_buster
-    get :render_css, :site_id => comfy_cms_sites(:default), :identifier => comfy_cms_layouts(:default).identifier
+    get comfy_cms_render_css_path(site_id: @site, identifier: @layout.identifier)
     assert_response :success
     assert_match 'text/css', response.content_type
-    assert_nil response.headers['Cache-Control']
-    assert_equal comfy_cms_layouts(:default).css, response.body
+    assert_equal 'max-age=0, private, must-revalidate', response.headers['Cache-Control']
+    assert_equal @layout.css, response.body
   end
 
   def test_render_css_with_cache_buster
-    layout = comfy_cms_layouts(:default)
-    get :render_css, :site_id => comfy_cms_sites(:default), :identifier => layout.identifier, :cache_buster => layout.cache_buster
+    get comfy_cms_render_css_path(site_id: @site, identifier: @layout.identifier, cache_buster: @layout.cache_buster)
     assert_response :success
     assert_match 'text/css', response.content_type
-    assert_equal 'public, max-age=31557600', response.headers['Cache-Control']
-    assert_equal comfy_cms_layouts(:default).css, response.body
+    assert_equal 'max-age=31556952, public', response.headers['Cache-Control']
+    assert_equal @layout.css, response.body
   end
 
   def test_render_css_not_found
-    get :render_css, :site_id => comfy_cms_sites(:default).id, :identifier => 'bogus'
+    get comfy_cms_render_css_path(site_id: @site, identifier: 'invalid')
     assert_response 404
   end
 
   def test_render_js_without_cache_buster
-    xhr :get, :render_js, :site_id => comfy_cms_sites(:default).id, :identifier => comfy_cms_layouts(:default).identifier
+    get comfy_cms_render_js_path(site_id: @site, identifier: @layout.identifier)
     assert_response :success
     assert_equal 'application/javascript', response.content_type
-    assert_nil response.headers['Cache-Control']
-    assert_equal comfy_cms_layouts(:default).js, response.body
+    assert_equal 'max-age=0, private, must-revalidate', response.headers['Cache-Control']
+    assert_equal @layout.js, response.body
   end
 
   def test_render_js_with_cache_buster
-    layout = comfy_cms_layouts(:default)
-    xhr :get, :render_js, :site_id => comfy_cms_sites(:default).id, :identifier => layout.identifier, :cache_buster => layout.cache_buster
+    get comfy_cms_render_js_path(site_id: @site, identifier: @layout.identifier, cache_buster: @layout.cache_buster)
     assert_response :success
     assert_equal 'application/javascript', response.content_type
-    assert_equal 'public, max-age=31557600', response.headers['Cache-Control']
-    assert_equal comfy_cms_layouts(:default).js, response.body
+    assert_equal 'max-age=31556952, public', response.headers['Cache-Control']
+    assert_equal @layout.js, response.body
   end
 
   def test_render_js_not_found
-    xhr :get, :render_js, :site_id => comfy_cms_sites(:default).id, :identifier => 'bogus'
+    get comfy_cms_render_js_path(site_id: @site, identifier: 'bogus')
     assert_response 404
   end
-
 end

data/test/controllers/comfy/cms/content_controller_test.rb

@@ -1,112 +1,99 @@
-require_relative '../../../test_helper'
+require_relative "../../../test_helper"
 
-class Comfy::Cms::ContentControllerTest < ActionController::TestCase
+class Comfy::Cms::ContentControllerTest < ActionDispatch::IntegrationTest
 
-  def test_show
-    get :show, :cms_path => ''
-    assert_equal comfy_cms_sites(:default), assigns(:cms_site)
-    assert_equal comfy_cms_layouts(:default), assigns(:cms_layout)
-    assert_equal comfy_cms_pages(:default), assigns(:cms_page)
-
-    assert_response :success
-    assert_equal rendered_content_formatter(
-      '
-      layout_content_a
-      default_page_text_content_a
-      default_snippet_content
-      default_page_text_content_b
-      layout_content_b
-      default_snippet_content
-      layout_content_c'
-    ), response.body
-    assert_equal 'text/html', response.content_type
-
-    assert_equal :en, assigns(:locale)
-    assert_equal :en, I18n.locale
+  setup do
+    @site         = comfy_cms_sites(:default)
+    @layout       = comfy_cms_layouts(:default)
+    @page         = comfy_cms_pages(:default)
+    @translation  = comfy_cms_translations(:default)
   end
 
-  def test_show_with_locale
-    comfy_cms_sites(:default).update_column(:locale, 'fr')
-    get :show, :cms_path => ''
+  def test_show
+    get comfy_cms_render_page_path(cms_path: "")
+    assert_equal @site,   assigns(:cms_site)
+    assert_equal @layout, assigns(:cms_layout)
+    assert_equal @page,   assigns(:cms_page)
+
     assert_response :success
+    assert_equal "content", response.body
+    assert_equal "text/html", response.content_type
 
-    assert_equal :fr, assigns(:locale)
-    assert_equal :fr, I18n.locale
+    assert_equal :en, I18n.locale
   end
 
   def test_show_default_html
-    request.headers["Accept"] = "*/*"
-    get :show, :cms_path => ''
+    get comfy_cms_render_page_path(cms_path: ""), headers: {"Accept" => "*/*"}
     assert_response :success
-    assert_equal 'text/html', response.content_type
+    assert_equal "text/html", response.content_type
   end
 
   def test_show_as_json
-    get :show, :cms_path => '', :format => 'json'
+    get comfy_cms_render_page_path(cms_path: ""), as: :json
     assert_response :success
-    assert_equal 'application/json', response.content_type
-
-    content = rendered_content_formatter(
-      '
-      layout_content_a
-      default_page_text_content_a
-      default_snippet_content
-      default_page_text_content_b
-      layout_content_b
-      default_snippet_content
-      layout_content_c'
-    )
-    page = comfy_cms_pages(:default)
+    assert_equal "application/json", response.content_type
+
     json_response = JSON.parse(response.body)
-    assert_equal page.id,         json_response['id']
-    assert_equal page.site.id,    json_response['site_id']
-    assert_equal page.layout.id,  json_response['layout_id']
+    assert_equal @page.id,        json_response['id']
+    assert_equal @page.site.id,   json_response['site_id']
+    assert_equal @page.layout.id, json_response['layout_id']
     assert_nil                    json_response['parent_id']
     assert_nil                    json_response['target_page_id']
     assert_equal 'Default Page',  json_response['label']
     assert_nil                    json_response['slug']
     assert_equal '/',             json_response['full_path']
-    assert_equal content,         json_response['content_cache']
+    assert_equal "content",       json_response['content']
     assert_equal 0,               json_response['position']
     assert_equal 1,               json_response['children_count']
     assert_equal true,            json_response['is_published']
   end
 
+  def test_show_as_json_with_erb
+    @page.update_attributes(fragments_attributes: [
+      {identifier: 'content', content: '{{ cms:helper pluralize, 2, monkey }}'}
+    ])
+    get comfy_cms_render_page_path(cms_path: ""), as: :json
+    assert_response :success
+
+    json_response = JSON.parse(response.body)
+    assert_equal "2 monkeys",  json_response['content']
+  end
+
   def test_show_with_custom_mimetype
-    layout = comfy_cms_sites(:default).layouts.create!(
-      :label      => 'RSS Layout',
-      :identifier => 'rss-layout',
-      :content    => '{{cms:field:mime_type}}{{cms:page:content}}',
+    layout = @site.layouts.create!(
+      label:      'RSS Layout',
+      identifier: 'rss-layout',
+      content:    '{{cms:text mime_type, render: false}}{{cms:textarea content}}',
     )
-    page = comfy_cms_sites(:default).pages.create!(
-      :label          => 'rss',
-      :slug           => 'rss',
-      :parent_id      => comfy_cms_pages(:default).id,
-      :layout_id      => layout.id,
-      :is_published   => true,
-      :blocks_attributes => [
-        { :identifier => 'content',
-          :content    => 'content' },
-        { :identifier => 'mime_type',
-          :content    => 'application/rss+xml' }
+    page = @site.pages.create!(
+      label:          'rss',
+      slug:           'rss',
+      parent_id:      comfy_cms_pages(:default).id,
+      layout_id:      layout.id,
+      is_published:   true,
+      fragments_attributes: [
+        { identifier: 'content',
+          content:    'content' },
+        { identifier: 'mime_type',
+          content:    'application/rss+xml' }
       ]
     )
-    get :show, :cms_path => 'rss'
+    get comfy_cms_render_page_path(cms_path: "rss")
     assert_response :success
-    assert_equal 'application/rss+xml', response.content_type
+    assert_equal "application/rss+xml", response.content_type
   end
 
   def test_show_with_app_layout
-    comfy_cms_layouts(:default).update_columns(:app_layout => 'comfy/admin/cms')
-    get :show, :cms_path => ''
+    @layout.update_columns(app_layout: 'comfy/admin/cms')
+    get comfy_cms_render_page_path(cms_path: '')
     assert_response :success
     assert assigns(:cms_page)
     assert_select "body.c-comfy-cms-content.a-show"
   end
 
   def test_show_with_xhr
-    comfy_cms_layouts(:default).update_columns(:app_layout => 'cms_admin')
-    xhr :get, :show, :cms_path => ''
+    @layout.update_columns(app_layout: 'cms_admin')
+    get comfy_cms_render_page_path(cms_path: ""), xhr: true
     assert_response :success
     assert assigns(:cms_page)
     assert_no_select "body.c-comfy-cms-content.a-show"
@@ -114,26 +101,26 @@ class Comfy::Cms::ContentControllerTest < ActionController::TestCase
 
   def test_show_not_found
     assert_exception_raised ActionController::RoutingError, 'Page Not Found at: "doesnotexist"' do
-      get :show, :cms_path => 'doesnotexist'
+      get comfy_cms_render_page_path(cms_path: 'doesnotexist')
     end
   end
 
   def test_show_not_found_with_custom_404
-    page = comfy_cms_sites(:default).pages.create!(
-      :label          => '404',
-      :slug           => '404',
-      :parent_id      => comfy_cms_pages(:default).id,
-      :layout_id      => comfy_cms_layouts(:default).id,
-      :is_published   => '1',
-      :blocks_attributes => [
-        { :identifier => 'default_page_text',
-          :content    => 'custom 404 page content' }
+    page = @site.pages.create!(
+      label:          '404',
+      slug:           '404',
+      parent_id:      @page.id,
+      layout_id:      @layout.id,
+      is_published:   '1',
+      fragments_attributes: [
+        { identifier: 'content',
+          content:    'custom 404 page content' }
       ]
     )
     assert_equal '/404', page.full_path
     assert page.is_published?
-    get :show, :cms_path => 'doesnotexist'
-    assert_response 404
+    get comfy_cms_render_page_path(cms_path: 'doesnotexist')
+    assert_response :not_found
     assert assigns(:cms_page)
     assert_match /custom 404 page content/, response.body
   end
@@ -142,105 +129,104 @@ class Comfy::Cms::ContentControllerTest < ActionController::TestCase
     Comfy::Cms::Site.destroy_all
 
     assert_exception_raised ActionController::RoutingError, 'Site Not Found' do
-      get :show, :cms_path => ''
+      get comfy_cms_render_page_path(cms_path: "")
     end
   end
 
   def test_show_with_no_layout
     Comfy::Cms::Layout.destroy_all
 
-    get :show, :cms_path => ''
-    assert_response 404
-    assert_equal 'Layout Not Found', response.body
+    get comfy_cms_render_page_path(cms_path: "")
+    assert_response :ok
+    assert_equal "", response.body
   end
 
   def test_show_with_redirect
-    comfy_cms_pages(:child).update_columns(:target_page_id => comfy_cms_pages(:default).id)
-    assert_equal comfy_cms_pages(:default), comfy_cms_pages(:child).target_page
-    get :show, :cms_path => 'child-page'
+    comfy_cms_pages(:child).update_columns(target_page_id: @page.id)
+    assert_equal @page, comfy_cms_pages(:child).target_page
+    get comfy_cms_render_page_path(cms_path: 'child-page')
     assert_response :redirect
-    assert_redirected_to comfy_cms_pages(:default).full_path
+    assert_redirected_to @page.full_path
   end
 
   def test_show_with_redirect_and_site_path
-    comfy_cms_sites(:default).update_column(:path, '/test-site-path')
-    comfy_cms_pages(:child).update_columns(:target_page_id => comfy_cms_pages(:default).id)
-    assert_equal comfy_cms_pages(:default), comfy_cms_pages(:child).target_page
-    get :show, :cms_path => '/test-site-path/child-page'
+    @site.update_column(:path, 'test-site-path')
+    comfy_cms_pages(:child).update_columns(target_page_id: @page.id)
+    assert_equal @page, comfy_cms_pages(:child).target_page
+    get comfy_cms_render_page_path(cms_path: '/test-site-path/child-page')
     assert_response :redirect
-    assert_redirected_to "/test-site-path#{comfy_cms_pages(:default).full_path}"
+    assert_redirected_to "/test-site-path#{@page.full_path}"
   end
 
   def test_show_unpublished
-    page = comfy_cms_pages(:default)
-    page.update_columns(:is_published => false)
+    @page.update_columns(is_published: false)
 
     assert_exception_raised ActionController::RoutingError, 'Page Not Found at: ""' do
-      get :show, :cms_path => ''
+      get comfy_cms_render_page_path(cms_path: '')
     end
   end
 
-  def test_show_with_irb_disabled
-    assert_equal false, ComfortableMexicanSofa.config.allow_irb
+  def test_show_with_erb_disabled
+    assert_equal false, ComfortableMexicanSofa.config.allow_erb
 
-    irb_page = comfy_cms_sites(:default).pages.create!(
-      :label          => 'irb',
-      :slug           => 'irb',
-      :parent_id      => comfy_cms_pages(:default).id,
-      :layout_id      => comfy_cms_layouts(:default).id,
-      :is_published   => '1',
-      :blocks_attributes => [
-        { :identifier => 'default_page_text',
-          :content    => 'text <%= 2 + 2 %> text' }
+    irb_page = @site.pages.create!(
+      label:          'erb',
+      slug:           'erb',
+      parent_id:      @page.id,
+      layout_id:      @layout.id,
+      is_published:   '1',
+      fragments_attributes: [
+        { identifier: 'content',
+          content:    'text <%= 2 + 2 %> text' }
       ]
     )
-    get :show, :cms_path => 'irb'
+    get comfy_cms_render_page_path(cms_path: 'erb')
     assert_response :success
     assert_match "text &lt;%= 2 + 2 %&gt; text", response.body
   end
 
   def test_show_with_irb_enabled
-    ComfortableMexicanSofa.config.allow_irb = true
-
-    irb_page = comfy_cms_sites(:default).pages.create!(
-      :label          => 'irb',
-      :slug           => 'irb',
-      :parent_id      => comfy_cms_pages(:default).id,
-      :layout_id  => comfy_cms_layouts(:default).id,
-      :is_published   => '1',
-      :blocks_attributes => [
-        { :identifier => 'default_page_text',
-          :content    => 'text <%= 2 + 2 %> text' }
+    ComfortableMexicanSofa.config.allow_erb = true
+
+    irb_page = @site.pages.create!(
+      label:          'erb',
+      slug:           'erb',
+      parent_id:      @page.id,
+      layout_id:      @layout.id,
+      is_published:   '1',
+      fragments_attributes: [
+        { identifier: 'content',
+          content:    'text <%= 2 + 2 %> text' }
       ]
     )
-    get :show, :cms_path => 'irb'
+    get comfy_cms_render_page_path(cms_path: 'erb')
     assert_response :success
     assert_match "text 4 text", response.body
   end
 
-  def test_render_sitemap
-    get :render_sitemap, :format => :xml
-    assert_response :success
-    assert_match '<loc>http://test.host/child-page</loc>', response.body
-  end
+  def test_show_with_translation
+    @translation.update_column(:content_cache, "translation content")
+    I18n.locale = @translation.locale
 
-  def test_render_sitemap_with_path
-    site = comfy_cms_sites(:default)
-    site.update_columns(:path => 'en')
+    assert_no_difference -> {@page.fragments.count} do
+      get comfy_cms_render_page_path(cms_path: "")
+      assert_equal "translation content", response.body
+    end
+  end
 
-    get :render_sitemap, :cms_path => site.path, :format => :xml
-    assert_response :success
-    assert_equal comfy_cms_sites(:default), assigns(:cms_site)
-    assert_match '<loc>http://test.host/en/child-page</loc>', response.body
+  def test_show_with_translation_not_found
+    I18n.locale = :ja
+    assert_exception_raised ActionController::RoutingError, 'Page Not Found at: ""' do
+      get comfy_cms_render_page_path(cms_path: "")
+    end
   end
 
-  def test_render_sitemap_with_path_invalid_with_single_site
-    site = comfy_cms_sites(:default)
-    site.update_columns(:path => 'en')
+  def test_show_with_translation_unpublished
+    @translation.update_column(:is_published, false)
+    I18n.locale = @translation.locale
 
-    assert_exception_raised ActionController::RoutingError, 'Site Not Found' do
-      get :render_sitemap, :cms_path => 'fr', :format => :xml
+    assert_exception_raised ActionController::RoutingError, 'Page Not Found at: ""' do
+      get comfy_cms_render_page_path(cms_path: "")
     end
   end
-
 end