comfortable_mexican_sofa 1.2.8 → 1.3.0

data/test/functional/cms_admin/revisions_controller_test.rb

@@ -3,32 +3,32 @@ 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)
+    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, :page_id => cms_pages(:default)
+    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, :snippet_id => cms_snippets(:default)
+    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, :snippet_id => cms_snippets(:default)
+    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, :layout_id => cms_layouts(:default), :id => cms_revisions(: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)
@@ -37,7 +37,7 @@ class CmsAdmin::RevisionsControllerTest < ActionController::TestCase
   end
   
   def test_get_show_for_page
-    get :show, :page_id => cms_pages(:default), :id => cms_revisions(: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)
@@ -46,7 +46,7 @@ class CmsAdmin::RevisionsControllerTest < ActionController::TestCase
   end
   
   def test_get_show_for_snippet
-    get :show, :snippet_id => cms_snippets(:default), :id => cms_revisions(: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)
@@ -55,33 +55,36 @@ class CmsAdmin::RevisionsControllerTest < ActionController::TestCase
   end
   
   def test_get_show_for_bad_type
-    get :show, :snippet_id => 'invalid', :id => cms_revisions(:snippet)
+    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
-    get :show, :layout_id => cms_layouts(:default), :id => 'invalid'
+    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_layout_path(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
-    get :show, :page_id => cms_pages(:default), :id => 'invalid'
+    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_page_path(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
-    get :show, :snippet_id => cms_snippets(:default), :id => 'invalid'
+    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_snippet_path(assigns(:record))
+    assert_redirected_to edit_cms_admin_site_snippet_path(site, assigns(:record))
     assert_equal 'Revision Not Found', flash[:error]
   end
   
@@ -89,9 +92,9 @@ class CmsAdmin::RevisionsControllerTest < ActionController::TestCase
     layout = cms_layouts(:default)
     
     assert_difference 'layout.revisions.count' do 
-      put :revert, :layout_id => layout, :id => cms_revisions(:layout)
+      put :revert, :site_id => cms_sites(:default), :layout_id => layout, :id => cms_revisions(:layout)
       assert_response :redirect
-      assert_redirected_to edit_cms_admin_layout_path(layout)
+      assert_redirected_to edit_cms_admin_site_layout_path(layout.site, layout)
       assert_equal 'Content Reverted', flash[:notice]
       
       layout.reload
@@ -105,9 +108,9 @@ class CmsAdmin::RevisionsControllerTest < ActionController::TestCase
     page = cms_pages(:default)
     
     assert_difference 'page.revisions.count' do
-      put :revert, :page_id => page, :id => cms_revisions(:page)
+      put :revert, :site_id => cms_sites(:default), :page_id => page, :id => cms_revisions(:page)
       assert_response :redirect
-      assert_redirected_to edit_cms_admin_page_path(page)
+      assert_redirected_to edit_cms_admin_site_page_path(page.site, page)
       assert_equal 'Content Reverted', flash[:notice]
       
       page.reload
@@ -122,9 +125,9 @@ class CmsAdmin::RevisionsControllerTest < ActionController::TestCase
     snippet = cms_snippets(:default)
     
     assert_difference 'snippet.revisions.count' do
-      put :revert, :snippet_id => snippet, :id => cms_revisions(:snippet)
+      put :revert, :site_id => cms_sites(:default), :snippet_id => snippet, :id => cms_revisions(:snippet)
       assert_response :redirect
-      assert_redirected_to edit_cms_admin_snippet_path(snippet)
+      assert_redirected_to edit_cms_admin_site_snippet_path(snippet.site, snippet)
       assert_equal 'Content Reverted', flash[:notice]
       
       snippet.reload

data/test/functional/cms_admin/sites_controller_test.rb

@@ -5,7 +5,7 @@ class CmsAdmin::SitesControllerTest < ActionController::TestCase
   def test_get_index
     get :index
     assert_response :success
-    assert assigns(:cms_sites)
+    assert assigns(:sites)
     assert_template :index
   end
 
@@ -19,8 +19,8 @@ class CmsAdmin::SitesControllerTest < ActionController::TestCase
   def test_get_new
     get :new
     assert_response :success
-    assert assigns(:cms_site)
-    assert_equal 'test.host', assigns(:cms_site).hostname
+    assert assigns(:site)
+    assert_equal 'test.host', assigns(:site).hostname
     assert_template :new
     assert_select 'form[action=/cms-admin/sites]'
   end
@@ -29,7 +29,7 @@ class CmsAdmin::SitesControllerTest < ActionController::TestCase
     site = cms_sites(:default)
     get :edit, :id => site
     assert_response :success
-    assert assigns(:cms_site)
+    assert assigns(:site)
     assert_template :edit
     assert_select "form[action=/cms-admin/sites/#{site.id}]"
   end
@@ -43,7 +43,7 @@ class CmsAdmin::SitesControllerTest < ActionController::TestCase
   
   def test_create
     assert_difference 'Cms::Site.count' do
-      post :create, :cms_site => {
+      post :create, :site => {
         :label    => 'Test Site',
         :hostname => 'test.site.local'
       }
@@ -56,7 +56,7 @@ class CmsAdmin::SitesControllerTest < ActionController::TestCase
 
   def test_creation_failure
     assert_no_difference 'Cms::Site.count' do
-      post :create, :cms_site => { }
+      post :create, :site => { }
       assert_response :success
       assert_template :new
       assert_equal 'Failed to create site', flash[:error]
@@ -65,7 +65,7 @@ class CmsAdmin::SitesControllerTest < ActionController::TestCase
 
   def test_update
     site = cms_sites(:default)
-    put :update, :id => site, :cms_site => {
+    put :update, :id => site, :site => {
       :label    => 'New Site',
       :hostname => 'new.site.local'
     }
@@ -79,7 +79,7 @@ class CmsAdmin::SitesControllerTest < ActionController::TestCase
 
   def test_update_failure
     site = cms_sites(:default)
-    put :update, :id => site, :cms_site => {
+    put :update, :id => site, :site => {
       :hostname => ''
     }
     assert_response :success

data/test/functional/cms_admin/snippets_controller_test.rb

@@ -3,38 +3,39 @@ require File.expand_path('../../test_helper', File.dirname(__FILE__))
 class CmsAdmin::SnippetsControllerTest < ActionController::TestCase
 
   def test_get_index
-    get :index
+    get :index, :site_id => cms_sites(:default)
     assert_response :success
-    assert assigns(:cms_snippets)
+    assert assigns(:snippets)
     assert_template :index
   end
 
   def test_get_index_with_no_snippets
     Cms::Snippet.delete_all
-    get :index
+    get :index, :site_id => cms_sites(:default)
     assert_response :redirect
     assert_redirected_to :action => :new
   end
 
   def test_get_new
-    get :new
+    site = cms_sites(:default)
+    get :new, :site_id => site
     assert_response :success
-    assert assigns(:cms_snippet)
+    assert assigns(:snippet)
     assert_template :new
-    assert_select 'form[action=/cms-admin/snippets]'
+    assert_select "form[action=/cms-admin/sites/#{site.id}/snippets]"
   end
 
   def test_get_edit
     snippet = cms_snippets(:default)
-    get :edit, :id => snippet
+    get :edit, :site_id => snippet.site, :id => snippet
     assert_response :success
-    assert assigns(:cms_snippet)
+    assert assigns(:snippet)
     assert_template :edit
-    assert_select "form[action=/cms-admin/snippets/#{snippet.id}]"
+    assert_select "form[action=/cms-admin/sites/#{snippet.site.id}/snippets/#{snippet.id}]"
   end
 
   def test_get_edit_failure
-    get :edit, :id => 'not_found'
+    get :edit, :site_id => cms_sites(:default), :id => 'not_found'
     assert_response :redirect
     assert_redirected_to :action => :index
     assert_equal 'Snippet not found', flash[:error]
@@ -42,7 +43,7 @@ class CmsAdmin::SnippetsControllerTest < ActionController::TestCase
   
   def test_create
     assert_difference 'Cms::Snippet.count' do
-      post :create, :cms_snippet => {
+      post :create, :site_id => cms_sites(:default), :snippet => {
         :label    => 'Test Snippet',
         :slug     => 'test-snippet',
         :content  => 'Test Content'
@@ -57,7 +58,7 @@ class CmsAdmin::SnippetsControllerTest < ActionController::TestCase
 
   def test_creation_failure
     assert_no_difference 'Cms::Snippet.count' do
-      post :create, :cms_snippet => { }
+      post :create, :site_id => cms_sites(:default), :snippet => { }
       assert_response :success
       assert_template :new
       assert_equal 'Failed to create snippet', flash[:error]
@@ -66,12 +67,12 @@ class CmsAdmin::SnippetsControllerTest < ActionController::TestCase
 
   def test_update
     snippet = cms_snippets(:default)
-    put :update, :id => snippet, :cms_snippet => {
+    put :update, :site_id => snippet.site, :id => snippet, :snippet => {
       :label    => 'New-Snippet',
       :content  => 'New Content'
     }
     assert_response :redirect
-    assert_redirected_to :action => :edit, :id => snippet
+    assert_redirected_to :action => :edit, :site_id => snippet.site, :id => snippet
     assert_equal 'Snippet updated', flash[:notice]
     snippet.reload
     assert_equal 'New-Snippet', snippet.label
@@ -80,7 +81,7 @@ class CmsAdmin::SnippetsControllerTest < ActionController::TestCase
 
   def test_update_failure
     snippet = cms_snippets(:default)
-    put :update, :id => snippet, :cms_snippet => {
+    put :update, :site_id => snippet.site, :id => snippet, :snippet => {
       :slug => ''
     }
     assert_response :success
@@ -92,7 +93,7 @@ class CmsAdmin::SnippetsControllerTest < ActionController::TestCase
 
   def test_destroy
     assert_difference 'Cms::Snippet.count', -1 do
-      delete :destroy, :id => cms_snippets(:default)
+      delete :destroy, :site_id => cms_sites(:default), :id => cms_snippets(:default)
       assert_response :redirect
       assert_redirected_to :action => :index
       assert_equal 'Snippet deleted', flash[:notice]

data/test/functional/cms_admin/uploads_controller_test.rb

@@ -4,21 +4,21 @@ class CmsAdmin::UploadsControllerTest < ActionController::TestCase
   
   def test_create
     assert_difference 'Cms::Upload.count', 1 do
-      xhr :post, :create, :file => fixture_file_upload('files/valid_image.jpg')
+      xhr :post, :create, :site_id => cms_sites(:default), :file => fixture_file_upload('files/valid_image.jpg')
       assert_response :success
     end
   end
   
   def test_create_failure
     assert_no_difference 'Cms::Upload.count' do
-      xhr :post, :create, :file => nil
+      xhr :post, :create, :site_id => cms_sites(:default), :file => nil
       assert_response :bad_request
     end
   end
   
   def test_destroy
     assert_difference 'Cms::Upload.count', -1 do
-      xhr :delete, :destroy, :id => cms_uploads(:default)
+      xhr :delete, :destroy, :site_id => cms_sites(:default), :id => cms_uploads(:default)
       assert_response :success
     end
   end

data/test/integration/authentication_test.rb

@@ -4,14 +4,14 @@ class AuthenticationTest < ActionDispatch::IntegrationTest
   
   def test_get_with_unauthorized_access
     assert_equal 'ComfortableMexicanSofa::HttpAuth', ComfortableMexicanSofa.config.authentication
-    get '/cms-admin/pages'
+    get '/cms-admin/sites'
     assert_response :unauthorized
     get '/'
     assert_response :success
   end
   
   def test_get_with_authorized_access
-    http_auth :get, '/cms-admin/pages'
+    http_auth :get, '/cms-admin/sites'
     assert_response :success
   end
   
@@ -19,9 +19,9 @@ class AuthenticationTest < ActionDispatch::IntegrationTest
     assert_equal 'ComfortableMexicanSofa::HttpAuth', ComfortableMexicanSofa.config.authentication
     ComfortableMexicanSofa::HttpAuth.username = 'newuser'
     ComfortableMexicanSofa::HttpAuth.password = 'newpass'
-    http_auth :get, '/cms-admin/pages'
+    http_auth :get, '/cms-admin/sites'
     assert_response :unauthorized
-    http_auth :get, '/cms-admin/pages', {}, 'newuser', 'newpass'
+    http_auth :get, '/cms-admin/sites', {}, 'newuser', 'newpass'
     assert_response :success
   end
 end

data/test/integration/fixtures_test.rb

@@ -49,7 +49,7 @@ class FixturesTest < ActionDispatch::IntegrationTest
     assert_difference 'Cms::Page.count', 2 do
       assert_difference 'Cms::Layout.count', 2 do
         assert_difference 'Cms::Snippet.count', 1 do
-           http_auth :get, '/cms-admin/pages'
+           http_auth :get, "/cms-admin/sites/#{cms_sites(:default).id}/pages"
            assert_response :success
            assert_equal 'CMS Fixtures are enabled. All changes done here will be discarded.', flash[:error]
         end

data/test/integration/mirrors_test.rb

@@ -3,12 +3,9 @@ require File.expand_path('../test_helper', File.dirname(__FILE__))
 class MirrorsTest < ActionDispatch::IntegrationTest
   
   def setup
-    ComfortableMexicanSofa.config.enable_mirror_sites = true
-    Cms::Site.create!(:hostname => 'test-b.host')
-    load(File.expand_path('app/models/cms/layout.rb', Rails.root))
-    load(File.expand_path('app/models/cms/page.rb', Rails.root))
-    load(File.expand_path('app/models/cms/snippet.rb', Rails.root))
-    
+    @site_a = cms_sites(:default)
+    @site_a.update_attribute(:is_mirrored, true)
+    @site_b = Cms::Site.create!(:hostname => 'test-b.host', :is_mirrored => true)
     # making mirrors
     Cms::Layout.all.each{ |l| l.save! }
     Cms::Page.all.each{ |p| p.save! }
@@ -16,10 +13,10 @@ class MirrorsTest < ActionDispatch::IntegrationTest
   end
   
   def test_get_layouts
-    http_auth :get, cms_admin_layouts_path
+    http_auth :get, cms_admin_site_layouts_path(@site_a)
     assert_response :success
     assert_select 'select#mirror' do
-      assert_select 'option[value="http://test-b.host/cms-admin/layouts"]'
+      assert_select "option[value='/cms-admin/sites/#{@site_b.id}/layouts']"
     end
   end
   
@@ -27,18 +24,18 @@ class MirrorsTest < ActionDispatch::IntegrationTest
     layout = cms_layouts(:default)
     assert mirror = layout.mirrors.first
     
-    http_auth :get, edit_cms_admin_layout_path(layout)
+    http_auth :get, edit_cms_admin_site_layout_path(@site_a, layout)
     assert_response :success
     assert_select 'select#mirror' do
-      assert_select "option[value='http://test-b.host/cms-admin/layouts/#{mirror.id}/edit']"
+      assert_select "option[value='/cms-admin/sites/#{@site_b.id}/layouts/#{mirror.id}/edit']"
     end
   end
   
   def test_get_pages
-    http_auth :get, cms_admin_pages_path
+    http_auth :get, cms_admin_site_pages_path(@site_a)
     assert_response :success
     assert_select 'select#mirror' do
-      assert_select 'option[value="http://test-b.host/cms-admin/pages"]'
+      assert_select "option[value='/cms-admin/sites/#{@site_b.id}/pages']"
     end
   end
   
@@ -46,18 +43,18 @@ class MirrorsTest < ActionDispatch::IntegrationTest
     page = cms_pages(:default)
     assert mirror = page.mirrors.first
     
-    http_auth :get, edit_cms_admin_page_path(page)
+    http_auth :get, edit_cms_admin_site_page_path(@site_a, page)
     assert_response :success
     assert_select 'select#mirror' do
-      assert_select "option[value='http://test-b.host/cms-admin/pages/#{mirror.id}/edit']"
+      assert_select "option[value='/cms-admin/sites/#{@site_b.id}/pages/#{mirror.id}/edit']"
     end
   end
   
   def test_get_snippets
-    http_auth :get, cms_admin_snippets_path
+    http_auth :get, cms_admin_site_snippets_path(@site_a)
     assert_response :success
     assert_select 'select#mirror' do
-      assert_select 'option[value="http://test-b.host/cms-admin/snippets"]'
+      assert_select "option[value='/cms-admin/sites/#{@site_b.id}/snippets']"
     end
   end
   
@@ -65,10 +62,10 @@ class MirrorsTest < ActionDispatch::IntegrationTest
     snippet = cms_snippets(:default)
     assert mirror = snippet.mirrors.first
     
-    http_auth :get, edit_cms_admin_snippet_path(snippet)
+    http_auth :get, edit_cms_admin_site_snippet_path(@site_a, snippet)
     assert_response :success
     assert_select 'select#mirror' do
-      assert_select "option[value='http://test-b.host/cms-admin/snippets/#{mirror.id}/edit']"
+      assert_select "option[value='/cms-admin/sites/#{@site_b.id}/snippets/#{mirror.id}/edit']"
     end
   end
   

data/test/integration/routing_extensions_test.rb

@@ -7,37 +7,22 @@ class RoutingExtensionsTest < ActionDispatch::IntegrationTest
     load(File.expand_path('config/routes.rb', Rails.root))
   end
   
-  def test_get_public_with_content_route_prefix
-    ComfortableMexicanSofa.config.content_route_prefix = 'custom'
-    load(File.expand_path('config/routes.rb', Rails.root))
-    
-    get '/custom'
-    assert_response :success
-    assert assigns(:cms_page)
-    assert_equal '/', assigns(:cms_page).full_path
-    
-    get '/custom/child-page'
-    assert_response :success
-    assert assigns(:cms_page)
-    assert_equal '/child-page', assigns(:cms_page).full_path
-  end
-  
   def test_get_admin_with_admin_route_prefix
     ComfortableMexicanSofa.config.admin_route_prefix = 'custom-admin'
     load(File.expand_path('config/routes.rb', Rails.root))
     
-    assert_equal '/custom-admin/pages', cms_admin_pages_path
-    http_auth :get, cms_admin_pages_path
+    assert_equal '/custom-admin/sites', cms_admin_sites_path
+    http_auth :get, cms_admin_sites_path
     assert_response :success
   end
   
   def test_get_admin_with_admin_route_redirect
-    ComfortableMexicanSofa.config.admin_route_redirect = 'snippets'
+    ComfortableMexicanSofa.config.admin_route_redirect = '/cms-admin/sites'
     load(File.expand_path('config/routes.rb', Rails.root))
     
     http_auth :get, '/cms-admin'
     assert_response :redirect
-    assert_redirected_to cms_admin_snippets_path
+    assert_redirected_to cms_admin_sites_path
   end
   
   def test_get_admin_with_admin_route_prefix_disabled