comfortable_mexican_sofa 0.0.18 → 1.0.0

data/test/fixtures/files/invalid_file.gif

@@ -0,0 +1,9 @@
+STDOUT.sync = true
+
+c = 0
+loop do
+ # print "\r%s" % %w[ / - \\ | ][(c +=1) % 4]
+ # print "\r%s" % ['o.o', 'o.O', 'O.O', 'O.o'][(c +=1) % 4]
+
+ select(nil, nil, nil, 0.2)
+end

data/test/functional/cms_admin/base_controller_test.rb

@@ -0,0 +1,9 @@
+require  File.dirname(__FILE__) + '/../../test_helper'
+
+class CmsAdmin::BaseControllerTest < ActionController::TestCase
+  
+  def test_something
+    flunk
+  end
+  
+end

data/test/functional/cms_admin/layouts_controller_test.rb

@@ -1,77 +1,92 @@
-require 'test_helper'
+require  File.dirname(__FILE__) + '/../../test_helper'
 
 class CmsAdmin::LayoutsControllerTest < ActionController::TestCase
   
-  def setup
-    http_auth
-  end
-  
   def test_get_index
     get :index
     assert_response :success
-    assert assigns(:layouts)
+    assert assigns(:cms_layouts)
+    assert_template :index
   end
   
   def test_get_new
     get :new
     assert_response :success
+    assert assigns(:cms_layout)
+    assert_template :new
+    assert_select 'form[action=/cms-admin/layouts]'
   end
   
   def test_get_edit
-    get :edit, :id => cms_layouts(:default)
+    layout = cms_layouts(:default)
+    get :edit, :id => layout
     assert_response :success
-    assert assigns(:layout)
+    assert assigns(:cms_layout)
+    assert_template :edit
+    assert_select "form[action=/cms-admin/layouts/#{layout.id}]"
+  end
+  
+  def test_get_edit_failure
+    get :edit, :id => 'not_found'
+    assert_response :redirect
+    assert_redirected_to :action => :index
+    assert_equal 'Layout not found', flash[:error]
   end
   
-  def test_create
+  def test_creation
     assert_difference 'CmsLayout.count' do
-      post :create, :layout => {
-        :label      => 'Test Layout',
-        :parent_id  => '',
-        :app_layout => '',
-        :content    => 'Test content {{ cms_block:test_block:text }}'
+      post :create, :cms_layout => {
+        :label    => 'Test Layout',
+        :content  => 'Test Content'
       }
       assert_response :redirect
-      assert_redirected_to :action => :edit
+      assert_redirected_to :action => :edit, :id => CmsLayout.last
       assert_equal 'Layout created', flash[:notice]
     end
   end
   
+  def test_creation_failure
+    assert_no_difference 'CmsLayout.count' do
+      post :create, :cms_layout => { }
+      assert_response :success
+      assert_template :new
+      assert_equal 'Failed to create layout', flash[:error]
+    end
+  end
+  
   def test_update
     layout = cms_layouts(:default)
-    
-    assert_difference 'CmsBlock.count', layout.cms_pages.count do
-      put :update, :id => layout, :layout => {
-        :label => 'New Test Label',
-        :content => '{{ cms_block:completely_new_block:string }}'
-      }
-      assert_response :redirect
-      assert_redirected_to :action => :edit
-      assert_equal 'Layout updated', flash[:notice]
-      
-      layout.reload
-      assert_equal 'New Test Label', layout.label
-      assert_equal '{{ cms_block:completely_new_block:string }}', layout.content
-    end
+    put :update, :id => layout, :cms_layout => {
+      :label    => 'New Label',
+      :content  => 'New Content'
+    }
+    assert_response :redirect
+    assert_redirected_to :action => :edit, :id => layout
+    assert_equal 'Layout updated', flash[:notice]
+    layout.reload
+    assert_equal 'New Label', layout.label
+    assert_equal 'New Content', layout.content
   end
   
-  def test_destroy
+  def test_update_failure
     layout = cms_layouts(:default)
-    assert !(layout_pages = layout.cms_pages).blank?
-    
-    assert_equal 1, layout.descendants.size
-    
-    assert_difference 'CmsLayout.count', -2 do
-      assert_no_difference ['CmsPage.count', 'CmsBlock.count'] do
-        delete :destroy, :id => layout
-        assert_response :redirect
-        assert_redirected_to :action => :index
-        assert_equal 'Layout removed', flash[:notice]
-        
-        layout_pages.each do |page|
-          assert !page.cms_layout
-        end
-      end
+    put :update, :id => layout, :cms_layout => {
+      :label    => ''
+    }
+    assert_response :success
+    assert_template :edit
+    layout.reload
+    assert_not_equal '', layout.label
+    assert_equal 'Failed to update layout', flash[:error]
+  end
+  
+  def test_destroy
+    assert_difference 'CmsLayout.count', -1 do
+      delete :destroy, :id => cms_layouts(:default)
+      assert_response :redirect
+      assert_redirected_to :action => :index
+      assert_equal 'Layout deleted', flash[:notice]
     end
   end
-end
+  
+end

data/test/functional/cms_admin/pages_controller_test.rb

@@ -1,153 +1,252 @@
-require 'test_helper'
+require  File.dirname(__FILE__) + '/../../test_helper'
 
 class CmsAdmin::PagesControllerTest < ActionController::TestCase
   
-  def setup
-    http_auth
-  end
-  
   def test_get_index
     get :index
     assert_response :success
     assert assigns(:cms_pages)
+    assert_template :index
   end
   
   def test_get_new
     get :new
     assert_response :success
+    assert assigns(:cms_page)
+    assert_equal cms_layouts(:default), assigns(:cms_page).cms_layout
+    
+    assert_template :new
+    assert_select 'form[action=/cms-admin/pages]'
+  end
+  
+  def test_get_new_with_field_datetime
+    cms_layouts(:default).update_attribute(:content, '<cms:field:test_label:datetime>')
+    get :new
+    assert_select "input[type='datetime'][name='cms_page[cms_blocks_attributes][][content]']"
+    assert_select "input[type='hidden'][name='cms_page[cms_blocks_attributes][][label]'][value='test_label']"
+    assert_select "input[type='hidden'][name='cms_page[cms_blocks_attributes][][type]'][value='CmsTag::FieldDateTime']"
+  end
+  
+  def test_get_new_with_field_integer
+    cms_layouts(:default).update_attribute(:content, '<cms:field:test_label:integer>')
+    get :new
+    assert_select "input[type='number'][name='cms_page[cms_blocks_attributes][][content]']"
+    assert_select "input[type='hidden'][name='cms_page[cms_blocks_attributes][][label]'][value='test_label']"
+    assert_select "input[type='hidden'][name='cms_page[cms_blocks_attributes][][type]'][value='CmsTag::FieldInteger']"
+  end
+  
+  def test_get_new_with_field_string
+    cms_layouts(:default).update_attribute(:content, '<cms:field:test_label>')
+    get :new
+    assert_select "input[type='text'][name='cms_page[cms_blocks_attributes][][content]']"
+    assert_select "input[type='hidden'][name='cms_page[cms_blocks_attributes][][label]'][value='test_label']"
+    assert_select "input[type='hidden'][name='cms_page[cms_blocks_attributes][][type]'][value='CmsTag::FieldString']"
+  end
+  
+  def test_get_new_with_field_text
+    cms_layouts(:default).update_attribute(:content, '<cms:field:test_label:text>')
+    get :new
+    assert_select "textarea[name='cms_page[cms_blocks_attributes][][content]']"
+    assert_select "input[type='hidden'][name='cms_page[cms_blocks_attributes][][label]'][value='test_label']"
+    assert_select "input[type='hidden'][name='cms_page[cms_blocks_attributes][][type]'][value='CmsTag::FieldText']"
+  end
+  
+  def test_get_new_with_page_datetime
+    cms_layouts(:default).update_attribute(:content, '<cms:page:test_label:datetime>')
+    get :new
+    assert_select "input[type='datetime'][name='cms_page[cms_blocks_attributes][][content]']"
+    assert_select "input[type='hidden'][name='cms_page[cms_blocks_attributes][][label]'][value='test_label']"
+    assert_select "input[type='hidden'][name='cms_page[cms_blocks_attributes][][type]'][value='CmsTag::PageDateTime']"
+  end
+  
+  def test_get_new_with_page_integer
+    cms_layouts(:default).update_attribute(:content, '<cms:page:test_label:integer>')
+    get :new
+    assert_select "input[type='number'][name='cms_page[cms_blocks_attributes][][content]']"
+    assert_select "input[type='hidden'][name='cms_page[cms_blocks_attributes][][label]'][value='test_label']"
+    assert_select "input[type='hidden'][name='cms_page[cms_blocks_attributes][][type]'][value='CmsTag::PageInteger']"
+  end
+  
+  def test_get_new_with_page_string
+    cms_layouts(:default).update_attribute(:content, '<cms:page:test_label:string>')
+    get :new
+    assert_select "input[type='text'][name='cms_page[cms_blocks_attributes][][content]']"
+    assert_select "input[type='hidden'][name='cms_page[cms_blocks_attributes][][label]'][value='test_label']"
+    assert_select "input[type='hidden'][name='cms_page[cms_blocks_attributes][][type]'][value='CmsTag::PageString']"
+  end
+  
+  def test_get_new_with_page_text
+    cms_layouts(:default).update_attribute(:content, '<cms:page:test_label>')
+    get :new
+    assert_select "textarea[name='cms_page[cms_blocks_attributes][][content]']"
+    assert_select "input[type='hidden'][name='cms_page[cms_blocks_attributes][][label]'][value='test_label']"
+    assert_select "input[type='hidden'][name='cms_page[cms_blocks_attributes][][type]'][value='CmsTag::PageText']"
+  end
+  
+  def test_get_new_as_child_page
+    get :new, :parent_id => cms_pages(:default)
+    assert_response :success
+    assert assigns(:cms_page)
+    assert_equal cms_pages(:default), assigns(:cms_page).parent
+    assert_template :new
   end
   
   def test_get_edit
-    get :edit, :id => cms_pages(:default)
+    page = cms_pages(:default)
+    get :edit, :id => page
     assert_response :success
     assert assigns(:cms_page)
+    assert_template :edit
+    assert_select "form[action=/cms-admin/pages/#{page.id}]"
   end
   
-  def test_create
+  def test_get_edit_failure
+    get :edit, :id => 'not_found'
+    assert_response :redirect
+    assert_redirected_to :action => :index
+    assert_equal 'Page not found', flash[:error]
+  end
+  
+  def test_get_edit_with_blank_layout
+    page = cms_pages(:default)
+    page.update_attribute(:cms_layout_id, nil)
+    get :edit, :id => page
+    assert_response :success
+    assert assigns(:cms_page)
+    assert_equal cms_layouts(:default), assigns(:cms_page).cms_layout
+  end
+  
+  def test_creation
     assert_difference 'CmsPage.count' do
       assert_difference 'CmsBlock.count', 3 do
         post :create, :cms_page => {
-          :label  => 'Test Page',
-          :slug   => 'test_page',
-          :cms_layout => cms_layouts(:default),
-          :blocks => {
-            :header   => { :content_string => 'Test Header' },
-            :default  => { :content_text => 'Test Content' },
-            :footer   => { :content_text => 'Test Footer' }
-          }
+          :label          => 'Test Page',
+          :slug           => 'test-page',
+          :parent_id      => cms_pages(:default).id,
+          :cms_layout_id  => cms_layouts(:default).id,
+          :cms_blocks_attributes => [
+            { :label    => 'content',
+              :type     => 'CmsTag::PageText',
+              :content  => 'content content' },
+            { :label    => 'title',
+              :type     => 'CmsTag::PageString',
+              :content  => 'title content' },
+            { :label    => 'number',
+              :type     => 'CmsTag::PageInteger',
+              :content  => '999' }
+          ]
         }
         assert_response :redirect
-        assert_redirected_to :action => :edit
-        assert_equal 'Page created', flash[:notice]
-        
-        assert page = CmsPage.find_by_slug('test_page')
-        assert_equal 'Test Header', page.cms_block_content(:header, :content_string)
-        assert_equal 'Test Content', page.cms_block_content(:default, :content_text)
-        assert_equal 'Test Footer', page.cms_block_content(:footer, :content_text)
+        assert_redirected_to :action => :edit, :id => CmsPage.last
+        assert_equal 'Page saved', flash[:notice]
       end
     end
   end
   
-  def test_update
-    page = cms_pages(:complex)
-    
-    assert_difference 'CmsBlock.count' do
-      put :update, :id => page, :cms_page => {
-        :label  => 'New Test Page',
-        :slug   => 'new_test_page',
-        :cms_layout => cms_layouts(:default),
-        :blocks => {
-          :header   => { :content_string => 'New Test Header' },
-          :default  => { :content_text => 'New Test Content' },
-          :footer   => { :content_text => 'New Test Footer' }
-        }
+  def test_creation_failure
+    assert_no_difference ['CmsPage.count', 'CmsBlock.count'] do
+      post :create, :cms_page => {
+        :cms_layout_id  => cms_layouts(:default).id,
+        :cms_blocks_attributes => [
+          { :label    => 'content',
+            :type     => 'CmsTag::PageText',
+            :content  => 'content content' },
+          { :label    => 'title',
+            :type     => 'CmsTag::PageString',
+            :content  => 'title content' },
+          { :label    => 'number',
+            :type     => 'CmsTag::PageInteger',
+            :content  => '999' }
+        ]
       }
-      assert_response :redirect
-      assert_redirected_to :action => :edit
-      assert_equal 'Page updated', flash[:notice]
-    
-      assert page = CmsPage.find_by_slug('new_test_page')
-      assert_equal 'New Test Header', page.cms_block_content(:header, :content_string)
-      assert_equal 'New Test Content', page.cms_block_content(:default, :content_text)
-      assert_equal 'New Test Footer', page.cms_block_content(:footer, :content_text)
-      
-      # old blocks are still there:
-      assert !page.cms_block_content(:left_column, :content_text).blank?
-      assert !page.cms_block_content(:right_column, :content_text).blank?
-    end
-  end
-  
-  def test_destroy
-    page = cms_pages(:default)
-    
-    assert_difference 'CmsPage.count', -4 do
-      assert_difference 'CmsBlock.count', -7 do
-        delete :destroy, :id => page
-        assert_response :redirect
-        assert_redirected_to :action => :index
-        assert_equal 'Page removed', flash[:notice]
-      end
+      assert_response :success
+      page = assigns(:cms_page)
+      assert_equal 3, page.cms_blocks.size
+      assert_equal ['content content', 'title content', 999], page.cms_blocks.collect{|b| b.content}
+      assert_template :new
+      assert_equal 'Failed to create page', flash[:error]
     end
   end
   
-  def test_adding_categorizations
+  def test_update
     page = cms_pages(:default)
-    
-    assert_difference 'CmsPageCategorization.count' do
+    assert_no_difference 'CmsBlock.count' do
       put :update, :id => page, :cms_page => {
-        :attr_category_ids => {
-          cms_categories(:category_1).id => 1
-        }
+        :label => 'Updated Label'
       }
+      page.reload
+      assert_response :redirect
+      assert_redirected_to :action => :edit, :id => page
+      assert_equal 'Page updated', flash[:notice]
+      assert_equal 'Updated Label', page.label
     end
   end
   
-  def test_removing_categorizations
+  def test_update_with_layout_change
     page = cms_pages(:default)
-    
-    assert_difference 'CmsPageCategorization.count', -3 do
+    assert_difference 'CmsBlock.count', 1 do
       put :update, :id => page, :cms_page => {
-        :attr_category_ids => {
-          cms_categories(:category_2).id => 0
-        }
+        :label => 'Updated Label',
+        :cms_layout_id => cms_layouts(:nested).id,
+        :cms_blocks_attributes => [
+          { :label    => 'content',
+            :type     => 'CmsTag::PageText',
+            :content  => 'new_page_text_content',
+            :id       => cms_blocks(:default_page_text).id },
+          { :label    => 'header',
+            :type     => 'CmsTag::PageString',
+            :content  => 'new_page_string_content' }
+        ]
       }
+      page.reload
+      assert_response :redirect
+      assert_redirected_to :action => :edit, :id => page
+      assert_equal 'Page updated', flash[:notice]
+      assert_equal 'Updated Label', page.label
+      assert_equal ['default_field_text_content', 'new_page_string_content', 'new_page_text_content'], page.cms_blocks.collect{|b| b.content}
     end
   end
   
-  def test_preview_for_create
-    assert_no_difference 'CmsPage.count' do
-      assert_no_difference 'CmsBlock.count' do
-        post :create, :preview  => 'Preview Button', :cms_page => {
-          :label    => 'Test Page',
-          :slug     => 'test_page',
-          :cms_layout => cms_layouts(:default),
-          :blocks => {
-            :header   => { :content_string => 'Test Header' },
-            :default  => { :content_text => 'Test Content' },
-            :footer   => { :content_text => 'Test Footer' }
-          }
-        }
-        assert_response :success
+  def test_update_failure
+    put :update, :id => cms_pages(:default), :cms_page => {
+      :label => ''
+    }
+    assert_response :success
+    assert_template :edit
+    assert assigns(:cms_page)
+    assert_equal 'Failed to update page', flash[:error]
+  end
+  
+  def test_destroy
+    assert_difference 'CmsPage.count', -2 do
+      assert_difference 'CmsBlock.count', -2 do
+        delete :destroy, :id => cms_pages(:default)
+        assert_response :redirect
+        assert_redirected_to :action => :index
+        assert_equal 'Page deleted', flash[:notice]
       end
     end
   end
   
-  def test_preview_for_update
-    page = cms_pages(:complex)
+  def test_get_form_blocks
+    xhr :get, :form_blocks, :id => cms_pages(:default), :layout_id => cms_layouts(:nested).id
+    assert_response :success
+    assert assigns(:cms_page)
+    assert_equal 2, assigns(:cms_page).cms_tags.size
+    assert_template :form_blocks
     
-    assert_no_difference 'CmsBlock.count' do
-      put :update, :preview => 'Preview Button', :id => page, :cms_page => {
-        :label  => 'New Test Page',
-        :slug   => 'new_test_page',
-        :cms_layout => cms_layouts(:default),
-        :blocks => {
-          :header   => { :content_string => 'New Test Header' },
-          :default  => { :content_text => 'New Test Content' },
-          :footer   => { :content_text => 'New Test Footer' }
-        }
-      }
-      assert_response :success
-    end
+    xhr :get, :form_blocks, :id => cms_pages(:default), :layout_id => cms_layouts(:default).id
+    assert_response :success
+    assert assigns(:cms_page)
+    assert_equal 4, assigns(:cms_page).cms_tags.size
+    assert_template :form_blocks
   end
   
-end
+  def test_get_form_blocks_for_new_page
+    xhr :get, :form_blocks, :id => 0, :layout_id => cms_layouts(:default).id
+    assert_response :success
+    assert assigns(:cms_page)
+    assert_equal 3, assigns(:cms_page).cms_tags.size
+    assert_template :form_blocks
+  end
+end