comfortable_mexican_sofa 1.12.11 → 2.0.0

data/test/lib/fixtures/snippets_test.rb

@@ -1,106 +0,0 @@
-# encoding: utf-8
-
-require_relative '../../test_helper'
-
-class FixtureSnippetsTest < ActiveSupport::TestCase
-  
-  def test_creation
-    Comfy::Cms::Snippet.delete_all
-    
-    # need to have categories present before linking
-    site = comfy_cms_sites(:default)
-    site.categories.create!(:categorized_type => 'Comfy::Cms::Snippet', :label => 'category_a')
-    site.categories.create!(:categorized_type => 'Comfy::Cms::Snippet', :label => 'category_b')
-    
-    assert_difference 'Comfy::Cms::Snippet.count' do
-      ComfortableMexicanSofa::Fixture::Snippet::Importer.new('sample-site', 'default-site').import!
-      assert snippet = Comfy::Cms::Snippet.last
-      assert_equal 'default', snippet.identifier
-      assert_equal 'Default Fixture Snippet', snippet.label
-      assert_equal 'Fixture Content for Default Snippet', snippet.content
-      assert_equal 2, snippet.categories.count
-      assert_equal ['category_a', 'category_b'], snippet.categories.map{|c| c.label}
-    end
-  end
-  
-  def test_update
-    snippet = comfy_cms_snippets(:default)
-    snippet.update_column(:updated_at, 10.years.ago)
-    assert_equal 'default', snippet.identifier
-    assert_equal 'Default Snippet', snippet.label
-    assert_equal 'default_snippet_content', snippet.content
-    
-    assert_no_difference 'Comfy::Cms::Snippet.count' do
-      ComfortableMexicanSofa::Fixture::Snippet::Importer.new('sample-site', 'default-site').import!
-      snippet.reload
-      assert_equal 'default', snippet.identifier
-      assert_equal 'Default Fixture Snippet', snippet.label
-      assert_equal 'Fixture Content for Default Snippet', snippet.content
-    end
-  end
-  
-  def test_delete
-    old_snippet = comfy_cms_snippets(:default)
-    old_snippet.update_column(:identifier, 'old')
-    
-    assert_no_difference 'Comfy::Cms::Snippet.count' do
-      ComfortableMexicanSofa::Fixture::Snippet::Importer.new('sample-site', 'default-site').import!
-      assert snippet = Comfy::Cms::Snippet.last
-      assert_equal 'default', snippet.identifier
-      assert_equal 'Default Fixture Snippet', snippet.label
-      assert_equal 'Fixture Content for Default Snippet', snippet.content
-      
-      assert_nil Comfy::Cms::Snippet.where(:id => old_snippet.id).first
-    end
-  end
-  
-  def test_update_ignoring
-    snippet = comfy_cms_snippets(:default)
-    snippet_path      = File.join(ComfortableMexicanSofa.config.fixtures_path, 'sample-site', 'snippets', 'default')
-    attr_file_path    = File.join(snippet_path, 'attributes.yml')
-    content_file_path = File.join(snippet_path, 'content.html')
-    
-    assert snippet.updated_at >= File.mtime(attr_file_path)
-    assert snippet.updated_at >= File.mtime(content_file_path)
-    
-    ComfortableMexicanSofa::Fixture::Snippet::Importer.new('sample-site', 'default-site').import!
-    snippet.reload
-    assert_equal 'default', snippet.identifier
-    assert_equal 'Default Snippet', snippet.label
-    assert_equal 'default_snippet_content', snippet.content
-  end
-  
-  def test_update_force
-    snippet = comfy_cms_snippets(:default)
-    ComfortableMexicanSofa::Fixture::Snippet::Importer.new('sample-site', 'default-site').import!
-    snippet.reload
-    assert_equal 'Default Snippet', snippet.label
-    
-    ComfortableMexicanSofa::Fixture::Snippet::Importer.new('sample-site', 'default-site', :forced).import!
-    snippet.reload
-    assert_equal 'Default Fixture Snippet', snippet.label
-  end
-  
-  def test_export
-    comfy_cms_categories(:default).categorizations.create!(
-      :categorized => comfy_cms_snippets(:default)
-    )
-    
-    host_path = File.join(ComfortableMexicanSofa.config.fixtures_path, 'test-site')
-    attr_path     = File.join(host_path, 'snippets/default/attributes.yml')
-    content_path  = File.join(host_path, 'snippets/default/content.html')
-    
-    ComfortableMexicanSofa::Fixture::Snippet::Exporter.new('default-site', 'test-site').export!
-    
-    assert File.exists?(attr_path)
-    assert File.exists?(content_path)
-    assert_equal ({
-      'label'       => 'Default Snippet',
-      'categories'  => ['Default']
-    }), YAML.load_file(attr_path)
-    assert_equal comfy_cms_snippets(:default).content, IO.read(content_path)
-    
-    FileUtils.rm_rf(host_path)
-  end
-  
-end

data/test/lib/fixtures_test.rb

@@ -1,43 +0,0 @@
-# encoding: utf-8
-
-require_relative '../test_helper'
-
-class FixtureTest < ActiveSupport::TestCase
-  
-  def test_import_all
-    Comfy::Cms::Page.destroy_all
-    Comfy::Cms::Layout.destroy_all
-    Comfy::Cms::Snippet.destroy_all
-    
-    assert_difference 'Comfy::Cms::Layout.count', 2 do
-      assert_difference 'Comfy::Cms::Page.count', 2 do
-        assert_difference 'Comfy::Cms::Snippet.count', 1 do
-          ComfortableMexicanSofa::Fixture::Importer.new('sample-site', 'default-site').import!
-        end
-      end
-    end
-  end
-  
-  def test_import_all_with_no_site
-    comfy_cms_sites(:default).destroy
-    
-    assert_exception_raised ActiveRecord::RecordNotFound do
-      ComfortableMexicanSofa::Fixture::Importer.new('sample-site', 'default-site').import!
-    end
-  end
-  
-  def test_export_all
-    host_path = File.join(ComfortableMexicanSofa.config.fixtures_path, 'test-site')
-    ComfortableMexicanSofa::Fixture::Exporter.new('default-site', 'test-site').export!
-    FileUtils.rm_rf(host_path)
-  end
-  
-  def test_export_all_with_no_site
-    comfy_cms_sites(:default).destroy
-    
-    assert_exception_raised ActiveRecord::RecordNotFound do
-      ComfortableMexicanSofa::Fixture::Exporter.new('sample-site', 'default-site').export!
-    end
-  end
-  
-end

data/test/lib/mirrors_test.rb

@@ -1,254 +0,0 @@
-require_relative '../test_helper'
-
-class MirrorsTest < ActiveSupport::TestCase
-
-  def test_layout_creation
-    setup_sites
-    assert_difference 'Comfy::Cms::Layout.count', 2 do
-      layout = @site_a.layouts.create!(:identifier => 'test')
-      assert_equal 1, layout.mirrors.size
-      assert_equal 'test', layout.mirrors.first.identifier
-    end
-  end
-
-  def test_page_creation
-    setup_sites
-    layout = @site_a.layouts.create!(:identifier => 'test')
-    label = 'Root'
-    mirror_label = 'Mirror Root'
-
-    assert_difference 'Comfy::Cms::Page.count', 2 do
-      page = @site_a.pages.create!(
-        :layout => layout,
-        :label  => label
-      )
-      page_mirror = page.mirrors.first
-
-      assert_equal 1, page.mirrors.size
-      assert_equal '/', page_mirror.full_path
-      assert_equal page_mirror.label, label
-
-      page_mirror.update_attributes!(
-        :label => mirror_label
-      )
-      page.reload
-      assert_equal page.label, label
-      assert_equal page_mirror.label, mirror_label
-    end
-  end
-
-  def test_snippet_creation
-    setup_sites
-    assert_difference 'Comfy::Cms::Snippet.count', 2 do
-      snippet = @site_a.snippets.create(:identifier => 'test')
-      assert_equal 1, snippet.mirrors.size
-      assert_equal 'test', snippet.mirrors.first.identifier
-    end
-  end
-
-  def test_layout_update
-    setup_sites
-    layout_1a = @site_a.layouts.create!(:identifier => 'test_a')
-    layout_1b = @site_a.layouts.create!(:identifier => 'test_b')
-    layout_1c = @site_a.layouts.create!(:identifier => 'nested', :parent => layout_1a)
-
-    assert layout_2a = layout_1a.mirrors.first
-    assert layout_2b = layout_1b.mirrors.first
-    assert layout_2c = layout_1c.mirrors.first
-    assert_equal layout_2a, layout_2c.parent
-
-    layout_1c.update_attributes!(
-      :identifier => 'updated',
-      :parent     => layout_1b,
-      :content    => 'updated content'
-    )
-    layout_2c.reload
-    assert_equal 'updated', layout_2c.identifier
-    assert_equal layout_2b, layout_2c.parent
-    assert_not_equal 'updated content', layout_2c
-  end
-
-  def test_page_update
-    setup_sites
-    layout_1a = @site_a.layouts.create!(:identifier => 'test_a')
-    layout_1b = @site_a.layouts.create!(:identifier => 'test_b')
-
-    page_1r = @site_a.pages.create!(:slug => 'root', :layout => layout_1a)
-    page_1a = @site_a.pages.create!(:slug => 'test_a', :layout => layout_1a)
-    page_1b = @site_a.pages.create!(:slug => 'test_b', :layout => layout_1a)
-    assert_equal page_1r, page_1b.parent
-
-    assert layout_2b = layout_1b.mirrors.first
-    assert page_2a = page_1a.mirrors.first
-    assert page_2b = page_1b.mirrors.first
-
-    page_1b.update_attributes!(
-      :slug => 'updated',
-      :parent => page_1a,
-      :layout => layout_1b
-    )
-    page_2b.reload
-    assert_equal 'updated', page_2b.slug
-    assert_equal page_2a, page_2b.parent
-    assert_equal '/test_a/updated', page_2b.full_path
-    assert_equal layout_2b, page_2b.layout
-  end
-
-  def test_snippet_update
-    setup_sites
-    snippet_1 = @site_a.snippets.create(:identifier => 'test')
-    assert snippet_2 = snippet_1.mirrors.first
-    snippet_1.update_attributes!(
-      :identifier => 'updated',
-      :content    => 'updated content'
-    )
-    snippet_2.reload
-    assert_equal 'updated', snippet_2.identifier
-    assert_not_equal 'updated content', snippet_2.content
-  end
-
-  def test_layout_destroy
-    setup_sites
-    layout_1a = @site_a.layouts.create!(:identifier => 'test_a')
-    layout_1b = @site_a.layouts.create!(:identifier => 'test_b')
-    layout_1c = @site_a.layouts.create!(:identifier => 'nested', :parent => layout_1b)
-
-    assert layout_2a = layout_1a.mirrors.first
-    assert layout_2b = layout_1b.mirrors.first
-    assert layout_2c = layout_1c.mirrors.first
-
-    assert_difference ['@site_a.layouts.count', '@site_b.layouts.count'], -1 do
-      layout_1a.destroy
-      assert_nil Comfy::Cms::Layout.find_by_id(layout_2a.id)
-    end
-
-    assert_difference ['@site_a.layouts.count', '@site_b.layouts.count'], -2 do
-      layout_1b.destroy
-      assert_nil Comfy::Cms::Layout.find_by_id(layout_2b.id)
-    end
-  end
-
-  def test_page_destroy
-    setup_sites
-    layout = @site_a.layouts.create!(:identifier => 'test')
-    page_1r = @site_a.pages.create!(:slug => 'root', :layout => layout)
-    page_1a = @site_a.pages.create!(:slug => 'test_a', :layout => layout)
-    page_1b = @site_a.pages.create!(:slug => 'test_b', :layout => layout)
-
-    assert page_2r = page_1r.mirrors.first
-    assert page_2a = page_1a.mirrors.first
-    assert page_2b = page_1b.mirrors.first
-
-    assert_difference ['@site_a.pages.count', '@site_b.pages.count'], -1 do
-      page_1a.destroy
-      assert_nil Comfy::Cms::Page.find_by_id(page_2a.id)
-    end
-
-    assert_difference ['@site_a.pages.count', '@site_b.pages.count'], -2 do
-      page_1r.destroy
-      assert_nil Comfy::Cms::Page.find_by_id(page_2r.id)
-    end
-  end
-
-  def test_snippet_destroy
-    setup_sites
-    snippet_1 = @site_a.snippets.create(:identifier => 'test')
-    assert snippet_2 = snippet_1.mirrors.first
-
-    assert_difference ['@site_a.snippets.count', '@site_b.snippets.count'], -1 do
-      snippet_1.destroy
-      assert_nil Comfy::Cms::Snippet.find_by_id(snippet_2.id)
-    end
-  end
-
-  def test_site_creation_as_mirror
-    site = comfy_cms_sites(:default)
-    Comfy::Cms::Site.update_all(:is_mirrored => true) # bypassing callbacks
-
-    assert_difference 'Comfy::Cms::Site.count' do
-      assert_difference 'Comfy::Cms::Layout.count', site.layouts.count do
-        assert_difference 'Comfy::Cms::Page.count', site.pages.count do
-          assert_difference 'Comfy::Cms::Snippet.count', site.snippets.count do
-            mirror = Comfy::Cms::Site.create!(
-              :identifier   => 'mirror',
-              :hostname     => 'mirror.host',
-              :is_mirrored  => true
-            )
-          end
-        end
-      end
-    end
-  end
-
-  def test_site_update_to_mirror
-    site = comfy_cms_sites(:default)
-    Comfy::Cms::Site.update_all(:is_mirrored => true) # bypassing callbacks
-
-    mirror = Comfy::Cms::Site.create!(
-      :identifier => 'mirror',
-      :hostname   => 'mirror.host'
-    )
-    layout = mirror.layouts.create!(
-      :identifier => 'mirror_layout'
-    )
-    home_page = mirror.pages.create!(
-      :label  => 'mirror home',
-      :layout => layout
-    )
-    child_page = mirror.pages.create!(
-      :label  => 'mirror child',
-      :layout => layout,
-      :slug   => 'mirror-child',
-      :parent => home_page
-    )
-    snippet = mirror.snippets.create!(
-      :identifier => 'mirror_snippet'
-    )
-
-    assert_difference ['site.layouts.count', 'site.pages.count', 'site.snippets.count'], 1 do
-      assert_difference 'mirror.layouts.count', 3 do
-        assert_difference 'mirror.pages.count', 1 do
-          assert_difference 'mirror.snippets.count', 1 do
-
-            mirror.update_attributes(:is_mirrored => true)
-
-            site.reload
-            assert site.layouts.where(:identifier => 'mirror_layout').present?
-            assert site.pages.where(:slug => 'mirror-child').present?
-            assert site.snippets.where(:identifier => 'mirror_snippet').present?
-
-            mirror.reload
-            assert mirror.layouts.where(:identifier => 'default').present?
-            assert mirror.pages.where(:slug => 'child-page').present?
-            assert mirror.snippets.where(:identifier => 'default').present?
-          end
-        end
-      end
-    end
-  end
-
-  def test_site_destruction
-    site = comfy_cms_sites(:default)
-    Comfy::Cms::Site.update_all(:is_mirrored => true) # bypassing callbacks
-
-    mirror = Comfy::Cms::Site.create!(
-      :identifier   => 'mirror',
-      :hostname     => 'mirror.host',
-      :is_mirrored  => true
-    )
-    mirror.reload
-    assert_no_difference ['site.layouts.count', 'site.pages.count', 'site.snippets.count'] do
-      mirror.destroy
-      site.reload
-    end
-  end
-
-protected
-
-  def setup_sites
-    Comfy::Cms::Site.delete_all
-    @site_a = Comfy::Cms::Site.create!(:identifier => 'site_a', :hostname => 'site-a.host', :is_mirrored => true)
-    @site_b = Comfy::Cms::Site.create!(:identifier => 'site_b', :hostname => 'site-b.host', :is_mirrored => true)
-  end
-
-end

data/test/lib/tag_test.rb

@@ -1,309 +0,0 @@
-require_relative '../test_helper'
-
-class TagTest < ActiveSupport::TestCase
-  
-  def test_tokenizer_regex
-    regex = ComfortableMexicanSofa::Tag::TOKENIZER_REGEX
-    
-    tokens = 'text { text } text'.scan(regex)
-    assert_nil                          tokens[0][0]
-    assert_equal 'text { text } text',  tokens[0][1]
-    
-    tokens = 'content<{{cms:some_tag content'.scan(regex)
-    assert_nil                            tokens[0][0]
-    assert_equal 'content<',              tokens[0][1]
-    assert_nil                            tokens[1][0]
-    assert_equal '{{',                    tokens[1][1]
-    assert_nil                            tokens[2][0]
-    assert_equal 'cms:some_tag content',  tokens[2][1]
-    
-    tokens = 'content<{{cms some_tag}}>content'.scan(regex)
-    assert_nil                            tokens[0][0]
-    assert_equal 'content<',              tokens[0][1]
-    assert_nil                            tokens[1][0]
-    assert_equal '{{',                    tokens[1][1]
-    assert_nil                            tokens[2][0]
-    assert_equal 'cms some_tag}}>content',tokens[2][1]
-    
-    tokens = 'content<{{cms:some_tag}}>content'.scan(regex)
-    assert_nil                            tokens[0][0]
-    assert_equal 'content<',              tokens[0][1]
-    assert_equal '{{cms:some_tag}}',      tokens[1][0]
-    assert_nil                            tokens[1][1]
-    assert_nil                            tokens[2][0]
-    assert_equal '>content',              tokens[2][1]
-    
-    tokens = 'content<{{cms:type:label}}>content'.scan(regex)
-    assert_nil                            tokens[0][0]
-    assert_equal 'content<',              tokens[0][1]
-    assert_equal '{{cms:type:label}}',    tokens[1][0]
-    assert_nil                            tokens[1][1]
-    assert_nil                            tokens[2][0]
-    assert_equal '>content',              tokens[2][1]
-    
-    tokens = 'content<{{cms:type:label }}>content'.scan(regex)
-    assert_nil                            tokens[0][0]
-    assert_equal 'content<',              tokens[0][1]
-    assert_equal '{{cms:type:label }}',   tokens[1][0]
-    assert_nil                            tokens[1][1]
-    assert_nil                            tokens[2][0]
-    assert_equal '>content',              tokens[2][1]
-    
-    tokens = 'content<{{ cms:type:la/b el }}>content'.scan(regex)
-    assert_nil                            tokens[0][0]
-    assert_equal 'content<',              tokens[0][1]
-    assert_equal '{{ cms:type:la/b el }}',tokens[1][0]
-    assert_nil                            tokens[1][1]
-    assert_nil                            tokens[2][0]
-    assert_equal '>content',              tokens[2][1]
-  end
-  
-  def test_tokenizer_regex_limit
-    string = '<p>text</p>' * 400
-    tokens = string.scan(ComfortableMexicanSofa::Tag::TOKENIZER_REGEX)
-    assert_equal 1, tokens.count
-    assert_nil tokens[0][0]
-    assert_equal string, tokens[0][1]
-  end
-  
-  def test_content_for_existing_page
-    page = comfy_cms_pages(:default)
-    assert page.tags.blank?
-    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'
-    ), page.render
-    
-    assert_equal 4, page.tags.size
-    assert_equal 'field_text_default_field_text', page.tags[0].id
-    assert_equal 'page_text_default_page_text', page.tags[1].id
-    assert_equal 'snippet_default', page.tags[2].id
-    assert_equal page.tags[1], page.tags[2].parent
-    assert_equal 'snippet_default', page.tags[3].id
-  end
-  
-  def test_content_for_new_page
-    page = Comfy::Cms::Page.new
-    assert page.blocks.blank?
-    assert page.tags.blank?
-    assert_equal '', page.content_cache
-    assert page.tags.blank?
-  end
-  
-  def test_content_for_new_page_with_layout
-    page = comfy_cms_sites(:default).pages.new(:layout => comfy_cms_layouts(:default))
-    assert page.blocks.blank?
-    assert page.tags.blank?
-    assert_equal rendered_content_formatter(
-      '
-      layout_content_a
-      
-      layout_content_b
-      default_snippet_content
-      layout_content_c'
-    ), page.render
-    
-    assert_equal 3, page.tags.size
-    assert_equal 'field_text_default_field_text', page.tags[0].id
-    assert_equal 'page_text_default_page_text', page.tags[1].id
-    assert_equal 'snippet_default', page.tags[2].id
-  end
-  
-  def test_content_for_new_page_with_initilized_comfy_cms_blocks
-    page = comfy_cms_sites(:default).pages.new(:layout => comfy_cms_layouts(:default))
-    assert page.blocks.blank?
-    assert page.tags.blank?
-    page.blocks_attributes = [
-      { :identifier => 'default_field_text',
-        :content    => 'new_default_field_content'
-      },
-      { :identifier => 'default_page_text',
-        :content    => "new_default_page_text_content\n{{cms:snippet:default}}"
-      },
-      { :identifier => 'bogus_field_that_never_will_get_rendered',
-        :content    => 'some_content_that_doesnot_matter'
-      }
-    ]
-    assert_equal 3, page.blocks.size
-    
-    assert_equal rendered_content_formatter(
-      '
-      layout_content_a
-      new_default_page_text_content
-      default_snippet_content
-      layout_content_b
-      default_snippet_content
-      layout_content_c'
-    ), page.render
-    
-    assert_equal 4, page.tags.size
-    assert_equal 'field_text_default_field_text', page.tags[0].id
-    assert_equal 'page_text_default_page_text', page.tags[1].id
-    assert_equal 'snippet_default', page.tags[2].id
-    assert_equal page.tags[1], page.tags[2].parent
-    assert_equal 'snippet_default', page.tags[3].id
-  end
-  
-  def test_content_with_repeated_tags
-    page = comfy_cms_pages(:default)
-    page.layout.content << "\n{{cms:page:default_page_text:text}}"
-    page.layout.save!
-    
-    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
-      default_page_text_content_a
-      default_snippet_content
-      default_page_text_content_b'
-    ), page.render
-    
-    assert_equal 6, page.tags.size
-    assert_equal 'field_text_default_field_text', page.tags[0].id
-    assert_equal 'page_text_default_page_text', page.tags[1].id
-    assert_equal 'snippet_default', page.tags[2].id
-    assert_equal page.tags[1], page.tags[2].parent
-    assert_equal 'snippet_default', page.tags[3].id
-    assert_equal 'page_text_default_page_text', page.tags[4].id
-    assert_equal 'snippet_default', page.tags[5].id
-    assert_equal page.tags[4], page.tags[5].parent
-  end
-  
-  def test_content_with_cyclical_tags
-    page = comfy_cms_pages(:default)
-    snippet = comfy_cms_snippets(:default)
-    snippet.update_attributes(:content => "infinite {{cms:page:default}} loop")
-    assert_equal rendered_content_formatter(
-      '
-      layout_content_a
-      default_page_text_content_a
-      infinite  loop
-      default_page_text_content_b
-      layout_content_b
-      infinite  loop
-      layout_content_c'
-    ), page.render
-    assert_equal 6, page.tags.size
-  end
-  
-  def test_is_cms_block?
-    tag = ComfortableMexicanSofa::Tag::PageText.initialize_tag(
-      comfy_cms_pages(:default), '{{ cms:page:content:text }}'
-    )
-    assert tag.is_cms_block?
-    
-    tag = ComfortableMexicanSofa::Tag::FieldText.initialize_tag(
-      comfy_cms_pages(:default), '{{ cms:field:content:text }}'
-    )
-    assert tag.is_cms_block?
-    
-    tag = ComfortableMexicanSofa::Tag::Snippet.initialize_tag(
-      comfy_cms_pages(:default), '{{ cms:snippet:label }}'
-    )
-    assert !tag.is_cms_block?
-
-    tag = ComfortableMexicanSofa::Tag::File.initialize_tag(
-      comfy_cms_pages(:default), '{{ cms:file:sample.jpg }}'
-    )
-    assert !tag.is_cms_block?
-  end
-  
-  def test_content_with_irb_disabled
-    assert_equal false, ComfortableMexicanSofa.config.allow_irb
-    
-    site = comfy_cms_sites(:default)
-    layout = site.layouts.create!(
-      :identifier => 'no-irb-layout',
-      :content    => '<% 1 + 1 %> {{cms:page:content}} {{cms:collection:snippet:comfy/cms/snippet}} <%= 1 + 1 %>'
-    )
-    snippet = site.snippets.create!(
-      :identifier => 'no-irb-snippet',
-      :content    => '<% 2 + 2 %> snippet <%= 2 + 2 %>'
-    )
-    page = site.pages.create!(
-      :slug       => 'no-irb-page',
-      :parent_id  => comfy_cms_pages(:default).id,
-      :layout_id  => layout.id,
-      :blocks_attributes => [
-        { :identifier => 'content',
-          :content    => 'text {{ cms:snippet:no-irb-snippet }} {{ cms:partial:path/to }} {{ cms:helper:method }} text' },
-        { :identifier => 'snippet',
-          :content    => snippet.id }
-      ]
-    )
-    assert_equal "&lt;% 1 + 1 %&gt; text &lt;% 2 + 2 %&gt; snippet &lt;%= 2 + 2 %&gt; <%= render :partial => 'path/to' %> <%= method() %> text <%= render :partial => 'partials/comfy/cms/snippets', :locals => {:model => 'Comfy::Cms::Snippet', :identifier => '#{snippet.id}'} %> &lt;%= 1 + 1 %&gt;", page.content_cache
-  end
-  
-  def test_content_with_irb_enabled
-    ComfortableMexicanSofa.config.allow_irb = true
-    
-    site = comfy_cms_sites(:default)
-    layout = site.layouts.create!(
-      :identifier => 'irb-layout',
-      :content    => '<% 1 + 1 %> {{cms:page:content}} {{cms:collection:snippet:comfy/cms/snippet}} <%= 1 + 1 %>'
-    )
-    snippet = site.snippets.create!(
-      :identifier => 'irb-snippet',
-      :content    => '<% 2 + 2 %> snippet <%= 2 + 2 %>'
-    )
-    page = site.pages.create!(
-      :slug       => 'irb-page',
-      :parent_id  => comfy_cms_pages(:default).id,
-      :layout_id  => layout.id,
-      :blocks_attributes => [
-        { :identifier => 'content',
-          :content    => 'text {{ cms:snippet:irb-snippet }} {{ cms:partial:path/to }} {{ cms:helper:method }} text' },
-        { :identifier => 'snippet',
-          :content    => snippet.id.to_s }
-      ]
-    )
-    
-    assert_equal "<% 1 + 1 %> text <% 2 + 2 %> snippet <%= 2 + 2 %> <%= render :partial => 'path/to' %> <%= method() %> text <%= render :partial => 'partials/comfy/cms/snippets', :locals => {:model => 'Comfy::Cms::Snippet', :identifier => '#{snippet.id}'} %> <%= 1 + 1 %>", page.render
-  end
-  
-  def test_escaping_of_parameters
-    tag = ComfortableMexicanSofa::Tag::Helper.initialize_tag(
-      comfy_cms_pages(:default), '{{cms:helper:h:"\'+User.first.inspect+\'"}}'
-    )
-    assert_equal %{<%= h('\\'+User.first.inspect+\\'') %>}, tag.content
-    assert_equal %{<%= h('\\'+User.first.inspect+\\'') %>}, tag.render
-  end
-  
-  def test_tag_initialization_with_namespace
-    assert tag = ComfortableMexicanSofa::Tag::PageString.initialize_tag(
-      comfy_cms_pages(:default), '{{ cms:page:content:string }}'
-    )
-    assert_equal 'content', tag.identifier
-    assert_nil tag.namespace
-    
-    assert tag = ComfortableMexicanSofa::Tag::PageString.initialize_tag(
-      comfy_cms_pages(:default), '{{ cms:page:home.content:string }}'
-    )
-    assert_equal 'home.content', tag.identifier
-    assert_equal 'home', tag.namespace
-    
-    assert tag = ComfortableMexicanSofa::Tag::PageString.initialize_tag(
-      comfy_cms_pages(:default), '{{ cms:page:home.main.content:string }}'
-    )
-    assert_equal 'home.main.content', tag.identifier
-    assert_equal 'home.main', tag.namespace
-    
-    assert tag = ComfortableMexicanSofa::Tag::PageString.initialize_tag(
-      comfy_cms_pages(:default), '{{ cms:page:ho-me.ma-in.con-tent:string }}'
-    )
-    assert_equal 'ho-me.ma-in.con-tent', tag.identifier
-    assert_equal 'ho-me.ma-in', tag.namespace
-  end
-  
-end