GitBlixt
teagles/comfortable-mexican-sofa

pages controller is stable

Oleg committed Jun 22, 2011
commit c4be546b67aecd96010de086845393393a1c0989
Showing 10 changed files with 126 additions and 124 deletions
app/controllers/cms_admin/pages_controller.rb +22 -22
@@ @@ -7,8 +7,8 @@ class CmsAdmin::PagesController < CmsAdmin::BaseController
before_filter :build_upload_file, :only => [:new, :edit]
def index
- return redirect_to :action => :new if @cms_site.pages.count == 0
- @cms_pages = [@cms_site.pages.root].compact
+ return redirect_to :action => :new if @site.pages.count == 0
+ @pages = [@site.pages.root].compact
end
def new
@@ @@ -20,45 +20,45 @@ class CmsAdmin::PagesController < CmsAdmin::BaseController
end
def create
- @cms_page.save!
+ @page.save!
flash[:notice] = 'Page saved'
- redirect_to :action => :edit, :id => @cms_page
+ redirect_to :action => :edit, :id => @page
rescue ActiveRecord::RecordInvalid
flash.now[:error] = 'Failed to create page'
render :action => :new
end
def update
- @cms_page.save!
+ @page.save!
flash[:notice] = 'Page updated'
- redirect_to :action => :edit, :id => @cms_page
+ redirect_to :action => :edit, :id => @page
rescue ActiveRecord::RecordInvalid
flash.now[:error] = 'Failed to update page'
render :action => :edit
end
def destroy
- @cms_page.destroy
+ @page.destroy
flash[:notice] = 'Page deleted'
redirect_to :action => :index
end
def form_blocks
- @cms_page = @cms_site.pages.find_by_id(params[:id]) || @cms_site.pages.new
- @cms_page.layout = @cms_site.layouts.find_by_id(params[:layout_id])
+ @page = @site.pages.find_by_id(params[:id]) || @site.pages.new
+ @page.layout = @site.layouts.find_by_id(params[:layout_id])
end
def toggle_branch
- @cms_page = @cms_site.pages.find(params[:id])
+ @page = @site.pages.find(params[:id])
s = (session[:cms_page_tree] ||= [])
- id = @cms_page.id.to_s
+ id = @page.id.to_s
s.member?(id) ? s.delete(id) : s << id
rescue ActiveRecord::RecordNotFound
# do nothing
end
def reorder
- (params[:cms_page] || []).each_with_index do |id, index|
+ (params[:page] || []).each_with_index do |id, index|
if (cms_page = Cms::Page.find_by_id(id))
cms_page.update_attribute(:position, index)
end
@@ @@ -69,16 +69,16 @@ class CmsAdmin::PagesController < CmsAdmin::BaseController
protected
def check_for_layouts
- if @cms_site.layouts.count == 0
+ if @site.layouts.count == 0
flash[:error] = 'No Layouts found. Please create one.'
- redirect_to new_cms_admin_layout_path
+ redirect_to new_cms_admin_site_layout_path(@site)
end
end
def build_cms_page
- @cms_page = @cms_site.pages.new(params[:cms_page])
- @cms_page.parent ||= (@cms_site.pages.find_by_id(params[:parent_id]) || @cms_site.pages.root)
- @cms_page.layout ||= (@cms_page.parent && @cms_page.parent.layout || @cms_site.layouts.first)
+ @page = @site.pages.new(params[:page])
+ @page.parent ||= (@site.pages.find_by_id(params[:parent_id]) || @site.pages.root)
+ @page.layout ||= (@page.parent && @page.parent.layout || @site.layouts.first)
end
def build_upload_file
@@ @@ -86,9 +86,9 @@ protected
end
def load_cms_page
- @cms_page = @cms_site.pages.find(params[:id])
- @cms_page.attributes = params[:cms_page]
- @cms_page.layout ||= (@cms_page.parent && @cms_page.parent.layout || @cms_site.layouts.first)
+ @page = @site.pages.find(params[:id])
+ @page.attributes = params[:page]
+ @page.layout ||= (@page.parent && @page.parent.layout || @site.layouts.first)
rescue ActiveRecord::RecordNotFound
flash[:error] = 'Page not found'
redirect_to :action => :index
@@ @@ -96,8 +96,8 @@ protected
def preview_cms_page
if params[:preview]
- layout = @cms_page.layout.app_layout.blank?? false : @cms_page.layout.app_layout
- render :inline => @cms_page.content(true), :layout => layout
+ layout = @page.layout.app_layout.blank?? false : @page.layout.app_layout
+ render :inline => @page.content(true), :layout => layout
end
end
end
app/views/cms_admin/pages/_form.html.erb +7 -7
@@ @@ -9,19 +9,19 @@
<%= render :partial => 'cms_admin/uploads/index' %>
<% end %>
- <%= form.text_field :label, :id => (@cms_page.new_record?? 'slugify' : nil) %>
+ <%= form.text_field :label, :id => (@page.new_record?? 'slugify' : nil) %>
<div class='page_form_extras'>
- <% unless @cms_site.pages.count == 0 || @cms_site.pages.root == @cms_page%>
+ <% unless @site.pages.count == 0 || @site.pages.root == @page%>
<%= form.text_field :slug, :id => 'slug' %>
<% end %>
- <% if (options = Cms::Layout.options_for_select(@cms_site)).present? %>
- <%= form.select :layout_id, options, {}, 'data-page-id' => @cms_page.id.to_i, :label => 'Layout' %>
+ <% if (options = Cms::Layout.options_for_select(@site)).present? %>
+ <%= form.select :layout_id, options, {}, 'data-page-id' => @page.id.to_i, :label => 'Layout' %>
<% end %>
- <% if (options = Cms::Page.options_for_select(@cms_site, @cms_page)).present? %>
+ <% if (options = Cms::Page.options_for_select(@site, @page)).present? %>
<%= form.select :parent_id, options %>
<% end %>
- <% if (options = Cms::Page.options_for_select(@cms_site, @cms_page, nil, 0, false)).present? %>
+ <% if (options = Cms::Page.options_for_select(@site, @page, nil, 0, false)).present? %>
<%= form.select :target_page_id, [['---- No Redirect ----', nil]] + options, :label => 'Redirect To Page' %>
<% end %>
<%= cms_hook :page_form, :object => form %>
@@ @@ -33,5 +33,5 @@
<%= form.check_box :is_published, :disable_builder => true %>
<%= form.label_for :is_published, :label => 'Published' %>
<%= form.submit 'Preview', :name => 'preview', :id => nil, :disable_builder => true %>
- <%= form.submit @cms_page.new_record? ? 'Create Page' : 'Update Page', :id => 'cms_page_submit', :disable_builder => true %>
+ <%= form.submit @page.new_record? ? 'Create Page' : 'Update Page', :id => 'cms_page_submit', :disable_builder => true %>
<% end %>
\ No newline at end of file
app/views/cms_admin/pages/_form_blocks.html.erb +2 -2
@@ @@ -1,9 +1,9 @@
- <% block_tags = @cms_page.tags(true).select{ |t| t.is_cms_block? } %>
+ <% block_tags = @page.tags(true).select{ |t| t.is_cms_block? } %>
<div id='form_blocks'>
<% if block_tags.empty? %>
<div class='no_tags'>
- <%= link_to @cms_page.layout.label, edit_cms_admin_layout_path(@cms_page.layout) %>
+ <%= link_to @page.layout.label, edit_cms_admin_layout_path(@page.layout) %>
Layout has no content tags defined. <br/>
Edit the content to include a page or field tag, for example: <code>{{cms:page:content}}</code>
</div>
app/views/cms_admin/pages/_index_branch.html.erb +13 -13
@@ @@ -1,16 +1,16 @@
<%
- cms_page ||= index_branch
- has_children = cms_page.children.present?
- has_siblings = cms_page.siblings.present?
- branch_open = (session[:cms_page_tree] || []).member?(cms_page.id.to_s) || cms_page.root?
+ page ||= index_branch
+ has_children = page.children.present?
+ has_siblings = page.siblings.present?
+ branch_open = (session[:cms_page_tree] || []).member?(page.id.to_s) || page.root?
%>
- <li id='<%= dom_id(cms_page) %>'>
+ <li id='<%= dom_id(page) %>'>
<div class='item'>
<div class='toggle <%= 'open' if branch_open %>'>
<%=
- if has_children && !cms_page.root?
- link_to span_tag('toggle'), toggle_branch_cms_admin_page_path(cms_page), :remote => true
+ if has_children && !page.root?
+ link_to span_tag('toggle'), toggle_branch_cms_admin_site_page_path(@site, page), :remote => true
end
%>
</div>
@@ @@ -20,20 +20,20 @@
<% end %>
</div>
<div class='action_links'>
- <%= link_to 'Add Child Page', new_cms_admin_page_path(:parent_id => cms_page.id) %>
- <%= link_to 'Edit', edit_cms_admin_page_path(cms_page) %>
- <%= link_to 'Delete', cms_admin_page_path(cms_page), :method => :delete, :confirm => 'Are you sure?' %>
+ <%= link_to 'Add Child Page', new_cms_admin_site_page_path(@site, :parent_id => page.id) %>
+ <%= link_to 'Edit', edit_cms_admin_site_page_path(@site, page) %>
+ <%= link_to 'Delete', cms_admin_site_page_path(@site, page), :method => :delete, :confirm => 'Are you sure?' %>
</div>
<div class='label'>
- <%= link_to cms_page.label, edit_cms_admin_page_path(cms_page) %>
+ <%= link_to page.label, edit_cms_admin_site_page_path(@site, page) %>
<div class='sublabel'>
- <%= link_to cms_page.url, cms_page.full_path, :target => '_blank' %>
+ <%= link_to page.url, page.full_path, :target => '_blank' %>
</div>
</div>
</div>
<% if has_children && branch_open %>
<ul>
- <%= render :partial => 'index_branch', :collection => cms_page.children %>
+ <%= render :partial => 'index_branch', :collection => page.children %>
</ul>
<% end %>
</li>
\ No newline at end of file
app/views/cms_admin/pages/edit.html.erb +3 -3
@@ @@ -1,10 +1,10 @@
- <%= link_to span_tag(pluralize(@cms_page.revisions.count, 'revision')), cms_admin_page_revisions_path(@cms_page), :class => 'big button' %>
+ <%= link_to span_tag(pluralize(@page.revisions.count, 'revision')), cms_admin_site_page_revisions_path(@site, @page), :class => 'big button' %>
<h1> Editing Page </h1>
<% content_for :right_column do %>
- <%= render :partial => 'cms_admin/sites/mirrors', :object => @cms_page %>
+ <%= render :partial => 'cms_admin/sites/mirrors', :object => @page %>
<% end %>
- <%= cms_form_for @cms_page, :url => {:action => :update} do |form| %>
+ <%= cms_form_for @page, :as => :page, :url => {:action => :update} do |form| %>
<%= render :partial => 'form', :object => form %>
<% end %>
\ No newline at end of file
app/views/cms_admin/pages/index.html.erb +2 -2
@@ @@ -1,4 +1,4 @@
- <%= link_to span_tag('Create New Page'), new_cms_admin_page_path, :class => 'big button' %>
+ <%= link_to span_tag('Create New Page'), new_cms_admin_site_page_path(@site), :class => 'big button' %>
<h1>Pages</h1>
<% content_for :right_column do %>
@@ @@ -6,5 +6,5 @@
<% end %>
<ul class='list sortable'>
- <%= render :partial => 'index_branch', :collection => @cms_pages %>
+ <%= render :partial => 'index_branch', :collection => @pages %>
</ul>
\ No newline at end of file
app/views/cms_admin/pages/new.html.erb +1 -1
@@ @@ -1,5 +1,5 @@
<h1> New Page </h1>
- <%= cms_form_for @cms_page, :url => {:action => :create} do |form| %>
+ <%= cms_form_for @page, :as => :page, :url => {:action => :create} do |form| %>
<%= render :partial => 'form', :object => form %>
<% end %>
\ No newline at end of file
app/views/cms_admin/pages/toggle_branch.js.erb +3 -3
@@ @@ -1,9 +1,9 @@
- var li = $('li#cms_page_<%=@cms_page.id%>');
+ var li = $('li#cms_page_<%=@page.id%>');
li.find('.item .toggle').first().toggleClass('open');
- <% if session[:cms_page_tree].member?(@cms_page.id.to_s) %>
+ <% if session[:cms_page_tree].member?(@page.id.to_s) %>
if(!li.find('ul')[0]) {
- li.append('<ul><%= escape_javascript(render :partial => "index_branch", :collection => @cms_page.children) %></ul>');
+ li.append('<ul><%= escape_javascript(render :partial => "index_branch", :collection => @page.children) %></ul>');
$.CMS.enable_sortable_list();
}
<% else %>
comfortable_mexican_sofa/form_builder.rb b/lib/comfortable_mexican_sofa/form_builder.rb +2 -2
@@ @@ -68,14 +68,14 @@ class ComfortableMexicanSofa::FormBuilder < ActionView::Helpers::FormBuilder
options[:content_field_method] ||= :text_field_tag
field =
options[:field] ||
- @template.send(options[:content_field_method], 'cms_page[blocks_attributes][][content]', tag.content, :id => nil, :class => field_css_class)
+ @template.send(options[:content_field_method], 'page[blocks_attributes][][content]', tag.content, :id => nil, :class => field_css_class)
%(
<div class='form_element #{css_class}'>
<div class='label'>#{label}</div>
<div class='value'>
#{field}
- #{@template.hidden_field_tag('cms_page[blocks_attributes][][label]', tag.label, :id => nil)}
+ #{@template.hidden_field_tag('page[blocks_attributes][][label]', tag.label, :id => nil)}
</div>
</div>
).html_safe
test/functional/cms_admin/pages_controller_test.rb +71 -69
@@ @@ -5,108 +5,109 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
def test_get_index
get :index, :site_id => cms_sites(:default)
assert_response :success
- assert assigns(:cms_pages)
+ assert assigns(:pages)
assert_template :index
end
def test_get_index_with_no_pages
Cms::Page.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_page)
- assert_equal cms_layouts(:default), assigns(:cms_page).layout
+ assert assigns(:page)
+ assert_equal cms_layouts(:default), assigns(:page).layout
assert_template :new
- assert_select 'form[action=/cms-admin/pages]'
+ assert_select "form[action=/cms-admin/sites/#{site.id}/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[blocks_attributes][][content]']"
- assert_select "input[type='hidden'][name='cms_page[blocks_attributes][][label]'][value='test_label']"
+ get :new, :site_id => cms_sites(:default)
+ assert_select "input[type='datetime'][name='page[blocks_attributes][][content]']"
+ assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
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[blocks_attributes][][content]']"
- assert_select "input[type='hidden'][name='cms_page[blocks_attributes][][label]'][value='test_label']"
+ get :new, :site_id => cms_sites(:default)
+ assert_select "input[type='number'][name='page[blocks_attributes][][content]']"
+ assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
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[blocks_attributes][][content]']"
- assert_select "input[type='hidden'][name='cms_page[blocks_attributes][][label]'][value='test_label']"
+ get :new, :site_id => cms_sites(:default)
+ assert_select "input[type='text'][name='page[blocks_attributes][][content]']"
+ assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
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[blocks_attributes][][content]']"
- assert_select "input[type='hidden'][name='cms_page[blocks_attributes][][label]'][value='test_label']"
+ get :new, :site_id => cms_sites(:default)
+ assert_select "textarea[name='page[blocks_attributes][][content]']"
+ assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
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[blocks_attributes][][content]']"
- assert_select "input[type='hidden'][name='cms_page[blocks_attributes][][label]'][value='test_label']"
+ get :new, :site_id => cms_sites(:default)
+ assert_select "input[type='datetime'][name='page[blocks_attributes][][content]']"
+ assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
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[blocks_attributes][][content]']"
- assert_select "input[type='hidden'][name='cms_page[blocks_attributes][][label]'][value='test_label']"
+ get :new, :site_id => cms_sites(:default)
+ assert_select "input[type='number'][name='page[blocks_attributes][][content]']"
+ assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
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[blocks_attributes][][content]']"
- assert_select "input[type='hidden'][name='cms_page[blocks_attributes][][label]'][value='test_label']"
+ get :new, :site_id => cms_sites(:default)
+ assert_select "input[type='text'][name='page[blocks_attributes][][content]']"
+ assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
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[blocks_attributes][][content]']"
- assert_select "input[type='hidden'][name='cms_page[blocks_attributes][][label]'][value='test_label']"
+ get :new, :site_id => cms_sites(:default)
+ assert_select "textarea[name='page[blocks_attributes][][content]']"
+ assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
end
def test_get_new_with_rich_page_text
cms_layouts(:default).update_attribute(:content, '{{cms:page:test_label:rich_text}}')
- get :new
- assert_select "textarea[name='cms_page[blocks_attributes][][content]']"
- assert_select "input[type='hidden'][name='cms_page[blocks_attributes][][label]'][value='test_label']"
+ get :new, :site_id => cms_sites(:default)
+ assert_select "textarea[name='page[blocks_attributes][][content]']"
+ assert_select "input[type='hidden'][name='page[blocks_attributes][][label]'][value='test_label']"
end
def test_get_new_as_child_page
- get :new, :parent_id => cms_pages(:default)
+ get :new, :site_id => cms_sites(:default), :parent_id => cms_pages(:default)
assert_response :success
- assert assigns(:cms_page)
- assert_equal cms_pages(:default), assigns(:cms_page).parent
+ 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, :id => page
+ get :edit, :site_id => page.site, :id => page
assert_response :success
- assert assigns(:cms_page)
+ assert assigns(:page)
assert_template :edit
- assert_select "form[action=/cms-admin/pages/#{page.id}]"
+ assert_select "form[action=/cms-admin/sites/#{page.site.id}/pages/#{page.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 'Page not found', flash[:error]
@@ @@ -115,16 +116,16 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
def test_get_edit_with_blank_layout
page = cms_pages(:default)
page.update_attribute(:layout_id, nil)
- get :edit, :id => page
+ get :edit, :site_id => page.site, :id => page
assert_response :success
- assert assigns(:cms_page)
- assert assigns(:cms_page).layout
+ assert assigns(:page)
+ assert assigns(:page).layout
end
def test_creation
assert_difference 'Cms::Page.count' do
assert_difference 'Cms::Block.count', 2 do
- post :create, :cms_page => {
+ post :create, :site_id => cms_sites(:default), :page => {
:label => 'Test Page',
:slug => 'test-page',
:parent_id => cms_pages(:default).id,
@@ @@ -147,7 +148,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
def test_creation_failure
assert_no_difference ['Cms::Page.count', 'Cms::Block.count'] do
- post :create, :cms_page => {
+ post :create, :site_id => cms_sites(:default), :page => {
:layout_id => cms_layouts(:default).id,
:blocks_attributes => [
{ :label => 'default_page_text',
@@ @@ -157,7 +158,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
]
}
assert_response :success
- page = assigns(:cms_page)
+ page = assigns(:page)
assert_equal 2, page.blocks.size
assert_equal ['content content', 'title content'], page.blocks.collect{|b| b.content}
assert_template :new
@@ @@ -168,7 +169,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
def test_update
page = cms_pages(:default)
assert_no_difference 'Cms::Block.count' do
- put :update, :id => page, :cms_page => {
+ put :update, :site_id => page.site, :id => page, :page => {
:label => 'Updated Label'
}
page.reload
@@ @@ -182,7 +183,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
def test_update_with_layout_change
page = cms_pages(:default)
assert_difference 'Cms::Block.count', 2 do
- put :update, :id => page, :cms_page => {
+ put :update, :site_id => page.site, :id => page, :page => {
:label => 'Updated Label',
:layout_id => cms_layouts(:nested).id,
:blocks_attributes => [
@@ @@ -202,19 +203,19 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
end
def test_update_failure
- put :update, :id => cms_pages(:default), :cms_page => {
+ put :update, :site_id => cms_sites(:default), :id => cms_pages(:default), :page => {
:label => ''
}
assert_response :success
assert_template :edit
- assert assigns(:cms_page)
+ 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, :id => cms_pages(:default)
+ delete :destroy, :site_id => cms_sites(:default), :id => cms_pages(:default)
assert_response :redirect
assert_redirected_to :action => :index
assert_equal 'Page deleted', flash[:notice]
@@ @@ -223,30 +224,31 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
end
def test_get_form_blocks
- xhr :get, :form_blocks, :id => cms_pages(:default), :layout_id => cms_layouts(:nested).id
+ 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(:cms_page)
- assert_equal 2, assigns(:cms_page).tags.size
+ assert assigns(:page)
+ assert_equal 2, assigns(:page).tags.size
assert_template :form_blocks
- xhr :get, :form_blocks, :id => cms_pages(:default), :layout_id => cms_layouts(:default).id
+ xhr :get, :form_blocks, :site_id => site, :id => cms_pages(:default), :layout_id => cms_layouts(:default).id
assert_response :success
- assert assigns(:cms_page)
- assert_equal 4, assigns(:cms_page).tags.size
+ 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, :id => 0, :layout_id => cms_layouts(:default).id
+ xhr :get, :form_blocks, :site_id => cms_sites(:default), :id => 0, :layout_id => cms_layouts(:default).id
assert_response :success
- assert assigns(:cms_page)
- assert_equal 3, assigns(:cms_page).tags.size
+ assert assigns(:page)
+ assert_equal 3, assigns(:page).tags.size
assert_template :form_blocks
end
def test_creation_preview
assert_no_difference 'Cms::Page.count' do
- post :create, :preview => 'Preview', :cms_page => {
+ post :create, :site_id => cms_sites(:default), :preview => 'Preview', :page => {
:label => 'Test Page',
:slug => 'test-page',
:parent_id => cms_pages(:default).id,
@@ @@ -264,7 +266,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
def test_update_preview
page = cms_pages(:default)
assert_no_difference 'Cms::Page.count' do
- put :update, :preview => 'Preview', :id => page, :cms_page => {
+ put :update, :site_id => page.site, :preview => 'Preview', :id => page, :page => {
:label => 'Updated Label',
:blocks_attributes => [
{ :label => 'default_page_text',
@@ @@ -281,28 +283,28 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
def test_get_new_with_no_layout
Cms::Layout.destroy_all
- get :new
+ get :new, :site_id => cms_sites(:default)
assert_response :redirect
- assert_redirected_to new_cms_admin_layout_path
+ 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, :id => page
+ get :edit, :site_id => page.site, :id => page
assert_response :redirect
- assert_redirected_to new_cms_admin_layout_path
+ 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, :id => page, :format => :js
+ 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, :id => page, :format => :js
+ get :toggle_branch, :site_id => page.site, :id => page, :format => :js
assert_response :success
assert_equal [], session[:cms_page_tree]
end
@@ @@ -318,7 +320,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
assert_equal 0, page_one.position
assert_equal 1, page_two.position
- post :reorder, :cms_page => [page_two.id, page_one.id]
+ post :reorder, :site_id => cms_sites(:default), :page => [page_two.id, page_one.id]
assert_response :success
page_one.reload
page_two.reload