comfortable_mexican_sofa 1.5.11 → 1.6.0

data/test/unit/models/block_test.rb

@@ -10,8 +10,8 @@ class CmsBlockTest < ActiveSupport::TestCase
   
   def test_tag
     block = cms_blocks(:default_page_text)
-    assert block.page.tags(true).collect(&:identifier).member?('page_text_default_page_text')
-    assert_equal 'page_text_default_page_text', block.tag.identifier
+    assert block.page.tags(true).collect(&:id).member?('page_text_default_page_text')
+    assert_equal 'page_text_default_page_text', block.tag.id
   end
   
   def test_creation_via_page_nested_attributes
@@ -24,14 +24,14 @@ class CmsBlockTest < ActiveSupport::TestCase
         :parent_id  => cms_pages(:default).id,
         :blocks_attributes => [
           {
-            :label    => 'default_page_text',
-            :content  => 'test_content'
+            :identifier => 'default_page_text',
+            :content    => 'test_content'
           }
         ]
       )
       assert_equal 1, page.blocks.count
       block = page.blocks.first
-      assert_equal 'default_page_text', block.label
+      assert_equal 'default_page_text', block.identifier
       assert_equal 'test_content', block.content
     end
   end
@@ -46,14 +46,14 @@ class CmsBlockTest < ActiveSupport::TestCase
         :parent_id  => cms_pages(:default).id,
         :blocks_attributes => {
           '0' => {
-            :label    => 'default_page_text',
-            :content  => 'test_content'
+            :identifier => 'default_page_text',
+            :content    => 'test_content'
           }
         }
       )
       assert_equal 1, page.blocks.count
       block = page.blocks.first
-      assert_equal 'default_page_text', block.label
+      assert_equal 'default_page_text', block.identifier
       assert_equal 'test_content', block.content
     end
   end
@@ -68,18 +68,18 @@ class CmsBlockTest < ActiveSupport::TestCase
         :parent_id  => cms_pages(:default).id,
         :blocks_attributes => {
           '0' => {
-            :label    => 'default_page_text',
-            :content  => 'test_content'
+            :identifier => 'default_page_text',
+            :content    => 'test_content'
           },
           '1' => {
-            :label    => 'default_page_text',
-            :content  => 'test_content'
+            :identifier => 'default_page_text',
+            :content    => 'test_content'
           }
         }
       )
       assert_equal 1, page.blocks.count
       block = page.blocks.first
-      assert_equal 'default_page_text', block.label
+      assert_equal 'default_page_text', block.identifier
       assert_equal 'test_content', block.content
     end
   end
@@ -97,13 +97,13 @@ class CmsBlockTest < ActiveSupport::TestCase
         :slug       => 'test_page',
         :parent_id  => cms_pages(:default).id,
         :blocks_attributes => [
-          { :label    => 'file',
-            :content  => [fixture_file_upload('files/image.jpg'), fixture_file_upload('files/document.pdf')] }
+          { :identifier => 'file',
+            :content    => [fixture_file_upload('files/image.jpg'), fixture_file_upload('files/document.pdf')] }
         ]
       )
       assert_equal 1, page.blocks.count
       block = page.blocks.first
-      assert_equal 'file', block.label
+      assert_equal 'file', block.identifier
       assert_equal nil, block.content
       assert_equal 1, block.files.count
       assert_equal 'image.jpg', block.files.first.file_file_name
@@ -115,8 +115,8 @@ class CmsBlockTest < ActiveSupport::TestCase
     assert_no_difference ['Cms::Block.count', 'Cms::File.count'] do
       page.update_attributes!(
         :blocks_attributes => [
-          { :label    => 'file',
-            :content  => fixture_file_upload('files/document.pdf') }
+          { :identifier => 'file',
+            :content    => fixture_file_upload('files/document.pdf') }
         ]
       )
       page.reload
@@ -141,13 +141,13 @@ class CmsBlockTest < ActiveSupport::TestCase
           :slug       => 'test_page',
           :parent_id  => cms_pages(:default).id,
           :blocks_attributes => [
-            { :label    => 'files',
-              :content  => [fixture_file_upload('files/image.jpg'), fixture_file_upload('files/image.gif')] }
+            { :identifier => 'files',
+              :content    => [fixture_file_upload('files/image.jpg'), fixture_file_upload('files/image.gif')] }
           ]
         )
         assert_equal 1, page.blocks.count
         block = page.blocks.first
-        assert_equal 'files', block.label
+        assert_equal 'files', block.identifier
         assert_equal nil, block.content
         assert_equal 2, block.files.count
         assert_equal ['image.jpg', 'image.gif'], block.files.collect(&:file_file_name)
@@ -158,8 +158,8 @@ class CmsBlockTest < ActiveSupport::TestCase
       assert_difference 'Cms::File.count', 2 do
         page.update_attributes!(
           :blocks_attributes => [
-            { :label    => 'files',
-              :content  => [fixture_file_upload('files/document.pdf'), fixture_file_upload('files/image.gif')] }
+            { :identifier => 'files',
+              :content    => [fixture_file_upload('files/document.pdf'), fixture_file_upload('files/image.gif')] }
           ]
         )
         page.reload
@@ -185,16 +185,16 @@ class CmsBlockTest < ActiveSupport::TestCase
           :parent_id  => cms_pages(:default).id,
           :blocks_attributes => {
             '0' => {
-              :label    => 'header',
-              :content  => 'header content'
+              :identifier => 'header',
+              :content    => 'header content'
             },
             '1' => {
-              :label    => 'file',
-              :content  => fixture_file_upload('files/document.pdf')
+              :identifier => 'file',
+              :content    => fixture_file_upload('files/document.pdf')
             },
             '2' => {
-              :label    => 'footer',
-              :content  => 'footer content'
+              :identifier => 'footer',
+              :content    => 'footer content'
             }
           }
         )

data/test/unit/models/categorization_test.rb

@@ -67,7 +67,7 @@ class CmsCategorizationTest < ActiveSupport::TestCase
     assert_equal 1, Cms::File.for_category(category.label, 'invalid').count
     assert_equal 1, Cms::File.for_category(nil).count
     
-    new_category = Cms::Category.create!(:label => 'Test Category', :categorized_type => 'Cms::File')
+    new_category = cms_sites(:default).categories.create!(:label => 'Test Category', :categorized_type => 'Cms::File')
     new_category.categorizations.create!(:categorized => cms_files(:default))
     assert_equal 1, Cms::File.for_category(category.label, new_category.label).all.size
     assert_equal 1, Cms::File.for_category(category.label, new_category.label).count('cms_files.id', :distinct => true)

data/test/unit/models/category_test.rb

@@ -11,12 +11,12 @@ class CmsCategoryTest < ActiveSupport::TestCase
   def test_validation
     category = Cms::Category.new
     assert category.invalid?
-    assert_has_errors_on category, [:label, :categorized_type]
+    assert_has_errors_on category, [:site_id, :label, :categorized_type]
   end
   
   def test_creation
     assert_difference 'Cms::Category.count' do
-      Cms::Category.create(
+      cms_sites(:default).categories.create(
         :label => 'Test Category',
         :categorized_type => 'Cms::Snippet'
       )

data/test/unit/models/file_test.rb

@@ -43,6 +43,17 @@ class CmsFileTest < ActiveSupport::TestCase
     end
   end
   
+  def test_create_with_non_image
+    assert_difference 'Cms::File.count' do
+      file = cms_sites(:default).files.create!(
+        :file => fixture_file_upload('files/data.zip', 'application/zip')
+      )
+      assert_equal 'Data', file.label
+      assert_equal 'data.zip', file.file_file_name
+      assert_equal 'application/zip', file.file_content_type
+    end
+  end
+  
   def test_create_failure
     assert_no_difference 'Cms::File.count' do
       cms_sites(:default).files.create(:file => '')
@@ -64,4 +75,11 @@ class CmsFileTest < ActiveSupport::TestCase
     assert_equal 0, Cms::File.images.count
     assert_equal 1, Cms::File.not_images.count
   end
+  
+  def test_image?
+    file = cms_files(:default)
+    assert_equal 'image/jpeg', file.file_content_type
+    assert file.is_image?
+  end
+  
 end

data/test/unit/models/layout_test.rb

@@ -11,11 +11,14 @@ class CmsLayoutTest < ActiveSupport::TestCase
   def test_validations
     layout = cms_sites(:default).layouts.create
     assert layout.errors.present?
-    assert_has_errors_on layout, [:label, :slug]
+    assert_has_errors_on layout, [:label, :identifier]
   end
   
   def test_label_assignment
-    layout = cms_sites(:default).layouts.new(:slug => 'test', :content => '{{cms:page:content}}')
+    layout = cms_sites(:default).layouts.new(
+      :identifier => 'test',
+      :content    => '{{cms:page:content}}'
+    )
     assert layout.valid?
     assert_equal 'Test', layout.label
   end
@@ -23,14 +26,14 @@ class CmsLayoutTest < ActiveSupport::TestCase
   def test_creation
     assert_difference 'Cms::Layout.count' do
       layout = cms_sites(:default).layouts.create(
-        :label    => 'New Layout',
-        :slug     => 'new-layout',
-        :content  => '{{cms:page:content}}',
-        :css      => 'css',
-        :js       => 'js'
+        :label      => 'New Layout',
+        :identifier => 'new-layout',
+        :content    => '{{cms:page:content}}',
+        :css        => 'css',
+        :js         => 'js'
       )
       assert_equal 'New Layout', layout.label
-      assert_equal 'new-layout', layout.slug
+      assert_equal 'new-layout', layout.identifier
       assert_equal '{{cms:page:content}}', layout.content
       assert_equal 'css', layout.css
       assert_equal 'js', layout.js
@@ -87,10 +90,10 @@ class CmsLayoutTest < ActiveSupport::TestCase
       :layout_id    => layout_1.id,
       :is_published => '1',
       :blocks_attributes => [
-        { :label    => 'header',
-          :content  => 'header_content' },
-        { :label    => 'content',
-          :content  => 'content_content' }
+        { :identifier => 'header',
+          :content    => 'header_content' },
+        { :identifier => 'content',
+          :content    => 'content_content' }
       ]
     )
     page_2 = cms_sites(:default).pages.create!(
@@ -100,12 +103,12 @@ class CmsLayoutTest < ActiveSupport::TestCase
       :layout_id      => layout_2.id,
       :is_published   => '1',
       :blocks_attributes => [
-        { :label    => 'header',
-          :content  => 'header_content' },
-        { :label    => 'left_column',
-          :content  => 'left_column_content' },
-        { :label    => 'right_column',
-          :content  => 'left_column_content' }
+        { :identifier => 'header',
+          :content    => 'header_content' },
+        { :identifier => 'left_column',
+          :content    => 'left_column_content' },
+        { :identifier => 'right_column',
+          :content    => 'left_column_content' }
       ]
     )
     assert_equal "header_content\ncontent_content", page_1.content

data/test/unit/models/page_test.rb

@@ -62,8 +62,8 @@ class CmsPageTest < ActiveSupport::TestCase
         :parent => cms_pages(:default),
         :layout => cms_layouts(:default),
         :blocks_attributes => [
-          { :label    => 'default_page_text',
-            :content  => 'test' }
+          { :identifier => 'default_page_text',
+            :content    => 'test' }
         ]
       )
       assert page.is_published?
@@ -165,7 +165,7 @@ class CmsPageTest < ActiveSupport::TestCase
   def test_cms_blocks_attributes_accessor
     page = cms_pages(:default)
     assert_equal page.blocks.count, page.blocks_attributes.size
-    assert_equal 'default_field_text', page.blocks_attributes.first[:label]
+    assert_equal 'default_field_text', page.blocks_attributes.first[:identifier]
     assert_equal 'default_field_text_content', page.blocks_attributes.first[:content]
   end
   

data/test/unit/models/site_test.rb

@@ -11,51 +11,58 @@ class CmsSiteTest < ActiveSupport::TestCase
   def test_validation
     site = Cms::Site.new
     assert site.invalid?
-    assert_has_errors_on site, [:label, :hostname]
+    assert_has_errors_on site, [:identifier, :label, :hostname]
     
-    site = Cms::Site.new(:label => 'My Site', :hostname => 'http://my-site.host')
+    site = Cms::Site.new(:identifier => 'test', :hostname => 'http://site.host')
     assert site.invalid?
     assert_has_errors_on site, :hostname
     
-    site = Cms::Site.new(:label => 'My Site', :hostname => 'my-site.host')
-    assert site.valid?
+    site = Cms::Site.new(:identifier => cms_sites(:default).identifier, :hostname => 'site.host')
+    assert site.invalid?
+    assert_has_errors_on site, :identifier
+    
+    site = Cms::Site.new(:identifier => 'test', :hostname => 'site.host')
+    assert site.valid?, site.errors.to_yaml
   end
   
   def test_validation_path_uniqueness
     s1 = cms_sites(:default)
     s2 = Cms::Site.new(
-      :hostname => s1.hostname,
-      :path     => s1.path
+      :identifier => 'test',
+      :hostname   => s1.hostname,
+      :path       => s1.path
     )
     assert s2.invalid?
     assert_has_errors_on s2, :hostname
     
     s2 = Cms::Site.new(
-      :hostname => s1.hostname,
-      :path     => '/en'
+      :identifier => 'test',
+      :hostname   => s1.hostname,
+      :path       => '/en'
     )
     assert s2.valid?
   end
   
   def test_label_assignment
-    site = Cms::Site.new(:hostname => 'my-site.host')
+    site = Cms::Site.new(:identifier => 'test', :hostname => 'my-site.host')
     assert site.valid?
-    assert_equal 'my-site.host', site.label
+    assert_equal 'Test', site.label
   end
   
   def test_clean_path
-    site = Cms::Site.create!(:hostname => 'test.host', :path => '/en///test//')
+    site = Cms::Site.create!(:identifier => 'test_a', :hostname => 'test.host', :path => '/en///test//')
     assert_equal '/en/test', site.path
     
-    site = Cms::Site.create!(:hostname => 'my-site.host', :path => '/')
+    site = Cms::Site.create!(:identifier => 'test_b', :hostname => 'my-site.host', :path => '/')
     assert_equal '', site.path
   end
   
   def test_creation
     assert_difference 'Cms::Site.count' do
       Cms::Site.create!(
-        :label    => 'Test Site',
-        :hostname => 'test.test'
+        :identifier => 'test',
+        :label      => 'Test Site',
+        :hostname   => 'test.test'
       )
     end
   end
@@ -65,7 +72,9 @@ class CmsSiteTest < ActiveSupport::TestCase
       assert_difference 'Cms::Layout.count', -3 do
         assert_difference 'Cms::Page.count', -2 do
           assert_difference 'Cms::Snippet.count', -1 do
-            cms_sites(:default).destroy
+            assert_difference 'Cms::Category.count', -1 do
+              cms_sites(:default).destroy
+            end
           end
         end
       end
@@ -89,8 +98,8 @@ class CmsSiteTest < ActiveSupport::TestCase
     assert_equal site_a, Cms::Site.find_site('test.host', '/some/path')
     assert_equal site_a, Cms::Site.find_site('test99.host', '/some/path')
     
-    site_b = Cms::Site.create!(:hostname => 'test2.host', :path => 'en')
-    site_c = Cms::Site.create!(:hostname => 'test2.host', :path => 'fr')
+    site_b = Cms::Site.create!(:identifier => 'test_a', :hostname => 'test2.host', :path => 'en')
+    site_c = Cms::Site.create!(:identifier => 'test_b', :hostname => 'test2.host', :path => 'fr')
     
     assert_equal site_a,  Cms::Site.find_site('test.host')
     assert_equal site_a,  Cms::Site.find_site('test.host', '/some/path')

data/test/unit/models/snippet_test.rb

@@ -12,12 +12,12 @@ class CmsSnippetTest < ActiveSupport::TestCase
     snippet = Cms::Snippet.new
     snippet.save
     assert snippet.invalid?
-    assert_has_errors_on snippet, [:label, :slug]
+    assert_has_errors_on snippet, [:label, :identifier]
   end
   
   def test_label_assignment
     snippet = cms_sites(:default).snippets.new(
-      :slug   => 'test'
+      :identifier => 'test'
     )
     assert snippet.valid?
     assert_equal 'Test', snippet.label
@@ -26,12 +26,12 @@ class CmsSnippetTest < ActiveSupport::TestCase
   def test_create
     assert_difference 'Cms::Snippet.count' do
       snippet = cms_sites(:default).snippets.create(
-        :label    => 'Test Snippet',
-        :slug     => 'test',
-        :content  => 'Test Content'
+        :label      => 'Test Snippet',
+        :identifier => 'test',
+        :content    => 'Test Content'
       )
       assert_equal 'Test Snippet', snippet.label
-      assert_equal 'test', snippet.slug
+      assert_equal 'test', snippet.identifier
       assert_equal 'Test Content', snippet.content
       assert_equal 1, snippet.position
     end

data/test/unit/revisions_test.rb

@@ -9,8 +9,8 @@ class RevisionsTest < ActiveSupport::TestCase
       'js'      => 'revision js' }), cms_revisions(:layout).data
       
     assert_equal ({'blocks_attributes' => [
-      { 'label' => 'default_page_text',   'content' => 'revision page content'  },
-      { 'label' => 'default_field_text',  'content' => 'revision field content' }
+      { 'identifier' => 'default_page_text',   'content' => 'revision page content'  },
+      { 'identifier' => 'default_field_text',  'content' => 'revision field content' }
     ]}), cms_revisions(:page).data
     
     assert_equal ({
@@ -59,8 +59,8 @@ class RevisionsTest < ActiveSupport::TestCase
     assert_difference 'page.revisions.count' do
       page.update_attributes!(
         :blocks_attributes => [
-          { :label    => 'default_page_text',
-            :content  => 'new content' }
+          { :identifier => 'default_page_text',
+            :content    => 'new content' }
         ]
       )
       page.reload
@@ -68,10 +68,10 @@ class RevisionsTest < ActiveSupport::TestCase
       revision = page.revisions.first
       assert_equal ({
         'blocks_attributes' => [
-          { :label    => 'default_field_text',
-            :content  => 'default_field_text_content' },
-          { :label    => 'default_page_text',
-            :content  => "default_page_text_content_a\n{{cms:snippet:default}}\ndefault_page_text_content_b" }]
+          { :identifier => 'default_field_text',
+            :content    => 'default_field_text_content' },
+          { :identifier => 'default_page_text',
+            :content    => "default_page_text_content_a\n{{cms:snippet:default}}\ndefault_page_text_content_b" }]
       }), revision.data
     end
   end
@@ -107,9 +107,9 @@ class RevisionsTest < ActiveSupport::TestCase
     assert_difference 'Cms::Snippet.count' do
       assert_no_difference 'Cms::Revision.count' do
         snippet = cms_sites(:default).snippets.create!(
-          :label    => 'test snippet',
-          :slug     => 'test_snippet',
-          :content  => 'test content'
+          :label      => 'test snippet',
+          :identifier => 'test_snippet',
+          :content    => 'test content'
         )
         assert_equal 0, snippet.revisions.count
       end
@@ -137,8 +137,8 @@ class RevisionsTest < ActiveSupport::TestCase
       page.restore_from_revision(revision)
       page.reload
       assert_equal [
-        { :label => 'default_field_text', :content => 'revision field content'  },
-        { :label => 'default_page_text',  :content => 'revision page content'   }
+        { :identifier => 'default_field_text', :content => 'revision field content'  },
+        { :identifier => 'default_page_text',  :content => 'revision page content'   }
       ], page.blocks_attributes
     end
   end