comfortable_mexican_sofa 1.0.1 → 1.0.2

data/test/fixtures/cms_uploads.yml

@@ -1,4 +1,5 @@
 default:
+  cms_site: default
   file_file_name: sample.jpg
   file_content_type: image/jpeg
   file_file_size: 20099

data/test/functional/cms_admin/layouts_controller_test.rb

@@ -40,7 +40,9 @@ class CmsAdmin::LayoutsControllerTest < ActionController::TestCase
         :content  => 'Test Content'
       }
       assert_response :redirect
-      assert_redirected_to :action => :edit, :id => CmsLayout.last
+      layout = CmsLayout.last
+      assert_equal cms_sites(:default), layout.cms_site
+      assert_redirected_to :action => :edit, :id => layout
       assert_equal 'Layout created', flash[:notice]
     end
   end

data/test/functional/cms_admin/pages_controller_test.rb

@@ -113,7 +113,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     get :edit, :id => page
     assert_response :success
     assert assigns(:cms_page)
-    assert_equal cms_layouts(:default), assigns(:cms_page).cms_layout
+    assert assigns(:cms_page).cms_layout
   end
   
   def test_creation
@@ -137,7 +137,9 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
           ]
         }
         assert_response :redirect
-        assert_redirected_to :action => :edit, :id => CmsPage.last
+        page = CmsPage.last
+        assert_equal cms_sites(:default), page.cms_site
+        assert_redirected_to :action => :edit, :id => page
         assert_equal 'Page saved', flash[:notice]
       end
     end

data/test/functional/cms_admin/sites_controller_test.rb

@@ -0,0 +1,92 @@
+require  File.dirname(__FILE__) + '/../../test_helper'
+
+class CmsAdmin::SitesControllerTest < ActionController::TestCase
+  
+  def test_get_index
+    get :index
+    assert_response :success
+    assert assigns(:cms_sites)
+    assert_template :index
+  end
+  
+  def test_get_new
+    get :new
+    assert_response :success
+    assert assigns(:cms_site)
+    assert_equal 'test.host', assigns(:cms_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(:cms_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_creation
+    assert_difference 'CmsSite.count' do
+      post :create, :cms_site => {
+        :label    => 'Test Site',
+        :hostname => 'test.site.local'
+      }
+      assert_response :redirect
+      assert_redirected_to :action => :edit, :id => CmsSite.last
+      assert_equal 'Site created', flash[:notice]
+    end
+  end
+  
+  def test_creation_failure
+    assert_no_difference 'CmsSite.count' do
+      post :create, :cms_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, :cms_site => {
+      :label    => 'New Site',
+      :hostname => 'new.site.local'
+    }
+    assert_response :redirect
+    assert_redirected_to :action => :edit, :id => site
+    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_failure
+    site = cms_sites(:default)
+    put :update, :id => site, :cms_site => {
+      :label => ''
+    }
+    assert_response :success
+    assert_template :edit
+    site.reload
+    assert_not_equal '', site.label
+    assert_equal 'Failed to update site', flash[:error]
+  end
+  
+  def test_destroy
+    assert_difference 'CmsSite.count', -1 do
+      delete :destroy, :id => cms_sites(:default)
+      assert_response :redirect
+      assert_redirected_to :action => :index
+      assert_equal 'Site deleted', flash[:notice]
+    end
+  end
+end

data/test/functional/cms_admin/snippets_controller_test.rb

@@ -2,69 +2,94 @@ require  File.dirname(__FILE__) + '/../../test_helper'
 
 class CmsAdmin::SnippetsControllerTest < ActionController::TestCase
 
-  def test_index
+  def test_get_index
     get :index
     assert_response :success
-    assert_template 'index'
+    assert assigns(:cms_snippets)
+    assert_template :index
   end
   
-  def test_new
+  def test_get_new
     get :new
     assert_response :success
-    assert_template 'new'
+    assert assigns(:cms_snippet)
+    assert_template :new
+    assert_select 'form[action=/cms-admin/snippets]'
   end
   
-  def test_create
-    assert_difference 'CmsSnippet.count', 1 do
-      post :create, :cms_snippet => cms_snippet_params
-    end
-    assert_equal 'Snippet saved', flash[:notice]
-    assert_redirected_to edit_cms_admin_snippet_path(assigns(:cms_snippet))
+  def test_get_edit
+    snippet = cms_snippets(:default)
+    get :edit, :id => snippet
+    assert_response :success
+    assert assigns(:cms_snippet)
+    assert_template :edit
+    assert_select "form[action=/cms-admin/snippets/#{snippet.id}]"
   end
   
-  def test_create_fails
-    assert_no_difference 'CmsSnippet.count' do
-      post :create, :cms_snippet => cms_snippet_params(:label => '')
+  def test_get_edit_failure
+    get :edit, :id => 'not_found'
+    assert_response :redirect
+    assert_redirected_to :action => :index
+    assert_equal 'Snippet not found', flash[:error]
+  end
+  
+  def test_creation
+    assert_difference 'CmsSnippet.count' do
+      post :create, :cms_snippet => {
+        :label    => 'Test Snippet',
+        :slug     => 'test-snippet',
+        :content  => 'Test Content'
+      }
+      assert_response :redirect
+      snippet = CmsSnippet.last
+      assert_equal cms_sites(:default), snippet.cms_site
+      assert_redirected_to :action => :edit, :id => snippet
+      assert_equal 'Snippet created', flash[:notice]
     end
-    assert_response :success
-    assert_template 'new'
   end
   
-  def test_edit
-    get :edit, :id => cms_snippets(:default)
-    assert_response :success
-    assert_template 'edit'
+  def test_creation_failure
+    assert_no_difference 'CmsSnippet.count' do
+      post :create, :cms_snippet => { }
+      assert_response :success
+      assert_template :new
+      assert_equal 'Failed to create snippet', flash[:error]
+    end
   end
   
   def test_update
     snippet = cms_snippets(:default)
-    put :update, :id => snippet, :cms_snippet => {:label => 'new-label'}
-    assert_equal 'Snippet saved', flash[:notice]
-    assert_redirected_to edit_cms_admin_snippet_path(assigns(:cms_snippet))
-    assert_equal 'new-label', assigns(:cms_snippet).label
+    put :update, :id => snippet, :cms_snippet => {
+      :label    => 'New-Snippet',
+      :content  => 'New Content'
+    }
+    assert_response :redirect
+    assert_redirected_to :action => :edit, :id => snippet
+    assert_equal 'Snippet updated', flash[:notice]
+    snippet.reload
+    assert_equal 'New-Snippet', snippet.label
+    assert_equal 'New Content', snippet.content
   end
   
-  def test_update_fails
+  def test_update_failure
     snippet = cms_snippets(:default)
-    put :update, :id => snippet, :cms_snippet => {:label => ''}
+    put :update, :id => snippet, :cms_snippet => {
+      :label => ''
+    }
     assert_response :success
-    assert_template 'edit'
-    assert_equal 'default', snippet.label
+    assert_template :edit
+    snippet.reload
+    assert_not_equal '', snippet.label
+    assert_equal 'Failed to update snippet', flash[:error]
   end
   
   def test_destroy
     assert_difference 'CmsSnippet.count', -1 do
       delete :destroy, :id => cms_snippets(:default)
+      assert_response :redirect
+      assert_redirected_to :action => :index
+      assert_equal 'Snippet deleted', flash[:notice]
     end
-    assert_equal 'Snippet deleted', flash[:notice]
-    assert_redirected_to cms_admin_snippets_path
-  end
-
-protected
-  def cms_snippet_params(options = {})
-    {
-      :label => 'snippet-label',
-      :content => 'Lorem ipsum dolor sit amet, consectetur adipisicing elit'
-    }.merge(options)
   end
+  
 end

data/test/functional/cms_content_controller_test.rb

@@ -15,7 +15,7 @@ class CmsContentControllerTest < ActionController::TestCase
       layout_content_b
       default_snippet_content
       layout_content_c'
-    ), @response.body
+    ), response.body
   end
   
   def test_render_page_with_app_layout
@@ -28,13 +28,40 @@ class CmsContentControllerTest < ActionController::TestCase
   def test_render_page_not_found
     get :render_html, :cms_path => 'doesnotexist'
     assert_response 404
+    assert_equal 'Page Not Found', response.body
+  end
+  
+  def test_render_page_not_found_with_custom_404
+    cms_sites(:default).cms_pages.create!(
+      :label          => '404',
+      :slug           => '404',
+      :parent_id      => cms_pages(:default).id,
+      :cms_layout_id  => cms_layouts(:default).id,
+      :cms_blocks_attributes => [
+        { :label    => 'default_page_text',
+          :type     => 'CmsTag::PageText',
+          :content  => 'custom 404 page content' }
+      ]
+    )
+    get :render_html, :cms_path => 'doesnotexist'
+    assert_response 404
+    assert assigns(:cms_page)
+    assert_match /custom 404 page content/, response.body
+  end
+  
+  def test_render_page_with_redirect
+    cms_pages(:child).update_attribute(:target_page, cms_pages(:default))
+    assert_equal cms_pages(:default), cms_pages(:child).target_page
+    get :render_html, :cms_path => 'child-page'
+    assert_response :redirect
+    assert_redirected_to '/'
   end
   
   def test_render_css
     get :render_css, :id => cms_layouts(:default)
     assert_response :success
-    assert_match %r{text\/css}, @response.headers["Content-Type"]
-    assert_equal cms_layouts(:default).css, @response.body
+    assert_match %r{text\/css}, response.headers["Content-Type"]
+    assert_equal cms_layouts(:default).css, response.body
   end
   
   def test_render_css_not_found
@@ -45,8 +72,8 @@ class CmsContentControllerTest < ActionController::TestCase
   def test_render_js
     get :render_js, :id => cms_layouts(:default)
     assert_response :success
-    assert_match %r{text\/javascript}, @response.headers["Content-Type"]
-    assert_equal cms_layouts(:default).js, @response.body
+    assert_match %r{text\/javascript}, response.headers["Content-Type"]
+    assert_equal cms_layouts(:default).js, response.body
   end
   
   def test_render_js_not_found

data/test/integration/authentication_test.rb

@@ -0,0 +1,27 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class AuthenticationTest < ActionDispatch::IntegrationTest
+  
+  def test_get_with_unauthorized_access
+    assert_equal 'ComfortableMexicanSofa::HttpAuth', ComfortableMexicanSofa.config.authentication
+    get '/cms-admin/pages'
+    assert_response :unauthorized
+    get '/'
+    assert_response :success
+  end
+  
+  def test_get_with_authorized_access
+    http_auth :get, '/cms-admin/pages'
+    assert_response :success
+  end
+  
+  def test_get_with_changed_default_config
+    assert_equal 'ComfortableMexicanSofa::HttpAuth', ComfortableMexicanSofa.config.authentication
+    ComfortableMexicanSofa::HttpAuth.username = 'newuser'
+    ComfortableMexicanSofa::HttpAuth.password = 'newpass'
+    http_auth :get, '/cms-admin/pages'
+    assert_response :unauthorized
+    http_auth :get, '/cms-admin/pages', {}, 'newuser', 'newpass'
+    assert_response :success
+  end
+end

data/test/integration/render_cms_test.rb

@@ -0,0 +1,57 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class RenderCmsTest < ActionDispatch::IntegrationTest
+  
+  def setup
+    Rails.application.routes.draw do
+      get '/render-implicit' => 'render_test#implicit'
+      get '/render-explicit' => 'render_test#explicit'
+    end
+    super
+  end
+  
+  def teardown
+    load(File.expand_path('config/routes.rb', Rails.root))
+  end
+  
+  class ::RenderTestController < ApplicationController
+    def implicit
+      render
+    end
+    def explicit
+      render :cms_page => '/render-explicit-page'
+    end
+  end
+  
+  def test_get_with_no_template
+    assert_exception_raised ActionView::MissingTemplate do
+      get '/render-implicit'
+    end
+  end
+  
+  def test_get_with_implicit_cms_template
+    page = cms_pages(:child)
+    page.slug = 'render-implicit'
+    page.save!
+    get '/render-implicit'
+    assert_response :success
+  end
+  
+  def test_get_with_explicit_cms_template
+    page = cms_pages(:child)
+    page.slug = 'render-explicit-page'
+    page.save!
+    get '/render-explicit'
+    assert_response :success
+  end
+  
+  def test_get_with_explicit_cms_template_failure
+    page = cms_pages(:child)
+    page.slug = 'render-explicit-404'
+    page.save!
+    assert_exception_raised ActionView::MissingTemplate do
+      get '/render-explicit'
+    end
+  end
+  
+end

data/test/integration/sites_test.rb

@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class SitesTest < ActionDispatch::IntegrationTest
+  
+  def test_get_admin_pages_index
+    http_auth :get, cms_admin_pages_path
+    assert_response :success
+  end
+  
+  def test_get_admin_pages_index_with_no_site
+    CmsSite.delete_all
+    http_auth :get, cms_admin_pages_path
+    assert_response :redirect
+    assert_redirected_to new_cms_admin_site_path
+  end
+  
+  def test_get_admin_sites_index_with_no_site
+    CmsSite.delete_all
+    http_auth :get, cms_admin_sites_path
+    assert_response :success
+  end
+  
+  def test_get_public_page_for_non_existent_site
+    host! 'bogus.host'
+    get '/'
+    assert_response 404
+    assert_equal 'Site Not Found', response.body
+  end
+  
+end

data/test/test_helper.rb

@@ -6,6 +6,16 @@ class ActiveSupport::TestCase
   fixtures :all
   include ActionDispatch::TestProcess
   
+  def setup
+    # resetting default configuration
+    ComfortableMexicanSofa.configure do |config|
+      config.cms_title      = 'ComfortableMexicanSofa'
+      config.authentication = 'ComfortableMexicanSofa::HttpAuth'
+    end
+    ComfortableMexicanSofa::HttpAuth.username = 'username'
+    ComfortableMexicanSofa::HttpAuth.password = 'password'
+  end
+  
   # Example usage:
   #   assert_has_errors_on( @record, [:field_1, :field_2] )
   #   assert_has_errors_on( @record, {:field_1 => 'Message1', :field_2 => 'Message 2'} )
@@ -21,17 +31,50 @@ class ActiveSupport::TestCase
     end
   end
   
+  # Example usage:
+  #   assert_exception_raised                                 do ... end
+  #   assert_exception_raised ActiveRecord::RecordInvalid     do ... end
+  #   assert_exception_raised Plugin::Error, 'error_message'  do ... end
+  def assert_exception_raised(exception_class = nil, error_message = nil, &block)
+    exception_raised = nil
+    yield
+  rescue => exception_raised
+  ensure
+    if exception_raised
+      if exception_class
+        assert_equal exception_class, exception_raised.class, exception_raised.to_s
+      else
+        assert true
+      end
+      assert_equal error_message, exception_raised.to_s if error_message
+    else
+      flunk 'Exception was not raised'
+    end
+  end
+  
   # Small method that allows for better formatting in tests
   def rendered_content_formatter(string)
     string.gsub(/^[ ]+/, '')
   end
-  
 end
 
 class ActionController::TestCase
-  
-  def http_auth
+  def setup
     @request.env['HTTP_AUTHORIZATION'] = "Basic #{Base64.encode64('username:password')}"
   end
+end
+
+class ActionDispatch::IntegrationTest
   
+  def setup
+    host! 'test.host'
+    ComfortableMexicanSofa::HttpAuth.username = 'username'
+    ComfortableMexicanSofa::HttpAuth.password = 'password'
+  end
+  
+  # Attaching http_auth stuff with request. Example use:
+  #   http_auth :get, '/cms-admin/pages'
+  def http_auth(method, path, options = {}, username = 'username', password = 'password')
+    send(method, path, options, {'HTTP_AUTHORIZATION' => "Basic #{Base64.encode64(username + ':' + password)}"})
+  end
 end