fixed all errors with structure controller tests

cykod · Mar 29, 2011 · c637ac9 · c637ac9
1 parent 0038499
commit c637ac9
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -177,9 +177,9 @@ def deny_access!
 
   # Activate the appropriate database for the current request
   def activate_domain(domain=nil)
-
     # modify the params[:path] to be an array
-    params[:path] = params[:path].to_s.split("/")
+    params[:path] ||= []
+    params[:path] = params[:path].to_s.split("/") unless params[:path].is_a?(Array)
 
     # Cancel out of domain activations
     # if we are testing

diff --git a/app/models/wizards/simple_site.rb b/app/models/wizards/simple_site.rb
@@ -11,13 +11,12 @@ def self.structure_wizard_handler_info
 
   attributes :pages => [], :name => nil
 
-
   options_form(
                fld(:pages, :text_area),
                fld(:name, :text_field, :label => 'Website Name')
                )
 
-  def validate
+  validate do
     self.errors.add(:name, 'is missing') if self.name.blank?
     self.errors.add(:pages, 'are missing') if self.pages.blank?
   end

diff --git a/app/views/structure/_edit_page_revision.html.erb b/app/views/structure/_edit_page_revision.html.erb
@@ -2,7 +2,7 @@
 
 <h3><%= 'Edit Meta Data'.t %></h3>
 
-<%= remote_cms_form_for :revision, @revision, :update => 'WD_redbox' do |f| -%>
+<%= cms_form_for :revision, @revision, :remote => true, :update => 'WD_redbox' do |f| -%>
 <%= f.text_field :title %>
 <%= f.text_field :menu_title %>
 <%= f.text_area :meta_description, :rows => 3 %>

diff --git a/app/views/structure/_site_node_options.rhtml b/app/views/structure/_site_node_options.rhtml
@@ -1,7 +1,7 @@
 <br/>
 
 <div id='site_node_view'>
-  <%= remote_cms_form_for :site_node, @node,
+  <%= cms_form_for :site_node, @node, :remote => true,
       :update => "element_info",
       :method => 'post', 
       :url =>  { :action => 'update_site_node_options', :path => @node.id } do  |nf| -%>

diff --git a/spec/controllers/structure_controller_spec.rb b/spec/controllers/structure_controller_spec.rb
@@ -3,7 +3,6 @@
 describe StructureController do
   render_views
 
-
   reset_domain_tables :site_versions, :site_nodes, :site_node_modifiers, :page_revisions, :page_paragraphs
 
 

diff --git a/spec/lib/site_node_engine_spec.rb b/spec/lib/site_node_engine_spec.rb
@@ -1,6 +1,7 @@
 require "spec_helper"
 
 describe SiteNodeEngine, :type => :controller do
+  include RSpec::Rails::ControllerExampleGroup
   include ActionDispatch::TestProcess
 
   render_views