comfortable_mexican_sofa 1.1.2 → 1.2.0

data/test/functional/cms_admin/revisions_controller_test.rb

@@ -0,0 +1,135 @@
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
+
+class CmsAdmin::RevisionsControllerTest < ActionController::TestCase
+  
+  def test_get_index_for_layouts
+    get :index, :layout_id => cms_layouts(:default)
+    assert_response :redirect
+    assert_redirected_to :action => :show, :id => cms_revisions(:layout)
+  end
+  
+  def test_get_index_for_pages
+    get :index, :page_id => cms_pages(:default)
+    assert_response :redirect
+    assert_redirected_to :action => :show, :id => cms_revisions(:page)
+  end
+  
+  def test_get_index_for_snippets
+    get :index, :snippet_id => cms_snippets(:default)
+    assert_response :redirect
+    assert_redirected_to :action => :show, :id => cms_revisions(:snippet)
+  end
+  
+  def test_get_index_for_snippets_with_no_revisions
+    Cms::Revision.delete_all
+    get :index, :snippet_id => cms_snippets(:default)
+    assert_response :redirect
+    assert_redirected_to :action => :show, :id => 0
+  end
+  
+  def test_get_show_for_layout
+    get :show, :layout_id => cms_layouts(:default), :id => cms_revisions(:layout)
+    assert_response :success
+    assert assigns(:record)
+    assert assigns(:revision)
+    assert assigns(:record).is_a?(Cms::Layout)
+    assert_template :show
+  end
+  
+  def test_get_show_for_page
+    get :show, :page_id => cms_pages(:default), :id => cms_revisions(:page)
+    assert_response :success
+    assert assigns(:record)
+    assert assigns(:revision)
+    assert assigns(:record).is_a?(Cms::Page)
+    assert_template :show
+  end
+  
+  def test_get_show_for_snippet
+    get :show, :snippet_id => cms_snippets(:default), :id => cms_revisions(:snippet)
+    assert_response :success
+    assert assigns(:record)
+    assert assigns(:revision)
+    assert assigns(:record).is_a?(Cms::Snippet)
+    assert_template :show
+  end
+  
+  def test_get_show_for_bad_type
+    get :show, :snippet_id => 'invalid', :id => cms_revisions(:snippet)
+    assert_response :redirect
+    assert_redirected_to cms_admin_path
+    assert_equal 'Record Not Found', flash[:error]
+  end
+  
+  def test_get_show_for_layout_failure
+    get :show, :layout_id => cms_layouts(:default), :id => 'invalid'
+    assert_response :redirect
+    assert assigns(:record)
+    assert_redirected_to edit_cms_admin_layout_path(assigns(:record))
+    assert_equal 'Revision Not Found', flash[:error]
+  end
+  
+  def test_get_show_for_page_failure
+    get :show, :page_id => cms_pages(:default), :id => 'invalid'
+    assert_response :redirect
+    assert assigns(:record)
+    assert_redirected_to edit_cms_admin_page_path(assigns(:record))
+    assert_equal 'Revision Not Found', flash[:error]
+  end
+  
+  def test_get_show_for_snippet_failure
+    get :show, :snippet_id => cms_snippets(:default), :id => 'invalid'
+    assert_response :redirect
+    assert assigns(:record)
+    assert_redirected_to edit_cms_admin_snippet_path(assigns(:record))
+    assert_equal 'Revision Not Found', flash[:error]
+  end
+  
+  def test_revert_for_layout
+    layout = cms_layouts(:default)
+    
+    assert_difference 'layout.revisions.count' do 
+      put :revert, :layout_id => layout, :id => cms_revisions(:layout)
+      assert_response :redirect
+      assert_redirected_to edit_cms_admin_layout_path(layout)
+      assert_equal 'Content Reverted', flash[:notice]
+      
+      layout.reload
+      assert_equal 'revision {{cms:page:default_page_text}}', layout.content
+      assert_equal 'revision css', layout.css
+      assert_equal 'revision js', layout.js
+    end
+  end
+  
+  def test_revert_for_page
+    page = cms_pages(:default)
+    
+    assert_difference 'page.revisions.count' do
+      put :revert, :page_id => page, :id => cms_revisions(:page)
+      assert_response :redirect
+      assert_redirected_to edit_cms_admin_page_path(page)
+      assert_equal 'Content Reverted', flash[:notice]
+      
+      page.reload
+      assert_equal [
+        { :label => 'default_field_text', :content => 'revision field content'  },
+        { :label => 'default_page_text',  :content => 'revision page content'   }
+      ], page.blocks_attributes
+    end
+  end
+  
+  def test_revert_for_snippet
+    snippet = cms_snippets(:default)
+    
+    assert_difference 'snippet.revisions.count' do
+      put :revert, :snippet_id => snippet, :id => cms_revisions(:snippet)
+      assert_response :redirect
+      assert_redirected_to edit_cms_admin_snippet_path(snippet)
+      assert_equal 'Content Reverted', flash[:notice]
+      
+      snippet.reload
+      assert_equal 'revision content', snippet.content
+    end
+  end
+  
+end

data/test/functional/cms_admin/sites_controller_test.rb

@@ -41,26 +41,15 @@ class CmsAdmin::SitesControllerTest < ActionController::TestCase
     assert_equal 'Site not found', flash[:error]
   end
   
-  def test_create_with_commit
-    assert_difference 'Cms::Site.count' do
-      post :create, :cms_site => {
-        :label    => 'Test Site',
-        :hostname => 'test.site.local'
-      }, :commit  => 'Create Site'
-      assert_response :redirect
-      assert_redirected_to :action => :index
-      assert_equal 'Site created', flash[:notice]
-    end
-  end
-
-  def test_create_without_commit
+  def test_create
     assert_difference 'Cms::Site.count' do
       post :create, :cms_site => {
         :label    => 'Test Site',
         :hostname => 'test.site.local'
       }
       assert_response :redirect
-      assert_redirected_to :action => :edit, :id => Cms::Site.last
+      site = Cms::Site.last
+      assert_redirected_to :action => :edit, :id => site
       assert_equal 'Site created', flash[:notice]
     end
   end
@@ -74,21 +63,7 @@ class CmsAdmin::SitesControllerTest < ActionController::TestCase
     end
   end
 
-  def test_update_with_commit
-    site = cms_sites(:default)
-    put :update, :id => site, :cms_site => {
-      :label    => 'New Site',
-      :hostname => 'new.site.local'
-    }, :commit  => 'Update Site'
-    assert_response :redirect
-    assert_redirected_to :action => :index
-    assert_equal 'Site updated', flash[:notice]
-    site.reload
-    assert_equal 'New Site', site.label
-    assert_equal 'new.site.local', site.hostname
-  end
-
-  def test_update_without_commit
+  def test_update
     site = cms_sites(:default)
     put :update, :id => site, :cms_site => {
       :label    => 'New Site',

data/test/functional/cms_admin/snippets_controller_test.rb

@@ -40,22 +40,7 @@ class CmsAdmin::SnippetsControllerTest < ActionController::TestCase
     assert_equal 'Snippet not found', flash[:error]
   end
   
-  def test_create_with_commit
-    assert_difference 'Cms::Snippet.count' do
-      post :create, :cms_snippet => {
-        :label    => 'Test Snippet',
-        :slug     => 'test-snippet',
-        :content  => 'Test Content'
-      }, :commit  => 'Create Snippet'
-      assert_response :redirect
-      snippet = Cms::Snippet.last
-      assert_equal cms_sites(:default), snippet.site
-      assert_redirected_to :action => :index
-      assert_equal 'Snippet created', flash[:notice]
-    end
-  end
-  
-  def test_create_without_commit
+  def test_create
     assert_difference 'Cms::Snippet.count' do
       post :create, :cms_snippet => {
         :label    => 'Test Snippet',
@@ -79,21 +64,7 @@ class CmsAdmin::SnippetsControllerTest < ActionController::TestCase
     end
   end
 
-  def test_update_with_commit
-    snippet = cms_snippets(:default)
-    put :update, :id => snippet, :cms_snippet => {
-      :label    => 'New-Snippet',
-      :content  => 'New Content'
-    }, :commit  => 'Update Snippet'
-    assert_response :redirect
-    assert_redirected_to :action => :index
-    assert_equal 'Snippet updated', flash[:notice]
-    snippet.reload
-    assert_equal 'New-Snippet', snippet.label
-    assert_equal 'New Content', snippet.content
-  end
-
-  def test_update_without_commit
+  def test_update
     snippet = cms_snippets(:default)
     put :update, :id => snippet, :cms_snippet => {
       :label    => 'New-Snippet',

data/test/test_helper.rb

@@ -24,6 +24,7 @@ class ActiveSupport::TestCase
       config.enable_caching         = true
       config.enable_fixtures        = false
       config.fixtures_path          = File.expand_path('db/cms_fixtures', Rails.root)
+      config.revisions_limit        = 25
     end
     ComfortableMexicanSofa::HttpAuth.username = 'username'
     ComfortableMexicanSofa::HttpAuth.password = 'password'

data/test/unit/configuration_test.rb

@@ -14,6 +14,7 @@ class ConfigurationTest < ActiveSupport::TestCase
     assert_equal true, config.enable_caching
     assert_equal false, config.enable_fixtures
     assert_equal File.expand_path('db/cms_fixtures', Rails.root), config.fixtures_path
+    assert_equal 25, config.revisions_limit
   end
   
   def test_initialization_overrides
@@ -21,4 +22,8 @@ class ConfigurationTest < ActiveSupport::TestCase
     assert_equal 'New Title', ComfortableMexicanSofa.configuration.cms_title
   end
   
+  def test_version
+    assert ComfortableMexicanSofa::VERSION
+  end
+  
 end

data/test/unit/models/page_test.rb

@@ -157,7 +157,6 @@ class CmsPageTest < ActiveSupport::TestCase
     assert_equal page.blocks.count, page.blocks_attributes.size
     assert_equal 'default_field_text', page.blocks_attributes.first[:label]
     assert_equal 'default_field_text_content', page.blocks_attributes.first[:content]
-    assert page.blocks_attributes.first[:id]
   end
   
   def test_content_caching

data/test/unit/models/snippet_test.rb

@@ -15,11 +15,6 @@ class CmsSnippetTest < ActiveSupport::TestCase
     assert_has_errors_on snippet, [:label, :slug]
   end
   
-  def test_method_content
-    assert_equal cms_snippets(:default).content, Cms::Snippet.content_for('default')
-    assert_equal '', Cms::Snippet.content_for('nonexistent_snippet')
-  end
-  
   def test_update_forces_page_content_reload
     snippet = cms_snippets(:default)
     page = cms_pages(:default)

data/test/unit/revisions_test.rb

@@ -0,0 +1,185 @@
+require File.expand_path('../test_helper', File.dirname(__FILE__))
+
+class RevisionsTest < ActiveSupport::TestCase
+  
+  def test_fixtures_validity
+    assert_equal ({
+      'content' => 'revision {{cms:page:default_page_text}}', 
+      'css'     => 'revision css',
+      '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' }
+    ]}), cms_revisions(:page).data
+    
+    assert_equal ({
+      'content' => 'revision content'
+    }), cms_revisions(:snippet).data
+  end
+  
+  def test_init_for_layouts
+    assert_equal ['content', 'css', 'js'], cms_layouts(:default).revision_fields
+  end
+  
+  def test_init_for_pages
+    assert_equal ['blocks_attributes'], cms_pages(:default).revision_fields
+  end
+  
+  def test_init_for_snippets
+    assert_equal ['content'], cms_snippets(:default).revision_fields
+  end
+  
+  def test_creation_for_layout
+    layout = cms_layouts(:default)
+    old_attributes = layout.attributes.slice('content', 'css', 'js')
+    
+    assert_difference 'layout.revisions.count' do
+      layout.update_attributes!(
+        :content  => 'new {{cms:page:content}}',
+        :js       => 'new js'
+      )
+      layout.reload
+      assert_equal 2, layout.revisions.count
+      revision = layout.revisions.first
+      assert_equal old_attributes, revision.data
+    end
+  end
+  
+  def test_creation_for_layout_ignore
+    layout = cms_layouts(:default)
+    assert_no_difference 'layout.revisions.count' do
+      layout.update_attribute(:label, 'new label')
+    end
+  end
+  
+  def test_creation_for_page
+    page = cms_pages(:default)
+    
+    assert_difference 'page.revisions.count' do
+      page.update_attributes!(
+        :blocks_attributes => [
+          { :label    => 'default_page_text',
+            :content  => 'new content' }
+        ]
+      )
+      page.reload
+      assert_equal 2, page.revisions.count
+      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" }]
+      }), revision.data
+    end
+  end
+  
+  def test_creation_for_page_ignore
+    page = cms_pages(:default)
+    assert_no_difference 'page.revisions.count' do
+      page.update_attribute(:label, 'new label')
+    end
+  end
+  
+  def test_creation_for_snippet
+    snippet = cms_snippets(:default)
+    old_attributes  = snippet.attributes.slice('content')
+    
+    assert_difference 'snippet.revisions.count' do
+      snippet.update_attribute(:content, 'new content')
+      snippet.reload
+      assert_equal 2, snippet.revisions.count
+      revision = snippet.revisions.first
+      assert_equal old_attributes, revision.data
+    end
+  end
+  
+  def test_creation_for_snippet_ignore
+    snippet = cms_snippets(:default)
+    assert_no_difference 'snippet.revisions.count' do
+      snippet.update_attribute(:label, 'new label')
+    end
+  end
+  
+  def test_creation_for_new_record
+    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'
+        )
+        assert_equal 0, snippet.revisions.count
+      end
+    end
+  end
+  
+  def test_restore_from_revision_for_layout
+    layout = cms_layouts(:default)
+    revision = cms_revisions(:layout)
+    
+    assert_difference 'layout.revisions.count' do
+      layout.restore_from_revision(revision)
+      layout.reload
+      assert_equal 'revision {{cms:page:default_page_text}}', layout.content
+      assert_equal 'revision css', layout.css
+      assert_equal 'revision js', layout.js
+    end
+  end
+  
+  def test_restore_from_revision_for_page
+    page = cms_pages(:default)
+    revision = cms_revisions(:page)
+    
+    assert_difference 'page.revisions.count' do
+      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'   }
+      ], page.blocks_attributes
+    end
+  end
+  
+  def test_restore_from_revision_for_snippet
+    snippet = cms_snippets(:default)
+    revision = cms_revisions(:snippet)
+    
+    assert_difference 'snippet.revisions.count' do
+      snippet.restore_from_revision(revision)
+      snippet.reload
+      assert_equal 'revision content', snippet.content
+    end
+  end
+  
+  def test_restore_from_revision_with_wrong_revision_type
+    snippet = cms_snippets(:default)
+    revision = cms_revisions(:layout)
+    
+    assert_no_difference 'snippet.revisions.count' do
+      snippet.restore_from_revision(revision)
+      snippet.reload
+      assert_equal 'default_snippet_content', snippet.content
+    end
+  end
+  
+  def test_creation_with_limit
+    ComfortableMexicanSofa.config.revisions_limit = 1
+    snippet = cms_snippets(:default)
+    revision = cms_revisions(:snippet)
+    
+    assert_equal 1, snippet.revisions.count
+    
+    assert_no_difference 'snippet.revisions.count' do
+      snippet.update_attribute(:content, 'new content')
+      assert_nil Cms::Revision.find_by_id(revision.id)
+      
+      snippet.reload
+      revision = snippet.revisions.first
+      assert_equal ({ 'content' => 'default_snippet_content' }), revision.data
+    end
+  end
+  
+end