comfortable_mexican_sofa 1.12.11 → 2.0.0

data/test/integration/js_variables_test.rb

@@ -4,7 +4,7 @@ class JsVariablesIntegrationTest < ActionDispatch::IntegrationTest
 
   def test_redactor_js_variables
     site = comfy_cms_sites(:default)
-    http_auth :get, comfy_admin_cms_site_pages_path(site)
+    r :get, comfy_admin_cms_site_pages_path(site)
     assert_response :success
 
     js_vars = <<-HTML.strip_heredoc
@@ -17,5 +17,4 @@ class JsVariablesIntegrationTest < ActionDispatch::IntegrationTest
 
     assert response.body.match(js_vars)
   end
-
 end

data/test/integration/render_cms_test.rb

@@ -10,9 +10,9 @@ class RenderCmsIntergrationTest < ActionDispatch::IntegrationTest
       get '/site-path/render-page'  => 'render_test#render_page'
       get '/render-layout'          => 'render_test#render_layout'
     end
-    comfy_cms_layouts(:default).update_columns(:content => '{{cms:page:content}}')
-    comfy_cms_pages(:child).update_attributes(:blocks_attributes => [
-      { :identifier => 'content', :content => 'TestBlockContent' }
+    comfy_cms_layouts(:default).update_columns(content: '{{cms:text content}}')
+    comfy_cms_pages(:child).update_attributes(fragments_attributes: [
+      { identifier: 'content', content: 'TestBlockContent' }
     ])
   end
 
@@ -22,15 +22,15 @@ class RenderCmsIntergrationTest < ActionDispatch::IntegrationTest
 
   def create_site_b
     site    = Comfy::Cms::Site.create!(
-      :identifier => 'site-b',
-      :hostname   => 'site-b.test')
+      identifier: 'site-b',
+      hostname:   'site-b.test')
     layout  = site.layouts.create!(
-      :identifier => 'default',
-      :content    => 'site-b {{cms:page:content}}')
+      identifier: 'default',
+      content:    'site-b {{cms:text content}}')
     page    = site.pages.create!(
-      :label  => 'default',
-      :layout => layout,
-      :blocks_attributes  => [{ :identifier => 'content', :content => 'SiteBContent' }])
+      label:  'default',
+      layout: layout,
+      fragments_attributes: [{identifier: 'content', content: 'SiteBContent'}])
   end
 
   class ::RenderTestController < ApplicationController
@@ -39,7 +39,7 @@ class RenderCmsIntergrationTest < ActionDispatch::IntegrationTest
     def render_basic
       case params[:type]
       when 'text'
-        render :plain => 'TestText'
+        render plain: 'TestText'
       when 'update'
         render :update do |page|
           page.alert('rendered text')
@@ -54,14 +54,14 @@ class RenderCmsIntergrationTest < ActionDispatch::IntegrationTest
       when 'page_implicit'
         render
       when 'page_explicit'
-        render :cms_page => '/test-page'
+        render cms_page: '/test-page'
       when 'page_explicit_with_status'
-        render :cms_page => '/test-page', :status => 404
+        render cms_page: '/test-page', status: 404
       when 'page_explicit_with_site'
-        render :cms_page => '/', :cms_site => 'site-b'
+        render cms_page: '/', cms_site: 'site-b'
       when 'page_explicit_with_blocks'
-        render :cms_page => '/test-page', :cms_blocks => {
-          :content => 'custom page content'
+        render cms_page: '/test-page', cms_fragments: {
+          content: 'custom page content'
         }
       else
         raise 'Invalid or no param[:type] provided'
@@ -72,21 +72,21 @@ class RenderCmsIntergrationTest < ActionDispatch::IntegrationTest
       @test_value = 'TestValue'
       case params[:type]
       when 'layout_defaults'
-        render :cms_layout => 'default'
+        render cms_layout: 'default'
       when 'layout'
-        render :cms_layout => 'default', :cms_blocks => {
-          :content    => 'TestText',
-          :content_b  => { :partial  => 'render_test/test' },
-          :content_c  => { :template => 'render_test/render_layout' }
+        render cms_layout: 'default', cms_fragments: {
+          content:    'TestText',
+          content_b:  {partial: 'render_test/test' },
+          content_c:  {template: 'render_test/render_layout' }
         }
       when 'layout_with_status'
-        render :cms_layout => 'default', :status => 404
+        render cms_layout: 'default', status: 404
       when 'layout_invalid'
-        render :cms_layout => 'invalid'
+        render cms_layout: 'invalid'
       when 'layout_defaults_with_site'
-        render :cms_layout => 'default', :cms_site => 'site-b'
+        render cms_layout: 'default', cms_site: 'site-b'
       when 'layout_with_action'
-        render :cms_layout => 'default', :action => :new
+        render cms_layout: 'default', action: :new
       else
         raise 'Invalid or no param[:type] provided'
       end
@@ -96,7 +96,7 @@ class RenderCmsIntergrationTest < ActionDispatch::IntegrationTest
     end
   end
 
-  # -- Basic Render Tests ---------------------------------------------------
+  # -- Basic Render Tests ------------------------------------------------------
   def test_text
     get '/render-basic?type=text'
     assert_response :success
@@ -110,10 +110,10 @@ class RenderCmsIntergrationTest < ActionDispatch::IntegrationTest
     end
   end
 
-  # -- Page Render Test -----------------------------------------------------
+  # -- Page Render Test --------------------------------------------------------
   def test_implicit_cms_page
     page = comfy_cms_pages(:child)
-    page.update_attributes(:slug => 'render-basic')
+    page.update_attributes(slug: 'render-basic')
     get '/render-basic?type=page_implicit'
     assert_response :success
     assert assigns(:cms_site)
@@ -125,7 +125,7 @@ class RenderCmsIntergrationTest < ActionDispatch::IntegrationTest
 
   def test_implicit_cms_page_with_site_path
     comfy_cms_sites(:default).update_column(:path, 'site-path')
-    comfy_cms_pages(:child).update_attributes(:slug => 'render-page')
+    comfy_cms_pages(:child).update_attributes(slug: 'render-page')
     get '/site-path/render-page?type=page_implicit'
     assert_response :success
     assert_equal 'TestBlockContent', response.body
@@ -145,9 +145,9 @@ class RenderCmsIntergrationTest < ActionDispatch::IntegrationTest
 
   def test_explicit_cms_page_with_status
     page = comfy_cms_pages(:child)
-    page.update_attributes(:slug => 'test-page')
+    page.update_attributes(slug: 'test-page')
     get '/render-page?type=page_explicit_with_status'
-    assert_response 404
+    assert_response :not_found
     assert assigns(:cms_site)
     assert assigns(:cms_layout)
     assert assigns(:cms_page)
@@ -157,10 +157,9 @@ class RenderCmsIntergrationTest < ActionDispatch::IntegrationTest
 
   def test_explicit_cms_page_failure
     page = comfy_cms_pages(:child)
-    page.update_attributes(:slug => 'invalid')
+    page.update_attributes(slug: 'invalid')
     assert_exception_raised ComfortableMexicanSofa::MissingPage do
       get '/render-page?type=page_explicit'
-      raise Rails.env.to_s
     end
   end
 
@@ -187,7 +186,7 @@ class RenderCmsIntergrationTest < ActionDispatch::IntegrationTest
     assert_equal 'custom page content', response.body
   end
 
-  # -- Layout Render Tests --------------------------------------------------
+  # -- Layout Render Tests -----------------------------------------------------
   def test_cms_layout_defaults
     get '/render-layout?type=layout_defaults'
     assert_response :success
@@ -198,7 +197,8 @@ class RenderCmsIntergrationTest < ActionDispatch::IntegrationTest
   end
 
   def test_cms_layout
-    comfy_cms_layouts(:default).update_columns(:content => '{{cms:page:content}} {{cms:page:content_b}} {{cms:page:content_c}}')
+    content = "{{cms:text content}} {{cms:text content_b}} {{cms:text content_c}}"
+    comfy_cms_layouts(:default).update_columns(content: content)
     get '/render-layout?type=layout'
     assert_response :success
     assert_equal 'TestText TestPartial TestValue TestTemplate TestValue', response.body
@@ -217,7 +217,8 @@ class RenderCmsIntergrationTest < ActionDispatch::IntegrationTest
   end
 
   def test_cms_layout_with_action
-    comfy_cms_layouts(:default).update_columns(:content => '{{cms:page:content}} {{cms:page:content_b}} {{cms:page:content_c}}')
+    content = "{{cms:text content}} {{cms:text content_b}} {{cms:text content_c}}"
+    comfy_cms_layouts(:default).update_columns(content: content)
     get '/render-layout?type=layout_with_action'
     assert_response :success
     assert_equal "Can render CMS layout and specify action\n  ", response.body
@@ -246,5 +247,4 @@ class RenderCmsIntergrationTest < ActionDispatch::IntegrationTest
       get '/render-layout?type=layout_defaults_with_site'
     end
   end
-
 end

data/test/integration/routing_test.rb

@@ -1,19 +1,18 @@
 require_relative '../test_helper'
 
 class RoutingIntergrationTest < ActionDispatch::IntegrationTest
-  
+
   def teardown
     Rails.application.reload_routes!
   end
 
   def test_cms_public_prefix
-    
     assert_nil ComfortableMexicanSofa.config.public_cms_path
-    
+
     Rails.application.routes.draw do
-      comfy_route :cms, :path => '/custom'
+      comfy_route :cms, path: '/custom'
     end
-    
+
     assert_equal '/custom', ComfortableMexicanSofa.config.public_cms_path
   end
 end

data/test/integration/seeds_test.rb

@@ -0,0 +1,76 @@
+require_relative '../test_helper'
+
+class SeedsIntergrationTest < ActionDispatch::IntegrationTest
+
+  setup do
+    @site = comfy_cms_sites(:default)
+    @site.update_columns(identifier: 'sample-site')
+  end
+
+  def test_seeds_disabled
+    assert_no_difference ['Comfy::Cms::Layout.count', 'Comfy::Cms::Page.count', 'Comfy::Cms::Snippet.count'] do
+      get '/'
+      assert_response :success
+
+      assert_equal 'Default Page', Comfy::Cms::Page.root.label
+      assert_equal 'Default Layout', Comfy::Cms::Layout.find_by_identifier('default').label
+      assert_equal 'Default Snippet', Comfy::Cms::Snippet.find_by_identifier('default').label
+    end
+  end
+
+  def test_seeds_enabled
+    ComfortableMexicanSofa.config.enable_seeds = true
+    Comfy::Cms::Layout.destroy_all
+    Comfy::Cms::Page.destroy_all
+    Comfy::Cms::Snippet.destroy_all
+
+    assert_difference 'Comfy::Cms::Page.count', 3 do
+      assert_difference 'Comfy::Cms::Layout.count', 2 do
+        assert_difference 'Comfy::Cms::Snippet.count', 1 do
+          get '/'
+          assert_response :success
+
+          assert_equal 'Home Seed Page', Comfy::Cms::Page.root.label
+          assert_equal 'Default Seed Layout', Comfy::Cms::Layout.find_by_identifier('default').label
+          assert_equal 'Default Seed Snippet', Comfy::Cms::Snippet.find_by_identifier('default').label
+
+
+          file_path = url_for(ActiveStorage::Blob.find_by(filename: 'header.png'))
+          file_path = file_path.sub("http://test.host", "")
+          out = <<-HTML.strip_heredoc
+            <html>
+              <body>
+                <img src='#{file_path}' alt='header.png'/>
+                <p>Home Page Seed Contént
+            Default Seed Snippet Content
+            </p>
+
+
+              </body>
+            </html>
+
+          HTML
+          assert_equal out, response.body
+        end
+      end
+    end
+  end
+
+  def test_fixtures_enabled_in_admin
+    ComfortableMexicanSofa.config.enable_seeds = true
+    Comfy::Cms::Layout.destroy_all
+    Comfy::Cms::Page.destroy_all
+    Comfy::Cms::Snippet.destroy_all
+
+    assert_difference 'Comfy::Cms::Page.count', 3 do
+      assert_difference 'Comfy::Cms::Layout.count', 2 do
+        assert_difference 'Comfy::Cms::Snippet.count', 1 do
+           r :get, "/admin/sites/#{@site.id}/pages"
+           assert_response :success
+           assert_equal 'CMS Seeds are enabled. All changes done here will be discarded.', flash[:warning]
+        end
+      end
+    end
+  end
+
+end

data/test/integration/sites_test.rb

@@ -1,23 +1,23 @@
 require_relative '../test_helper'
 
 class SitesIntegrationTest < ActionDispatch::IntegrationTest
-  
+
   def test_get_admin_with_single_site
-    http_auth :get, comfy_admin_cms_path
+    r :get, comfy_admin_cms_path
     assert assigns(:site)
     assert_equal comfy_cms_sites(:default), assigns(:site)
     assert_response :redirect
     assert_redirected_to comfy_admin_cms_site_pages_path(assigns(:site))
   end
-  
+
   def test_get_admin_with_no_site
     Comfy::Cms::Site.delete_all
-    http_auth :get, comfy_admin_cms_path
+    r :get, comfy_admin_cms_path
     assert_response :redirect
     assert_redirected_to new_comfy_admin_cms_site_path
     assert_equal 'Site not found', flash[:danger]
   end
-  
+
   def test_get_public_page_with_single_site
     host! 'bogus.host'
     get '/'
@@ -25,33 +25,33 @@ class SitesIntegrationTest < ActionDispatch::IntegrationTest
     assert assigns(:cms_site)
     assert_equal 'test.host', assigns(:cms_site).hostname
   end
-  
+
   def test_get_public_page_with_sites_with_different_paths
     Comfy::Cms::Site.delete_all
-    site_a = Comfy::Cms::Site.create!(:identifier => 'site-a', :hostname => 'test.host', :path => '')
-    site_b = Comfy::Cms::Site.create!(:identifier => 'site-b', :hostname => 'test.host', :path => 'path-b')
-    site_c = Comfy::Cms::Site.create!(:identifier => 'site-c', :hostname => 'test.host', :path => 'path-c/child')
-    
+    site_a = Comfy::Cms::Site.create!(identifier: 'site-a', hostname: 'test.host', path: '')
+    site_b = Comfy::Cms::Site.create!(identifier: 'site-b', hostname: 'test.host', path: 'path-b')
+    site_c = Comfy::Cms::Site.create!(identifier: 'site-c', hostname: 'test.host', path: 'path-c/child')
+
     [site_a, site_b, site_c].each do |site|
-      layout  = site.layouts.create!(:identifier => 'test')
-      site.pages.create!(:label => 'index', :layout => layout)
-      site.pages.create!(:label => '404', :slug => '404', :layout => layout)
+      layout  = site.layouts.create!(identifier: 'test')
+      site.pages.create!(label: 'index', layout: layout)
+      site.pages.create!(label: '404', slug: '404', layout: layout)
     end
-    
+
     %w(/ /path-a /path-a/child /path-c).each do |path|
       get path
       assert assigns(:cms_site), path
       assert_equal site_a, assigns(:cms_site)
       assert_equal path.gsub(/^\//, ''), @controller.params[:cms_path].to_s
     end
-    
+
     %w(/path-b /path-b/child).each do |path|
       get path
       assert assigns(:cms_site), path
       assert_equal site_b, assigns(:cms_site)
       assert_equal path.gsub(/^\/path-b/, '').gsub(/^\//, ''), @controller.params[:cms_path].to_s
     end
-    
+
     %w(/path-c/child /path-c/child/child).each do |path|
       get path
       assert assigns(:cms_site), path
@@ -59,62 +59,48 @@ class SitesIntegrationTest < ActionDispatch::IntegrationTest
       assert_equal path.gsub(/^\/path-c\/child/, '').gsub(/^\//, ''), @controller.params[:cms_path].to_s
     end
   end
-  
+
   def test_get_public_page_with_host_with_port
     Comfy::Cms::Site.delete_all
-    site_a = Comfy::Cms::Site.create!(:identifier => 'site-a', :hostname => 'test.host:3000')
-    site_b = Comfy::Cms::Site.create!(:identifier => 'site-b', :hostname => 'test.host')
-    
+    site_a = Comfy::Cms::Site.create!(identifier: 'site-a', hostname: 'test.host:3000')
+    site_b = Comfy::Cms::Site.create!(identifier: 'site-b', hostname: 'test.host')
+
     [site_a, site_b].each do |site|
-      layout  = site.layouts.create!(:identifier => 'test')
-      site.pages.create!(:label => 'index', :layout => layout)
-      site.pages.create!(:label => '404', :slug => '404', :layout => layout)
+      layout  = site.layouts.create!(identifier: 'test')
+      site.pages.create!(label: 'index', layout: layout)
+      site.pages.create!(label: '404', slug: '404', layout: layout)
     end
-    
+
     get '/'
     assert assigns(:cms_site)
     assert_equal site_b, assigns(:cms_site)
   end
-  
-  def test_get_public_with_locale
-    get '/'
-    assert_response :success
-    assert assigns(:cms_site)
-    assert_equal :en, I18n.locale
-    
-    comfy_cms_sites(:default).update_columns(:locale => 'fr')
-    get '/'
-    assert_response :success
-    assert assigns(:cms_site)
-    assert_equal :fr, I18n.locale
-  end
-  
+
   def test_get_admin_with_locale
-    http_auth :get, comfy_admin_cms_site_pages_path(comfy_cms_sites(:default))
+    r :get, comfy_admin_cms_site_pages_path(comfy_cms_sites(:default))
     assert_response :success
     assert_equal :en, I18n.locale
-    
-    comfy_cms_sites(:default).update_columns(:locale => 'fr')
-    http_auth :get, comfy_admin_cms_site_pages_path(comfy_cms_sites(:default))
+
+    comfy_cms_sites(:default).update_columns(locale: 'fr')
+    r :get, comfy_admin_cms_site_pages_path(comfy_cms_sites(:default))
     assert_response :success
     assert_equal :fr, I18n.locale
   end
-  
+
   def test_get_admin_with_forced_locale
     ComfortableMexicanSofa.config.admin_locale = :en
-    
-    comfy_cms_sites(:default).update_columns(:locale => 'fr')
-    http_auth :get, comfy_admin_cms_site_pages_path(comfy_cms_sites(:default))
+
+    comfy_cms_sites(:default).update_columns(locale: 'fr')
+    r :get, comfy_admin_cms_site_pages_path(comfy_cms_sites(:default))
     assert_response :success
     assert_equal :en, I18n.locale
 
     I18n.default_locale = :fr
     I18n.locale = :fr
-    http_auth :get, comfy_admin_cms_sites_path
+    r :get, comfy_admin_cms_sites_path
     assert_response :success
     assert_equal :en, I18n.locale
 
     I18n.default_locale = :en
   end
-  
-end
+end