comfypress 0.1.3

data/test/functional/cms_admin/pages_controller_test.rb

@@ -0,0 +1,450 @@
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
+
+class CmsAdmin::PagesControllerTest < ActionController::TestCase
+
+  def test_get_index
+    get :index, :site_id => cms_sites(:default)
+    assert_response :success
+    assert assigns(:pages)
+    assert_template :index
+  end
+  
+  def test_get_index_with_no_pages
+    Cms::Page.delete_all
+    get :index, :site_id => cms_sites(:default)
+    assert_response :redirect
+    assert_redirected_to :action => :new
+  end
+  
+  def test_get_index_with_category
+    category = cms_sites(:default).categories.create!(:label => 'Test Category', :categorized_type => 'Cms::Page')
+    category.categorizations.create!(:categorized => cms_pages(:child))
+    
+    get :index, :site_id => cms_sites(:default), :category => category.label
+    assert_response :success
+    assert assigns(:pages)
+    assert_equal 1, assigns(:pages).count
+    assert assigns(:pages).first.categories.member? category
+  end
+  
+  def test_get_index_with_category_invalid
+    get :index, :site_id => cms_sites(:default), :category => 'invalid'
+    assert_response :success
+    assert assigns(:pages)
+    assert_equal 0, assigns(:pages).count
+  end
+  
+  def test_get_new
+    site = cms_sites(:default)
+    get :new, :site_id => site
+    assert_response :success
+    assert assigns(:page)
+    assert_equal cms_layouts(:default), assigns(:page).layout
+    assert_template :new
+    assert_select "form[action=/cms-admin/sites/#{site.id}/pages]"
+    assert_select "select[data-url=/cms-admin/sites/#{site.id}/pages/0/form_blocks]"
+    assert_select "form[action='/cms-admin/sites/#{site.id}/files?ajax=true']"
+  end
+
+  def test_get_new_with_field_datetime
+    cms_layouts(:default).update_column(:content, '{{cms:field:test_label:datetime}}')
+    get :new, :site_id => cms_sites(:default)
+    assert_response :success
+    assert_select "input[type='text'][name='page[blocks_attributes][0][content]'][data-datetime]"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
+  end
+
+  def test_get_new_with_field_integer
+    cms_layouts(:default).update_column(:content, '{{cms:field:test_label:integer}}')
+    get :new, :site_id => cms_sites(:default)
+    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
+    cms_layouts(:default).update_column(:content, '{{cms:field:test_label:string}}')
+    get :new, :site_id => cms_sites(:default)
+    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_field_text
+    cms_layouts(:default).update_column(:content, '{{cms:field:test_label:text}}')
+    get :new, :site_id => cms_sites(:default)
+    assert_response :success
+    assert_select "textarea[name='page[blocks_attributes][0][content]'][data-cm-mode='text/html']"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
+  end
+  
+  def test_get_new_with_field_rich_text
+    cms_layouts(:default).update_column(:content, '{{cms:field:test_label:rich_text}}')
+    get :new, :site_id => cms_sites(:default)
+    assert_response :success
+    assert_select "textarea[name='page[blocks_attributes][0][content]'][data-rich-text]"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
+  end
+
+  def test_get_new_with_page_datetime
+    cms_layouts(:default).update_column(:content, '{{cms:page:test_label:datetime}}')
+    get :new, :site_id => cms_sites(:default)
+    assert_response :success
+    assert_select "input[type='text'][name='page[blocks_attributes][0][content]'][data-datetime]"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
+  end
+
+  def test_get_new_with_page_integer
+    cms_layouts(:default).update_column(:content, '{{cms:page:test_label:integer}}')
+    get :new, :site_id => cms_sites(:default)
+    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
+    cms_layouts(:default).update_column(:content, '{{cms:page:test_label:string}}')
+    get :new, :site_id => cms_sites(:default)
+    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
+    cms_layouts(:default).update_column(:content, '{{cms:page:test_label}}')
+    get :new, :site_id => cms_sites(:default)
+    assert_response :success
+    assert_select "textarea[name='page[blocks_attributes][0][content]'][data-cm-mode=text/html]"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
+  end
+  
+  def test_get_new_with_page_file
+    cms_layouts(:default).update_column(:content, '{{cms:page_file:test_label}}')
+    get :new, :site_id => cms_sites(:default)
+    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']"
+  end
+  
+  def test_get_new_with_page_files
+    cms_layouts(:default).update_column(:content, '{{cms:page_files:test_label}}')
+    get :new, :site_id => cms_sites(:default)
+    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']"
+  end
+  
+  def test_get_new_with_collection
+    snippet = cms_snippets(:default)
+    cms_layouts(:default).update_column(:content, '{{cms:collection:snippet:cms/snippet}}')
+    get :new, :site_id => cms_sites(:default)
+    assert_response :success
+    assert_select "select[name='page[blocks_attributes][0][content]']" do
+      assert_select "option[value='']", :html => '---- Select 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']"
+  end
+
+  def test_get_new_with_page_rich_text
+    cms_layouts(:default).update_column(:content, '{{cms:page:test_label:rich_text}}')
+    get :new, :site_id => cms_sites(:default)
+    assert_response :success
+    assert_select "textarea[name='page[blocks_attributes][0][content]'][data-rich-text]"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
+  end
+  
+  def test_get_new_with_page_markdown
+    cms_layouts(:default).update_column(:content, '{{cms:page:test_label:markdown}}')
+    get :new, :site_id => cms_sites(:default)
+    assert_response :success
+    assert_select "textarea[name='page[blocks_attributes][0][content]'][data-cm-mode=text/x-markdown]"
+    assert_select "input[type='hidden'][name='page[blocks_attributes][0][identifier]'][value='test_label']"
+  end
+  
+  def test_get_new_with_several_tag_fields
+    cms_layouts(:default).update_column(:content, '{{cms:page:label_a}}{{cms:page:label_b}}')
+    get :new, :site_id => cms_sites(:default)
+    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']"
+  end
+  
+  def test_get_new_with_crashy_tag
+    cms_layouts(:default).update_column(:content, '{{cms:collection:label:invalid}}')
+    get :new, :site_id => cms_sites(:default)
+    assert_response :success
+  end
+  
+  def test_get_new_with_repeated_tag
+    cms_layouts(:default).update_column(:content, '{{cms:page:test_label}}{{cms:page:test_label}}')
+    get :new, :site_id => cms_sites(:default)
+    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
+  end
+  
+  def test_get_new_as_child_page
+    get :new, :site_id => cms_sites(:default), :parent_id => cms_pages(:default)
+    assert_response :success
+    assert assigns(:page)
+    assert_equal cms_pages(:default), assigns(:page).parent
+    assert_template :new
+  end
+
+  def test_get_edit
+    page = cms_pages(:default)
+    get :edit, :site_id => page.site, :id => page
+    assert_response :success
+    assert assigns(:page)
+    assert_template :edit
+    assert_select "form[action=/cms-admin/sites/#{page.site.id}/pages/#{page.id}]"
+    assert_select "select[data-url=/cms-admin/sites/#{page.site.id}/pages/#{page.id}/form_blocks]"
+  end
+
+  def test_get_edit_failure
+    get :edit, :site_id => cms_sites(:default), :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_column(:layout_id, nil)
+    get :edit, :site_id => page.site, :id => page
+    assert_response :success
+    assert assigns(:page)
+    assert assigns(:page).layout
+  end
+  
+  def test_get_edit_with_non_english_locale
+    site = cms_sites(:default)
+    site.update_column(:locale, 'es')
+    get :edit, :site_id => site, :id => cms_pages(:default)
+    assert_response :success
+  end
+  
+  def test_creation
+    assert_difference 'Cms::Page.count' do
+      assert_difference 'Cms::Block.count', 2 do
+        post :create, :site_id => cms_sites(:default), :page => {
+          :label          => 'Test Page',
+          :slug           => 'test-page',
+          :parent_id      => cms_pages(:default).id,
+          :layout_id      => cms_layouts(:default).id,
+          :blocks_attributes => [
+            { :identifier => 'default_page_text',
+              :content    => 'content content' },
+            { :identifier => 'default_field_text',
+              :content    => 'title content' }
+          ]
+        }, :commit => 'Create Page'
+        assert_response :redirect
+        page = Cms::Page.last
+        assert_equal cms_sites(:default), page.site
+        assert_redirected_to :action => :edit, :id => page
+        assert_equal 'Page created', flash[:success]
+      end
+    end
+  end
+  
+  def test_creation_failure
+    assert_no_difference ['Cms::Page.count', 'Cms::Block.count'] do
+      post :create, :site_id => cms_sites(:default), :page => {
+        :layout_id => cms_layouts(:default).id,
+        :blocks_attributes => [
+          { :identifier => 'default_page_text',
+            :content    => 'content content' },
+          { :identifier => 'default_field_text',
+            :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_template :new
+      assert_equal 'Failed to create page', flash[:error]
+    end
+  end
+
+  def test_update
+    page = cms_pages(:default)
+    assert_no_difference 'Cms::Block.count' do
+      put :update, :site_id => page.site, :id => page, :page => {
+        :label => 'Updated Label'
+      }
+      page.reload
+      assert_response :redirect
+      assert_redirected_to :action => :edit, :id => page
+      assert_equal 'Page updated', flash[:success]
+      assert_equal 'Updated Label', page.label
+    end
+  end
+  
+  def test_update_with_layout_change
+    page = cms_pages(:default)
+    assert_difference 'Cms::Block.count', 2 do
+      put :update, :site_id => page.site, :id => page, :page => {
+        :label      => 'Updated Label',
+        :layout_id  => cms_layouts(:nested).id,
+        :blocks_attributes => [
+          { :identifier => 'content',
+            :content    => 'new_page_text_content' },
+          { :identifier => 'header',
+            :content    => 'new_page_string_content' }
+        ]
+      }
+      page.reload
+      assert_response :redirect
+      assert_redirected_to :action => :edit, :id => page
+      assert_equal 'Page updated', flash[:success]
+      assert_equal 'Updated Label', page.label
+      assert_equal ['content', 'default_field_text', 'default_page_text', 'header'], page.blocks.collect{|b| b.identifier}
+    end
+  end
+
+  def test_update_failure
+    put :update, :site_id => cms_sites(:default), :id => cms_pages(:default), :page => {
+      :label => ''
+    }
+    assert_response :success
+    assert_template :edit
+    assert assigns(:page)
+    assert_equal 'Failed to update page', flash[:error]
+  end
+
+  def test_destroy
+    assert_difference 'Cms::Page.count', -2 do
+      assert_difference 'Cms::Block.count', -2 do
+        delete :destroy, :site_id => cms_sites(:default), :id => cms_pages(:default)
+        assert_response :redirect
+        assert_redirected_to :action => :index
+        assert_equal 'Page deleted', flash[:success]
+      end
+    end
+  end
+
+  def test_get_form_blocks
+    site = cms_sites(:default)
+    xhr :get, :form_blocks, :site_id => site, :id => cms_pages(:default), :layout_id => cms_layouts(:nested).id
+    assert_response :success
+    assert assigns(:page)
+    assert_equal 2, assigns(:page).tags.size
+    assert_template :form_blocks
+
+    xhr :get, :form_blocks, :site_id => site, :id => cms_pages(:default), :layout_id => cms_layouts(:default).id
+    assert_response :success
+    assert assigns(:page)
+    assert_equal 4, assigns(:page).tags.size
+    assert_template :form_blocks
+  end
+
+  def test_get_form_blocks_for_new_page
+    xhr :get, :form_blocks, :site_id => cms_sites(:default), :id => 0, :layout_id => cms_layouts(:default).id
+    assert_response :success
+    assert assigns(:page)
+    assert_equal 3, assigns(:page).tags.size
+    assert_template :form_blocks
+  end
+
+  def test_creation_preview
+    site    = cms_sites(:default)
+    layout  = cms_layouts(:default)
+    
+    assert_no_difference 'Cms::Page.count' do
+      post :create, :site_id => site, :preview => 'Preview', :page => {
+        :label      => 'Test Page',
+        :slug       => 'test-page',
+        :parent_id  => cms_pages(:default).id,
+        :layout_id  => layout.id,
+        :blocks_attributes => [
+          { :identifier => 'default_page_text',
+            :content    => 'preview content' }
+        ]
+      }
+      assert_response :success
+      assert_match /preview content/, response.body
+      
+      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 = cms_pages(:default)
+    assert_no_difference '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' }
+        ]
+      }
+      assert_response :success
+      assert_match /preview content/, response.body
+      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)
+    end
+  end
+
+  def test_get_new_with_no_layout
+    Cms::Layout.destroy_all
+    get :new, :site_id => cms_sites(:default)
+    assert_response :redirect
+    assert_redirected_to new_cms_admin_site_layout_path(cms_sites(:default))
+    assert_equal 'No Layouts found. Please create one.', flash[:error]
+  end
+
+  def test_get_edit_with_no_layout
+    Cms::Layout.destroy_all
+    page = cms_pages(:default)
+    get :edit, :site_id => page.site, :id => page
+    assert_response :redirect
+    assert_redirected_to new_cms_admin_site_layout_path(page.site)
+    assert_equal 'No Layouts found. Please create one.', flash[:error]
+  end
+
+  def test_get_toggle_branch
+    page = cms_pages(:default)
+    get :toggle_branch, :site_id => page.site, :id => page, :format => :js
+    assert_response :success
+    assert_equal [page.id.to_s], session[:cms_page_tree]
+
+    get :toggle_branch, :site_id => page.site, :id => page, :format => :js
+    assert_response :success
+    assert_equal [], session[:cms_page_tree]
+  end
+
+  def test_reorder
+    page_one = cms_pages(:child)
+    page_two = cms_sites(:default).pages.create!(
+      :parent => cms_pages(:default),
+      :layout => cms_layouts(:default),
+      :label  => 'test',
+      :slug   => 'test'
+    )
+    assert_equal 0, page_one.position
+    assert_equal 1, page_two.position
+
+    put :reorder, :site_id => cms_sites(:default), :cms_page => [page_two.id, page_one.id]
+    assert_response :success
+    page_one.reload
+    page_two.reload
+
+    assert_equal 1, page_one.position
+    assert_equal 0, page_two.position
+  end
+
+end

data/test/functional/cms_admin/revisions_controller_test.rb

@@ -0,0 +1,138 @@
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
+
+class CmsAdmin::RevisionsControllerTest < ActionController::TestCase
+  
+  def test_get_index_for_layouts
+    get :index, :site_id => cms_sites(:default), :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, :site_id => cms_sites(:default), :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, :site_id => cms_sites(:default), :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, :site_id => cms_sites(:default), :snippet_id => cms_snippets(:default)
+    assert_response :redirect
+    assert_redirected_to :action => :show, :id => 0
+  end
+  
+  def test_get_show_for_layout
+    get :show, :site_id => cms_sites(:default), :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, :site_id => cms_sites(:default), :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, :site_id => cms_sites(:default), :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, :site_id => cms_sites(:default), :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
+    site = cms_sites(:default)
+    get :show, :site_id => site, :layout_id => cms_layouts(:default), :id => 'invalid'
+    assert_response :redirect
+    assert assigns(:record)
+    assert_redirected_to edit_cms_admin_site_layout_path(site, assigns(:record))
+    assert_equal 'Revision Not Found', flash[:error]
+  end
+  
+  def test_get_show_for_page_failure
+    site = cms_sites(:default)
+    get :show, :site_id => site, :page_id => cms_pages(:default), :id => 'invalid'
+    assert_response :redirect
+    assert assigns(:record)
+    assert_redirected_to edit_cms_admin_site_page_path(site, assigns(:record))
+    assert_equal 'Revision Not Found', flash[:error]
+  end
+  
+  def test_get_show_for_snippet_failure
+    site = cms_sites(:default)
+    get :show, :site_id => site, :snippet_id => cms_snippets(:default), :id => 'invalid'
+    assert_response :redirect
+    assert assigns(:record)
+    assert_redirected_to edit_cms_admin_site_snippet_path(site, 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, :site_id => cms_sites(:default), :layout_id => layout, :id => cms_revisions(:layout)
+      assert_response :redirect
+      assert_redirected_to edit_cms_admin_site_layout_path(layout.site, layout)
+      assert_equal 'Content Reverted', flash[:success]
+      
+      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, :site_id => cms_sites(:default), :page_id => page, :id => cms_revisions(:page)
+      assert_response :redirect
+      assert_redirected_to edit_cms_admin_site_page_path(page.site, page)
+      assert_equal 'Content Reverted', flash[:success]
+      
+      page.reload
+      assert_equal [
+        { :identifier => 'default_field_text', :content => 'revision field content'  },
+        { :identifier => '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, :site_id => cms_sites(:default), :snippet_id => snippet, :id => cms_revisions(:snippet)
+      assert_response :redirect
+      assert_redirected_to edit_cms_admin_site_snippet_path(snippet.site, snippet)
+      assert_equal 'Content Reverted', flash[:success]
+      
+      snippet.reload
+      assert_equal 'revision content', snippet.content
+    end
+  end
+  
+end

data/test/functional/cms_admin/sites_controller_test.rb

@@ -0,0 +1,105 @@
+require File.expand_path('../../test_helper', File.dirname(__FILE__))
+
+class CmsAdmin::SitesControllerTest < ActionController::TestCase
+
+  def test_get_index
+    get :index
+    assert_response :success
+    assert assigns(:sites)
+    assert_template :index
+  end
+
+  def test_get_index_with_no_sites
+    Cms::Site.delete_all
+    get :index
+    assert_response :redirect
+    assert_redirected_to :action => :new
+  end
+
+  def test_get_new
+    get :new
+    assert_response :success
+    assert assigns(:site)
+    assert_equal 'test.host', assigns(:site).hostname
+    assert_template :new
+    assert_select 'form[action=/cms-admin/sites]'
+  end
+
+  def test_get_edit
+    site = cms_sites(:default)
+    get :edit, :id => site
+    assert_response :success
+    assert assigns(:site)
+    assert_template :edit
+    assert_select "form[action=/cms-admin/sites/#{site.id}]"
+  end
+
+  def test_get_edit_failure
+    get :edit, :id => 'not_found'
+    assert_response :redirect
+    assert_redirected_to :action => :index
+    assert_equal 'Site not found', flash[:error]
+  end
+  
+  def test_create
+    assert_difference 'Cms::Site.count' do
+      post :create, :site => {
+        :label      => 'Test Site',
+        :identifier => 'test-site',
+        :hostname   => 'test.site.local'
+      }
+      assert_response :redirect
+      site = Cms::Site.last
+      assert_redirected_to cms_admin_site_layouts_path(site)
+      assert_equal 'Site created', flash[:success]
+    end
+  end
+
+  def test_creation_failure
+    assert_no_difference 'Cms::Site.count' do
+      post :create, :site => { }
+      assert_response :success
+      assert_template :new
+      assert_equal 'Failed to create site', flash[:error]
+    end
+  end
+
+  def test_update
+    site = cms_sites(:default)
+    put :update, :id => site, :site => {
+      :label        => 'New Site',
+      :hostname     => 'new.site.local',
+      :locale       => 'es',
+      :is_mirrored  => '1'
+    }
+    assert_response :redirect
+    assert_redirected_to :action => :edit, :id => site
+    assert_equal 'Site updated', flash[:success]
+    site.reload
+    assert_equal 'New Site', site.label
+    assert_equal 'new.site.local', site.hostname
+    assert_equal 'es', site.locale
+    assert site.is_mirrored?
+  end
+
+  def test_update_failure
+    site = cms_sites(:default)
+    put :update, :id => site, :site => {
+      :hostname => ''
+    }
+    assert_response :success
+    assert_template :edit
+    site.reload
+    assert_not_equal '', site.hostname
+    assert_equal 'Failed to update site', flash[:error]
+  end
+
+  def test_destroy
+    assert_difference 'Cms::Site.count', -1 do
+      delete :destroy, :id => cms_sites(:default)
+      assert_response :redirect
+      assert_redirected_to :action => :index
+      assert_equal 'Site deleted', flash[:success]
+    end
+  end
+end