revisions controller work now
Oleg
committed Jun 22, 2011
commit 96d6b88ce6a5d3caaa3f0bafdfe375015a38313e
Showing 2
changed files with
26 additions
and 23 deletions
app/controllers/cms_admin/revisions_controller.rb
+3
-3
| @@ | @@ -48,9 +48,9 @@ protected |
| def redirect_to_record | |
| redirect_to case @record | |
| - | when Cms::Layout then edit_cms_admin_layout_path(@record) |
| - | when Cms::Page then edit_cms_admin_page_path(@record) |
| - | when Cms::Snippet then edit_cms_admin_snippet_path(@record) |
| + | when Cms::Layout then edit_cms_admin_site_layout_path(@site, @record) |
| + | when Cms::Page then edit_cms_admin_site_page_path(@site, @record) |
| + | when Cms::Snippet then edit_cms_admin_site_snippet_path(@site, @record) |
| end | |
| end | |
test/functional/cms_admin/revisions_controller_test.rb
+23
-20
| @@ | @@ -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 | |