comfortable_mexican_sofa 1.12.11 → 2.0.0

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

@@ -1,9 +1,9 @@
 require_relative '../../../../test_helper'
 
-class Comfy::Admin::Cms::LayoutsControllerTest < ActionController::TestCase
+class Comfy::Admin::Cms::LayoutsControllerTest < ActionDispatch::IntegrationTest
 
   def test_get_index
-    get :index, :site_id => comfy_cms_sites(:default)
+    r :get, comfy_admin_cms_site_layouts_path(site_id: comfy_cms_sites(:default))
     assert_response :success
     assert assigns(:layouts)
     assert_template :index
@@ -11,17 +11,17 @@ class Comfy::Admin::Cms::LayoutsControllerTest < ActionController::TestCase
 
   def test_get_index_with_no_layouts
     Comfy::Cms::Layout.delete_all
-    get :index, :site_id => comfy_cms_sites(:default)
+    r :get, comfy_admin_cms_site_layouts_path(site_id: comfy_cms_sites(:default))
     assert_response :redirect
-    assert_redirected_to :action => :new
+    assert_redirected_to action: :new
   end
 
   def test_get_new
     site = comfy_cms_sites(:default)
-    get :new, :site_id => site
+    r :get, new_comfy_admin_cms_site_layout_path(site_id: site)
     assert_response :success
     assert assigns(:layout)
-    assert_equal '{{ cms:page:content:rich_text }}', assigns(:layout).content
+    assert_equal '{{ cms:wysiwyg content }}', assigns(:layout).content
     assert_template :new
     assert_select "form[action='/admin/sites/#{site.id}/layouts']"
   end
@@ -30,14 +30,14 @@ class Comfy::Admin::Cms::LayoutsControllerTest < ActionController::TestCase
     site    = comfy_cms_sites(:default)
     layout  = comfy_cms_layouts(:default)
     layout.update_column(:app_layout, 'application')
-    get :new, :site_id => site, :parent_id => layout
+    r :get, new_comfy_admin_cms_site_layout_path(site_id: site), params: {parent_id: layout.id}
     assert_response :success
     assert_equal layout.app_layout, assigns(:layout).app_layout
   end
 
   def test_get_edit
     layout = comfy_cms_layouts(:default)
-    get :edit, :site_id => comfy_cms_sites(:default), :id => layout
+    r :get, edit_comfy_admin_cms_site_layout_path(site_id: comfy_cms_sites(:default), id: layout)
     assert_response :success
     assert assigns(:layout)
     assert_template :edit
@@ -45,30 +45,30 @@ class Comfy::Admin::Cms::LayoutsControllerTest < ActionController::TestCase
   end
 
   def test_get_edit_failure
-    get :edit, :site_id => comfy_cms_sites(:default), :id => 'not_found'
+    r :get, edit_comfy_admin_cms_site_layout_path(site_id: comfy_cms_sites(:default), id: 'invalid')
     assert_response :redirect
-    assert_redirected_to :action => :index
+    assert_redirected_to action: :index
     assert_equal 'Layout not found', flash[:danger]
   end
 
   def test_creation
     assert_difference 'Comfy::Cms::Layout.count' do
-      post :create, :site_id => comfy_cms_sites(:default), :layout => {
-        :label      => 'Test Layout',
-        :identifier => 'test',
-        :content    => 'Test {{cms:page:content}}'
-      }
+      r :post, comfy_admin_cms_site_layouts_path(site_id: comfy_cms_sites(:default)), params: {layout: {
+        label:      'Test Layout',
+        identifier: 'test',
+        content:    'Test {{cms:page:content}}'
+      }}
       assert_response :redirect
       layout = Comfy::Cms::Layout.last
       assert_equal comfy_cms_sites(:default), layout.site
-      assert_redirected_to :action => :edit, :site_id => layout.site, :id => layout
+      assert_redirected_to action: :edit, site_id: layout.site, id: layout
       assert_equal 'Layout created', flash[:success]
     end
   end
 
   def test_creation_failure
     assert_no_difference 'Comfy::Cms::Layout.count' do
-      post :create, :site_id => comfy_cms_sites(:default), :layout => { }
+      r :post, comfy_admin_cms_site_layouts_path(site_id: comfy_cms_sites(:default)), params: {layout: {}}
       assert_response :success
       assert_template :new
       assert_equal 'Failed to create layout', flash[:danger]
@@ -77,12 +77,12 @@ class Comfy::Admin::Cms::LayoutsControllerTest < ActionController::TestCase
 
   def test_update
     layout = comfy_cms_layouts(:default)
-    put :update, :site_id => comfy_cms_sites(:default), :id => layout, :layout => {
-      :label    => 'New Label',
-      :content  => 'New {{cms:page:content}}'
-    }
+    r :put, comfy_admin_cms_site_layout_path(site_id: comfy_cms_sites(:default), id: layout), params: {layout: {
+      label:    'New Label',
+      content:  'New {{cms:page:content}}'
+    }}
     assert_response :redirect
-    assert_redirected_to :action => :edit, :site_id => layout.site, :id => layout
+    assert_redirected_to action: :edit, site_id: layout.site, id: layout
     assert_equal 'Layout updated', flash[:success]
     layout.reload
     assert_equal 'New Label', layout.label
@@ -91,9 +91,9 @@ class Comfy::Admin::Cms::LayoutsControllerTest < ActionController::TestCase
 
   def test_update_failure
     layout = comfy_cms_layouts(:default)
-    put :update, :site_id => comfy_cms_sites(:default), :id => layout, :layout => {
-      :identifier => ''
-    }
+    r :put, comfy_admin_cms_site_layout_path(site_id: comfy_cms_sites(:default), id: layout), params: {layout: {
+      identifier: ''
+    }}
     assert_response :success
     assert_template :edit
     layout.reload
@@ -103,9 +103,9 @@ class Comfy::Admin::Cms::LayoutsControllerTest < ActionController::TestCase
 
   def test_destroy
     assert_difference 'Comfy::Cms::Layout.count', -1 do
-      delete :destroy, :site_id => comfy_cms_sites(:default), :id => comfy_cms_layouts(:default)
+      r :delete, comfy_admin_cms_site_layout_path(site_id: comfy_cms_sites(:default), id: comfy_cms_layouts(:default))
       assert_response :redirect
-      assert_redirected_to :action => :index
+      assert_redirected_to action: :index
       assert_equal 'Layout deleted', flash[:success]
     end
   end
@@ -113,13 +113,15 @@ class Comfy::Admin::Cms::LayoutsControllerTest < ActionController::TestCase
   def test_reorder
     layout_one = comfy_cms_layouts(:default)
     layout_two = comfy_cms_sites(:default).layouts.create!(
-      :label      => 'test',
-      :identifier => 'test'
+      label:      'test',
+      identifier: 'test'
     )
     assert_equal 0, layout_one.position
     assert_equal 1, layout_two.position
 
-    put :reorder, :site_id => comfy_cms_sites(:default), :comfy_cms_layout => [layout_two.id, layout_one.id]
+    r :put, reorder_comfy_admin_cms_site_layouts_path(site_id: comfy_cms_sites(:default)), params: {
+      comfy_cms_layout: [layout_two.id, layout_one.id]
+    }
     assert_response :success
     layout_one.reload
     layout_two.reload
@@ -127,5 +129,4 @@ class Comfy::Admin::Cms::LayoutsControllerTest < ActionController::TestCase
     assert_equal 1, layout_one.position
     assert_equal 0, layout_two.position
   end
-
 end

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

@@ -1,13 +1,15 @@
 require_relative '../../../../test_helper'
 
-class Comfy::Admin::Cms::PagesControllerTest < ActionController::TestCase
+class Comfy::Admin::Cms::PagesControllerTest < ActionDispatch::IntegrationTest
 
   def setup
-    @site = comfy_cms_sites(:default)
+    @site   = comfy_cms_sites(:default)
+    @layout = comfy_cms_layouts(:default)
+    @page   = comfy_cms_pages(:default)
   end
 
   def test_get_index
-    get :index, :site_id => @site
+    r :get, comfy_admin_cms_site_pages_path(site_id: @site)
     assert_response :success
     assert assigns(:pages)
     assert_template :index
@@ -15,19 +17,19 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionController::TestCase
 
   def test_get_index_with_no_pages
     Comfy::Cms::Page.delete_all
-    get :index, :site_id => @site
+    r :get, comfy_admin_cms_site_pages_path(site_id: @site)
     assert_response :redirect
-    assert_redirected_to :action => :new
+    assert_redirected_to action: :new
   end
 
   def test_get_index_with_category
     category = @site.categories.create!(
-      :label            => 'Test Category',
-      :categorized_type => 'Comfy::Cms::Page'
+      label:            'Test Category',
+      categorized_type: 'Comfy::Cms::Page'
     )
-    category.categorizations.create!(:categorized => comfy_cms_pages(:child))
+    category.categorizations.create!(categorized: comfy_cms_pages(:child))
 
-    get :index, :site_id => @site, :category => category.label
+    r :get, comfy_admin_cms_site_pages_path(site_id: @site), params: {categories: category.label}
     assert_response :success
     assert assigns(:pages)
     assert_equal 1, assigns(:pages).count
@@ -35,7 +37,7 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionController::TestCase
   end
 
   def test_get_index_with_category_invalid
-    get :index, :site_id => @site, :category => 'invalid'
+    r :get, comfy_admin_cms_site_pages_path(site_id: @site), params: {categories: "invalid"}
     assert_response :success
     assert assigns(:pages)
     assert_equal 0, assigns(:pages).count
@@ -43,17 +45,17 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionController::TestCase
 
   def test_get_index_with_toggle
     @site.pages.create!(
-      :label  => 'test',
-      :slug   => 'test',
-      :parent => comfy_cms_pages(:child),
-      :layout => comfy_cms_layouts(:default)
+      label:  'test',
+      slug:   'test',
+      parent: comfy_cms_pages(:child),
+      layout: comfy_cms_layouts(:default)
     )
-    get :index, :site_id => @site
+    r :get, comfy_admin_cms_site_pages_path(site_id: @site)
     assert_response :success
   end
 
   def test_get_links_with_redactor
-    get :index, :site_id => @site, :source => 'redactor'
+    r :get, comfy_admin_cms_site_pages_path(site_id: @site), params: {source: 'redactor'}
     assert_response :success
 
     assert_equal [
@@ -64,173 +66,181 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionController::TestCase
   end
 
   def test_get_new
-    get :new, :site_id => @site
+    r :get, new_comfy_admin_cms_site_page_path(site_id: @site)
     assert_response :success
     assert assigns(:page)
-    assert_equal comfy_cms_layouts(:default), assigns(:page).layout
+    assert_equal @layout, assigns(:page).layout
     assert_template :new
     assert_select "form[action='/admin/sites/#{@site.id}/pages']"
-    assert_select "select[data-url='/admin/sites/#{@site.id}/pages/0/form_blocks']"
+    assert_select "select[data-url='/admin/sites/#{@site.id}/pages/0/form_fragments']"
   end
 
-  def test_get_new_with_field_datetime
-    comfy_cms_layouts(:default).update_columns(:content =>'{{cms:field:test_label:datetime}}')
-    get :new, :site_id => @site
-    assert_response :success
-    assert_select "input[type='text'][name='page[blocks_attributes][0][content]'][data-cms-datetime]"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
-  end
-
-  def test_get_new_with_field_integer
-    comfy_cms_layouts(:default).update_columns(:content => '{{cms:field:test_label:integer}}')
-    get :new, :site_id => @site
+  def test_get_new_with_field_wysiwyg
+    @layout.update_column(:content, "{{cms:wysiwyg test}}")
+    r :get, new_comfy_admin_cms_site_page_path(site_id: @site)
     assert_response :success
-    assert_select "input[type='number'][name='page[blocks_attributes][0][content]']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
-  end
-
-  def test_get_new_with_field_string
-    comfy_cms_layouts(:default).update_columns(:content => '{{cms:field:test_label:string}}')
-    get :new, :site_id => @site
-    assert_response :success
-    assert_select "input[type='text'][name='page[blocks_attributes][0][content]']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
+    assert_select "textarea[name='page[fragments_attributes][0][content]'][data-cms-rich-text]"
+    assert_select "input[type='hidden'][name='page[fragments_attributes][0][identifier]'][value='test']"
+    assert_select "input[type='hidden'][name='page[fragments_attributes][0][tag]'][value='wysiwyg']"
   end
 
   def test_get_new_with_field_text
-    comfy_cms_layouts(:default).update_columns(:content => '{{cms:field:test_label:text}}')
-    get :new, :site_id => @site
+    @layout.update_column(:content, "{{cms:text test}}")
+    r :get, new_comfy_admin_cms_site_page_path(site_id: @site)
     assert_response :success
-    assert_select "textarea[name='page[blocks_attributes][0][content]'][data-cms-cm-mode='text/html']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
+    assert_select "input[type='text'][name='page[fragments_attributes][0][content]']"
+    assert_select "input[type='hidden'][name='page[fragments_attributes][0][identifier]'][value='test']"
+    assert_select "input[type='hidden'][name='page[fragments_attributes][0][tag]'][value='text']"
   end
 
-  def test_get_new_with_field_rich_text
-    comfy_cms_layouts(:default).update_columns(:content => '{{cms:field:test_label:rich_text}}')
-    get :new, :site_id => @site
+  def test_get_new_with_field_textarea
+    @layout.update_column(:content, "{{cms:textarea test}}")
+    r :get, new_comfy_admin_cms_site_page_path(site_id: @site)
     assert_response :success
-    assert_select "textarea[name='page[blocks_attributes][0][content]'][data-cms-rich-text]"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
+    assert_select "textarea[name='page[fragments_attributes][0][content]'][data-cms-cm-mode='text/html']"
+    assert_select "input[type='hidden'][name='page[fragments_attributes][0][identifier]'][value='test']"
+    assert_select "input[type='hidden'][name='page[fragments_attributes][0][tag]'][value='text_area']"
   end
 
-  def test_get_new_with_page_datetime
-    comfy_cms_layouts(:default).update_columns(:content => '{{cms:page:test_label:datetime}}')
-    get :new, :site_id => @site
+  def test_get_new_with_field_markdown
+    @layout.update_column(:content, "{{cms:markdown test}}")
+    r :get, new_comfy_admin_cms_site_page_path(site_id: @site)
     assert_response :success
-    assert_select "input[type='text'][name='page[blocks_attributes][0][content]'][data-cms-datetime]"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
+    assert_select "textarea[name='page[fragments_attributes][0][content]'][data-cms-cm-mode='text/x-markdown']"
+    assert_select "input[type='hidden'][name='page[fragments_attributes][0][identifier]'][value='test']"
+    assert_select "input[type='hidden'][name='page[fragments_attributes][0][tag]'][value='markdown']"
   end
 
-  def test_get_new_with_page_integer
-    comfy_cms_layouts(:default).update_columns(:content => '{{cms:page:test_label:integer}}')
-    get :new, :site_id => @site
-    assert_response :success
-    assert_select "input[type='number'][name='page[blocks_attributes][0][content]']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
-  end
-
-  def test_get_new_with_page_string
-    comfy_cms_layouts(:default).update_columns(:content => '{{cms:page:test_label:string}}')
-    get :new, :site_id => @site
-    assert_response :success
-    assert_select "input[type='text'][name='page[blocks_attributes][0][content]']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
-  end
-
-  def test_get_new_with_page_text
-    comfy_cms_layouts(:default).update_columns(:content => '{{cms:page:test_label}}')
-    get :new, :site_id => @site
+  def test_get_new_with_field_datetime
+    @layout.update_column(:content, "{{cms:datetime test}}")
+    r :get, new_comfy_admin_cms_site_page_path(site_id: @site)
     assert_response :success
-    assert_select "textarea[name='page[blocks_attributes][0][content]'][data-cms-cm-mode='text/html']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
+    assert_select "input[type='text'][name='page[fragments_attributes][0][datetime]'][data-cms-datetime]"
+    assert_select "input[type='hidden'][name='page[fragments_attributes][0][identifier]'][value='test']"
+    assert_select "input[type='hidden'][name='page[fragments_attributes][0][tag]'][value='datetime']"
   end
 
-  def test_get_new_with_page_file
-    comfy_cms_layouts(:default).update_columns(:content => '{{cms:page_file:test_label}}')
-    get :new, :site_id => @site
+  def test_get_new_with_field_date
+    @layout.update_column(:content, "{{cms:date test}}")
+    r :get, new_comfy_admin_cms_site_page_path(site_id: @site)
     assert_response :success
-    assert_select "input[type='file'][name='page[blocks_attributes][0][content]']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
+    assert_select "input[type='text'][name='page[fragments_attributes][0][datetime]'][data-cms-date]"
+    assert_select "input[type='hidden'][name='page[fragments_attributes][0][identifier]'][value='test']"
+    assert_select "input[type='hidden'][name='page[fragments_attributes][0][tag]'][value='date']"
   end
 
-  def test_get_new_with_page_files
-    comfy_cms_layouts(:default).update_columns(:content => '{{cms:page_files:test_label}}')
-    get :new, :site_id => @site
+  def test_get_new_with_field_number
+    @layout.update_column(:content, "{{cms:number test}}")
+    r :get, new_comfy_admin_cms_site_page_path(site_id: @site)
     assert_response :success
-    assert_select "input[type='file'][name='page[blocks_attributes][0][content][]'][multiple=multiple]"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
+    assert_select "input[type='number'][name='page[fragments_attributes][0][content]']"
+    assert_select "input[type='hidden'][name='page[fragments_attributes][0][identifier]'][value='test']"
+    assert_select "input[type='hidden'][name='page[fragments_attributes][0][tag]'][value='number']"
   end
 
-  def test_get_new_with_collection
-    snippet = comfy_cms_snippets(:default)
-    comfy_cms_layouts(:default).update_columns(:content => '{{cms:collection:snippet:comfy/cms/snippet}}')
-    get :new, :site_id => @site
+  def test_get_new_with_field_checkbox
+    @layout.update_column(:content, "{{cms:checkbox test}}")
+    r :get, new_comfy_admin_cms_site_page_path(site_id: @site)
     assert_response :success
-    assert_select "select[name='page[blocks_attributes][0][content]']" do
-      assert_select "option[value='']", :html => '---- Select Comfy/Cms/Snippet ----'
-      assert_select "option[value='#{snippet.id}']", :html => snippet.label
-    end
-    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='snippet']"
+    assert_select "input[type='hidden'][name='page[fragments_attributes][0][boolean]'][value='0']"
+    assert_select "input[type='checkbox'][name='page[fragments_attributes][0][boolean]'][value='1']"
+    assert_select "input[type='hidden'][name='page[fragments_attributes][0][identifier]'][value='test']"
+    assert_select "input[type='hidden'][name='page[fragments_attributes][0][tag]'][value='checkbox']"
   end
 
-  def test_get_new_with_page_rich_text
-    comfy_cms_layouts(:default).update_columns(:content => '{{cms:page:test_label:rich_text}}')
-    get :new, :site_id => @site
+  def test_get_new_with_field_file
+    @layout.update_column(:content, "{{cms:file test}}")
+    r :get, new_comfy_admin_cms_site_page_path(site_id: @site)
     assert_response :success
-    assert_select "textarea[name='page[blocks_attributes][0][content]'][data-cms-rich-text]"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
+    assert_select "input[type='file'][name='page[fragments_attributes][0][files]']"
+    assert_select "input[type='hidden'][name='page[fragments_attributes][0][identifier]'][value='test']"
+    assert_select "input[type='hidden'][name='page[fragments_attributes][0][tag]'][value='file']"
   end
 
-  def test_get_new_with_page_markdown
-    comfy_cms_layouts(:default).update_columns(:content => '{{cms:page:test_label:markdown}}')
-    get :new, :site_id => @site
+  def test_get_new_with_field_files
+    @layout.update_column(:content, "{{cms:files test}}")
+    r :get, new_comfy_admin_cms_site_page_path(site_id: @site)
     assert_response :success
-    assert_select "textarea[name='page[blocks_attributes][0][content]'][data-cms-cm-mode='text/x-markdown']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
+    assert_select "input[type='file'][name='page[fragments_attributes][0][files][]'][multiple=multiple]"
+    assert_select "input[type='hidden'][name='page[fragments_attributes][0][identifier]'][value='test']"
+    assert_select "input[type='hidden'][name='page[fragments_attributes][0][tag]'][value='files']"
   end
 
-  def test_get_new_with_boolean_field
-    comfy_cms_layouts(:default).update_columns(:content => '{{cms:field:test_label:boolean}}')
-    get :new, :site_id => @site
+  def test_get_new_with_several_fields
+    @layout.update_column(:content, "{{cms:wysiwyg a}}{{cms:markdown b}}")
+    r :get, new_comfy_admin_cms_site_page_path(site_id: @site)
     assert_response :success
-    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][0][content]'][value='']"
-    assert_select "input[type='checkbox'][name='page[blocks_attributes][0][content]'][value='1']"
+    assert_select "textarea[name='page[fragments_attributes][0][content]']"
+    assert_select "input[type='hidden'][name='page[fragments_attributes][0][identifier]'][value='a']"
+    assert_select "input[type='hidden'][name='page[fragments_attributes][0][tag]'][value='wysiwyg']"
+    assert_select "textarea[name='page[fragments_attributes][1][content]']"
+    assert_select "input[type='hidden'][name='page[fragments_attributes][1][identifier]'][value='b']"
+    assert_select "input[type='hidden'][name='page[fragments_attributes][1][tag]'][value='markdown']"
   end
 
-  def test_get_new_with_several_tag_fields
-    comfy_cms_layouts(:default).update_columns(:content => '{{cms:page:label_a}}{{cms:page:label_b}}')
-    get :new, :site_id => @site
+  def test_get_new_with_non_renderable_fragment
+    @layout.update_column(:content, "{{cms:text a}}{{cms:text b, render: false}}")
+    r :get, new_comfy_admin_cms_site_page_path(site_id: @site)
     assert_response :success
-    assert_select "textarea[name='page[blocks_attributes][0][content]']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='label_a']"
-    assert_select "textarea[name='page[blocks_attributes][1][content]']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][1][identifier]'][value='label_b']"
+    assert_select "label.renderable-true", "A"
+    assert_select "label.renderable-false", "B"
   end
 
   def test_get_new_with_crashy_tag
-    comfy_cms_layouts(:default).update_columns(:content => '{{cms:collection:label:invalid}}')
+    @layout.update_column(:content, "{{cms:invalid}}")
     assert_exception_raised do
-      get :new, :site_id => @site
+      r :get, new_comfy_admin_cms_site_page_path(site_id: @site)
     end
 
-    Rails.stubs(:env => ActiveSupport::StringInquirer.new('production'))
-    get :new, :site_id => @site
+    Rails.stubs(env: ActiveSupport::StringInquirer.new("production"))
+    r :get, new_comfy_admin_cms_site_page_path(site_id: @site)
     assert_response :success
   end
 
   def test_get_new_with_repeated_tag
-    comfy_cms_layouts(:default).update_columns(:content => '{{cms:page:test_label}}{{cms:page:test_label}}')
-    get :new, :site_id => @site
+    @layout.update_column(:content, "{{cms:text test}}{{cms:text test}}")
+    r :get, new_comfy_admin_cms_site_page_path(site_id: @site)
+    assert_response :success
+    assert_select "input[name='page[fragments_attributes][0][content]']"
+    assert_select "input[type='hidden'][name='page[fragments_attributes][0][identifier]'][value='test']"
+    assert_select "input[name='page[fragments_attributes][1][content]']", 0
+    assert_select "input[type='hidden'][name='page[fragments_attributes][1][identifier]'][value='test']", 0
+  end
+
+  def test_get_new_with_namespaced_tags
+    @layout.update_column(:content, "{{cms:text a, namespace: a}}{{cms:text b, namespace: b}}")
+    r :get, new_comfy_admin_cms_site_page_path(site_id: @site)
+    assert_response :success
+    assert_select "a[data-toggle='tab'][href='#ns-a']", "A"
+    assert_select "a[data-toggle='tab'][href='#ns-b']", "B"
+    assert_select "input[name='page[fragments_attributes][0][content]']"
+    assert_select "input[type='hidden'][name='page[fragments_attributes][0][identifier]'][value='a']"
+    assert_select "input[name='page[fragments_attributes][1][content]']"
+    assert_select "input[type='hidden'][name='page[fragments_attributes][1][identifier]'][value='b']"
+  end
+
+  def test_get_new_with_localized_names
+    I18n.backend.store_translations(:en, {comfy: {cms: {content: {
+      tag:        {localized_a: "Localized Fragment"},
+      namespace:  {localized_a: "Localized Namespace"}
+    }}}})
+    @layout.update_column(:content,
+      "{{cms:text localized_a, namespace: localized_a}}{{cms:text b, namespace: b}}"
+    )
+    r :get, new_comfy_admin_cms_site_page_path(site_id: @site)
     assert_response :success
-    assert_select "textarea[name='page[blocks_attributes][0][content]']"
-    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
-    assert_select "textarea[name='page[blocks_attributes][1][content]']", 0
-    assert_select "input[type='hidden'][name='page[blocks_attributes][1][identifier]'][value='test_label']", 0
+
+    assert_select "a[data-toggle='tab'][href='#ns-localized_a']", "Localized Namespace"
+    assert_select "label", "Localized Fragment"
+
+  ensure
+    I18n.backend.store_translations(:en, {comfy: {cms: {content: {
+      tag: nil, namespace:  nil
+    }}}})
   end
 
   def test_get_new_as_child_page
-    get :new, :site_id => @site, :parent_id => comfy_cms_pages(:default)
+    r :get, new_comfy_admin_cms_site_page_path(site_id: @site), params: {parent_id: @page}
     assert_response :success
     assert assigns(:page)
     assert_equal comfy_cms_pages(:default), assigns(:page).parent
@@ -238,130 +248,167 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionController::TestCase
   end
 
   def test_get_edit
-    page = comfy_cms_pages(:default)
-    get :edit, :site_id => page.site, :id => page
+    r :get, edit_comfy_admin_cms_site_page_path(site_id: @site, id: @page)
     assert_response :success
     assert assigns(:page)
     assert_template :edit
-    assert_select "form[action='/admin/sites/#{page.site.id}/pages/#{page.id}']"
-    assert_select "select[data-url='/admin/sites/#{page.site.id}/pages/#{page.id}/form_blocks']"
+    assert_select "form[action='/admin/sites/#{@site.id}/pages/#{@page.id}']"
+    assert_select "select[data-url='/admin/sites/#{@site.id}/pages/#{@page.id}/form_fragments']"
   end
 
   def test_get_edit_failure
-    get :edit, :site_id => @site, :id => 'not_found'
+    r :get, edit_comfy_admin_cms_site_page_path(site_id: @site, id: 'not_found')
     assert_response :redirect
-    assert_redirected_to :action => :index
+    assert_redirected_to action: :index
     assert_equal 'Page not found', flash[:danger]
   end
 
   def test_get_edit_with_blank_layout
-    page = comfy_cms_pages(:default)
-    page.update_columns(:layout_id => nil)
-    get :edit, :site_id => page.site, :id => page
+    @page.update_column(:layout_id, nil)
+    r :get, edit_comfy_admin_cms_site_page_path(site_id: @site, id: @page)
     assert_response :success
     assert assigns(:page)
-    assert assigns(:page).layout
   end
 
   def test_get_edit_with_non_english_locale
-    site = @site
-    site.update_columns(:locale => 'es')
-    get :edit, :site_id => site, :id => comfy_cms_pages(:default)
+    @site.update_column(:locale, "es")
+    r :get, edit_comfy_admin_cms_site_page_path(site_id: @site, id: @page)
     assert_response :success
   end
 
   def test_get_edit_with_layout_and_no_tags
-    page = comfy_cms_pages(:default)
-    page.layout.update_column(:content, '')
-    get :edit, :site_id => page.site, :id => page
+    @page.layout.update_column(:content, "")
+    r :get, edit_comfy_admin_cms_site_page_path(site_id: @site, id: @page)
     assert_response :success
   end
 
   def test_creation
     assert_difference 'Comfy::Cms::Page.count' do
-      assert_difference 'Comfy::Cms::Block.count', 2 do
-        post :create, :site_id => @site, :page => {
-          :label          => 'Test Page',
-          :slug           => 'test-page',
-          :parent_id      => comfy_cms_pages(:default).id,
-          :layout_id      => comfy_cms_layouts(:default).id,
-          :blocks_attributes => [
-            { :identifier => 'default_page_text',
-              :content    => 'content content' },
-            { :identifier => 'default_field_text',
-              :content    => 'title content' }
-          ]
-        }, :commit => 'Create Page'
+      assert_difference 'Comfy::Cms::Fragment.count', 2 do
+        r :post, comfy_admin_cms_site_pages_path(site_id: @site), params: {
+          page: {
+            label:              'Test Page',
+            slug:               'test-page',
+            parent_id:          @page.id,
+            layout_id:          @layout.id,
+            fragments_attributes: [
+              { identifier: 'default_page_text',
+                content:    'content content' },
+              { identifier: 'default_field_text',
+                content:    'title content' }
+            ]
+          },
+          commit: 'Create Page'
+        }
         assert_response :redirect
         page = Comfy::Cms::Page.last
         assert_equal @site, page.site
-        assert_redirected_to :action => :edit, :id => page
+        assert_redirected_to action: :edit, id: page
         assert_equal 'Page created', flash[:success]
       end
     end
   end
 
+  def test_creation_with_files
+    assert_difference 'Comfy::Cms::Page.count' do
+      assert_difference "Comfy::Cms::Fragment.count", 3 do
+        assert_difference "ActiveStorage::Attachment.count", 3 do
+          r :post, comfy_admin_cms_site_pages_path(site_id: @site), params: {
+            page: {
+              label:     "Test Page",
+              slug:      "test-page",
+              parent_id: @page.id,
+              layout_id: @layout.id,
+              fragments_attributes: [
+                { identifier: "image",
+                  tag:        "file",
+                  files:      fixture_file_upload("files/image.jpg", "image/jpeg")
+                },
+                { identifier: "files_multiple",
+                  tag:        "files",
+                  files: [
+                    fixture_file_upload("files/image.jpg", "image/jpeg"),
+                    fixture_file_upload("files/document.pdf", "application/pdf")
+                  ]
+                },
+                { identifier: "unpopulated",
+                  tag:        "file",
+                  content:    nil
+                },
+              ]
+            },
+            commit: 'Create Page'
+          }
+          assert_response :redirect
+          page = Comfy::Cms::Page.last
+          assert_equal @site, page.site
+          assert_redirected_to action: :edit, id: page
+          assert_equal 'Page created', flash[:success]
+        end
+      end
+    end
+  end
+
   def test_creation_failure
-    assert_no_difference ['Comfy::Cms::Page.count', 'Comfy::Cms::Block.count'] do
-      post :create, :site_id => @site, :page => {
-        :layout_id => comfy_cms_layouts(:default).id,
-        :blocks_attributes => [
-          { :identifier => 'default_page_text',
-            :content    => 'content content' },
-          { :identifier => 'default_field_text',
-            :content    => 'title content' }
+    assert_no_difference ['Comfy::Cms::Page.count', 'Comfy::Cms::Fragment.count'] do
+      r :post, comfy_admin_cms_site_pages_path(site_id: @site), params: {page: {
+        layout_id: @layout.id,
+        fragments_attributes: [
+          { identifier: 'content',
+            content:    'content content' },
+          { identifier: 'title',
+            content:    'title content' }
         ]
-      }
+      }}
       assert_response :success
       page = assigns(:page)
-      assert_equal 2, page.blocks.size
-      assert_equal ['content content', 'title content'], page.blocks.collect{|b| b.content}
+
+      assert_equal 2, page.fragments.size
+      assert_equal ['content content', 'title content'], page.fragments.collect{|b| b.content}
       assert_template :new
       assert_equal 'Failed to create page', flash[:danger]
     end
   end
 
   def test_update
-    page = comfy_cms_pages(:default)
-    assert_no_difference 'Comfy::Cms::Block.count' do
-      put :update, :site_id => page.site, :id => page, :page => {
-        :label => 'Updated Label'
-      }
-      page.reload
+    assert_no_difference 'Comfy::Cms::Fragment.count' do
+      r :put, comfy_admin_cms_site_page_path(site_id: @site, id: @page), params: {page: {
+        label: 'Updated Label'
+      }}
+      @page.reload
       assert_response :redirect
-      assert_redirected_to :action => :edit, :id => page
+      assert_redirected_to action: :edit, id: @page
       assert_equal 'Page updated', flash[:success]
-      assert_equal 'Updated Label', page.label
+      assert_equal 'Updated Label', @page.label
     end
   end
 
   def test_update_with_layout_change
-    page = comfy_cms_pages(:default)
-    assert_difference 'Comfy::Cms::Block.count', 2 do
-      put :update, :site_id => page.site, :id => page, :page => {
-        :label      => 'Updated Label',
-        :layout_id  => comfy_cms_layouts(:nested).id,
-        :blocks_attributes => [
-          { :identifier => 'content',
-            :content    => 'new_page_text_content' },
-          { :identifier => 'header',
-            :content    => 'new_page_string_content' }
+    assert_difference 'Comfy::Cms::Fragment.count' do
+      r :put, comfy_admin_cms_site_page_path(site_id: @site, id: @page), params: {page: {
+        label:      'Updated Label',
+        layout_id:  comfy_cms_layouts(:nested).id,
+        fragments_attributes: [
+          { identifier: 'content',
+            content:    'new_page_text_content' },
+          { identifier: 'header',
+            content:    'new_page_string_content' }
         ]
-      }
-      page.reload
+      }}
+      @page.reload
       assert_response :redirect
-      assert_redirected_to :action => :edit, :id => page
+      assert_redirected_to action: :edit, id: @page
       assert_equal 'Page updated', flash[:success]
-      assert_equal 'Updated Label', page.label
-      identifiers = page.blocks.collect {|b| b.identifier}
-      assert_equal ['content', 'default_field_text', 'default_page_text', 'header'], identifiers.sort
+      assert_equal 'Updated Label', @page.label
+      identifiers = @page.fragments.collect {|b| b.identifier}
+      assert_equal ["boolean", "content", "datetime", "file", "header"], identifiers.sort
     end
   end
 
   def test_update_failure
-    put :update, :site_id => @site, :id => comfy_cms_pages(:default), :page => {
-      :label => ''
-    }
+    r :put, comfy_admin_cms_site_page_path(site_id: @site, id: @page), params: {page: {
+      label: ""
+    }}
     assert_response :success
     assert_template :edit
     assert assigns(:page)
@@ -370,101 +417,109 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionController::TestCase
 
   def test_destroy
     assert_difference 'Comfy::Cms::Page.count', -2 do
-      assert_difference 'Comfy::Cms::Block.count', -2 do
-        delete :destroy, :site_id => @site, :id => comfy_cms_pages(:default)
+      assert_difference 'Comfy::Cms::Fragment.count', -4 do
+        r :delete, comfy_admin_cms_site_page_path(site_id: @site, id: @page)
         assert_response :redirect
-        assert_redirected_to :action => :index
+        assert_redirected_to action: :index
         assert_equal 'Page deleted', flash[:success]
       end
     end
   end
 
-  def test_get_form_blocks
-    site = @site
-    xhr :get, :form_blocks, :site_id => site, :id => comfy_cms_pages(:default), :layout_id => comfy_cms_layouts(:nested).id
+  def test_get_form_fragments
+    r :get, form_fragments_comfy_admin_cms_site_page_path(site_id: @site, id: @page), xhr: true, params: {
+      layout_id: comfy_cms_layouts(:nested).id
+    }
     assert_response :success
     assert assigns(:page)
-    assert_equal 2, assigns(:page).tags.size
-    assert_template :form_blocks
+    assert_equal 2, assigns(:page).fragment_nodes.size
+    assert_template :form_fragments
 
-    xhr :get, :form_blocks, :site_id => site, :id => comfy_cms_pages(:default), :layout_id => comfy_cms_layouts(:default).id
+    r :get, form_fragments_comfy_admin_cms_site_page_path(site_id: @site, id: @page), xhr: true, params: {
+      layout_id: @layout.id
+    }
     assert_response :success
     assert assigns(:page)
-    assert_equal 4, assigns(:page).tags.size
-    assert_template :form_blocks
+    assert_equal 1, assigns(:page).fragment_nodes.size
+    assert_template :form_fragments
   end
 
-  def test_get_form_blocks_for_new_page
-    xhr :get, :form_blocks, :site_id => @site, :id => 0, :layout_id => comfy_cms_layouts(:default).id
+  def test_get_form_fragments_for_new_page
+    r :get, form_fragments_comfy_admin_cms_site_page_path(site_id: @site, id: 0), xhr: true, params: {
+      layout_id: @layout.id
+    }
     assert_response :success
     assert assigns(:page)
-    assert_equal 3, assigns(:page).tags.size
-    assert_template :form_blocks
+    assert_equal 1, assigns(:page).fragment_nodes.size
+    assert_template :form_fragments
   end
 
   def test_creation_preview
-    site    = @site
-    layout  = comfy_cms_layouts(:default)
-
     assert_no_difference 'Comfy::Cms::Page.count' do
-      post :create, :site_id => site, :preview => 'Preview', :page => {
-        :label      => 'Test Page',
-        :slug       => 'test-page',
-        :parent_id  => comfy_cms_pages(:default).id,
-        :layout_id  => layout.id,
-        :blocks_attributes => [
-          { :identifier => 'default_page_text',
-            :content    => 'preview content' }
-        ]
+      r :post, comfy_admin_cms_site_pages_path(site_id: @site), params: {
+        preview: 'Preview',
+        page: {
+          label:     'Test Page',
+          slug:      'test-page',
+          parent_id: @page.id,
+          layout_id: @layout.id,
+          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_equal @site, assigns(:cms_site)
+      assert_equal @layout, assigns(:cms_layout)
       assert assigns(:cms_page)
       assert assigns(:cms_page).new_record?
     end
   end
 
   def test_update_preview
-    page = comfy_cms_pages(:default)
     assert_no_difference 'Comfy::Cms::Page.count' do
-      put :update, :site_id => page.site, :preview => 'Preview', :id => page, :page => {
-        :label => 'Updated Label',
-        :blocks_attributes => [
-          { :identifier => 'default_page_text',
-            :content    => 'preview content' }
-        ]
+      r :put, comfy_admin_cms_site_page_path(site_id: @site, id: @page), params: {
+        preview: 'Preview',
+        page: {
+        label: 'Updated Label',
+        fragments_attributes: [
+          { identifier: 'content',
+            content:    'preview content' }
+          ]
+        }
       }
       assert_response :success
       assert_match /preview content/, response.body
-      page.reload
-      assert_not_equal 'Updated Label', page.label
+      @page.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)
+      assert_equal @page.site,   assigns(:cms_site)
+      assert_equal @page.layout, assigns(:cms_layout)
+      assert_equal @page,        assigns(:cms_page)
     end
   end
 
   def test_preview_language
-    site = @site
-    site.update_columns(:locale => 'de')
-    layout = comfy_cms_layouts(:default)
+    @site.update_column(:locale, 'de')
 
     assert_equal :en, I18n.locale
 
-    post :create, :site_id => site, :preview => 'Preview', :page => {
-      :label      => 'Test Page',
-      :slug       => 'test-page',
-      :parent_id  => comfy_cms_pages(:default).id,
-      :layout_id  => layout.id,
-      :blocks_attributes => [
-        { :identifier => 'default_page_text',
-          :content    => 'preview content' }
-      ]
+    r :post, comfy_admin_cms_site_pages_path(site_id: @site), params: {
+      preview: 'Preview',
+      page: {
+        label:     'Test Page',
+        slug:      'test-page',
+        parent_id: @page.id,
+        layout_id: @layout.id,
+        fragments_attributes: [
+          { identifier: 'content',
+            content:    'preview content' }
+        ]
+      }
     }
 
     assert_response :success
@@ -473,7 +528,7 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionController::TestCase
 
   def test_get_new_with_no_layout
     Comfy::Cms::Layout.destroy_all
-    get :new, :site_id => @site
+    r :get, new_comfy_admin_cms_site_page_path(site_id: @site)
     assert_response :redirect
     assert_redirected_to new_comfy_admin_cms_site_layout_path(@site)
     assert_equal 'No Layouts found. Please create one.', flash[:danger]
@@ -481,20 +536,18 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionController::TestCase
 
   def test_get_edit_with_no_layout
     Comfy::Cms::Layout.destroy_all
-    page = comfy_cms_pages(:default)
-    get :edit, :site_id => page.site, :id => page
+    r :get, edit_comfy_admin_cms_site_page_path(site_id: @site, id: @page)
     assert_response :redirect
-    assert_redirected_to new_comfy_admin_cms_site_layout_path(page.site)
+    assert_redirected_to new_comfy_admin_cms_site_layout_path(@site)
     assert_equal 'No Layouts found. Please create one.', flash[:danger]
   end
 
   def test_get_toggle_branch
-    page = comfy_cms_pages(:default)
-    xhr :get, :toggle_branch, :site_id => page.site, :id => page, :format => :js
+    r :get, toggle_branch_comfy_admin_cms_site_page_path(site_id: @site, id: @page), xhr: true, params: {format: :js}
     assert_response :success
-    assert_equal [page.id.to_s], session[:cms_page_tree]
+    assert_equal [@page.id.to_s], session[:cms_page_tree]
 
-    xhr :get, :toggle_branch, :site_id => page.site, :id => page, :format => :js
+    r :get, toggle_branch_comfy_admin_cms_site_page_path(site_id: @site, id: @page), xhr: true, params: {format: :js}
     assert_response :success
     assert_equal [], session[:cms_page_tree]
   end
@@ -502,15 +555,17 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionController::TestCase
   def test_reorder
     page_one = comfy_cms_pages(:child)
     page_two = @site.pages.create!(
-      :parent => comfy_cms_pages(:default),
-      :layout => comfy_cms_layouts(:default),
-      :label  => 'test',
-      :slug   => 'test'
+      parent: @page,
+      layout: @layout,
+      label:  'test',
+      slug:   'test'
     )
     assert_equal 0, page_one.position
     assert_equal 1, page_two.position
 
-    put :reorder, :site_id => @site, :comfy_cms_page => [page_two.id, page_one.id]
+    r :put, reorder_comfy_admin_cms_site_pages_path(site_id: @site), params: {
+      comfy_cms_page: [page_two.id, page_one.id]
+    }
     assert_response :success
     page_one.reload
     page_two.reload
@@ -518,5 +573,4 @@ class Comfy::Admin::Cms::PagesControllerTest < ActionController::TestCase
     assert_equal 1, page_one.position
     assert_equal 0, page_two.position
   end
-  
 end