Fix issues with functional tests

* Caused by Rails 3.2.8 upgrade * Mostly additional html safe issues * Needed to continue to use 'overridden' functional test methods for engine testing.

Author: peakpg

Gemfile

@@ -26,7 +26,7 @@ group :test do
  # Cucumber and dependencies
  gem 'capybara'
  gem 'database_cleaner'
- gem 'cucumber-rails'
+ gem 'cucumber-rails', require: false
  gem 'cucumber'
  gem 'launchy'
  gem 'ruby-prof'

app/views/cms/blocks/edit.html.erb

@@ -3,7 +3,7 @@
  <%= stylesheet_link_tag('cms/content_library') %>
 <% end %>
 <% page_title "Content Library / Edit #{content_type.display_name}" %>
-<% @toolbar_title = "Edit #{content_type.display_name} '#{@block.name}'" %>
+<% @toolbar_title = "Edit #{content_type.display_name} '#{@block.name}'".html_safe %>
 <%= content_for :functions, render(:partial => 'cms/blocks/toolbar') %>
 
 <% if @block.respond_to?(:deleted) && @block.deleted %>

app/views/cms/blocks/usages.html.erb

@@ -1,5 +1,5 @@
 <% page_title "Content Library / View Usages" %>
-<% @toolbar_title = "Pages Using #{content_type.display_name} '#{ @block.name }'" %>
+<% @toolbar_title = "Pages Using #{content_type.display_name} '#{ @block.name }'".html_safe %>
 <%= content_for :html_head do %>
  <%= stylesheet_link_tag("cms/content_library") %>
  <%= javascript_tag do %>

app/views/cms/connectors/new.html.erb

@@ -1,4 +1,4 @@
-<% @toolbar_title = @page_title = "Add Existing Content to '#{@page.page_title}' Page" %>
+<% @toolbar_title = @page_title = "Add Existing Content to '#{@page.page_title}' Page".html_safe %>
 
 <%= content_for :html_head do %>
  <%= stylesheet_link_tag("cms/content_library") %>

app/views/cms/content/no_page.html.erb

@@ -8,7 +8,7 @@
 %>
 
 <% @content_for_functions = "" %>
-<%= content_for :functions, "<h1>#{ page_title }</h1>" %>
+<%= content_for :functions, "<h1>#{ page_title }</h1>".html_safe %>
 
 <% @content_for_html_head = "" %>
 <%= content_for :html_head do %>

test/functional/cms/content_controller_test.rb

@@ -33,7 +33,7 @@ def test_show_protected_page_to_privileged_user
 
  get :show, :path => "secret"
  assert_response :success
- assert_select "title", "Shhh... It's a Secret"
+ assert_select "title", "Shhh... It's a Secret" # Should page_title be html_safe or not?
  end
 
  def test_show_archived_page_to_user

test/support/engine_controller_hacks.rb

@@ -1,36 +1,36 @@
-# Don't think these are necessary anymore, but leaving for now until all controller tests pass.
+# Rewrite test methods to avoid need to repeat :use_route => :cms in EVERY functional test call
+# See http://edgeguides.rubyonrails.org/engines.html#testing-an-engine for why this would be necessary.
+module EngineControllerHacks
+ def get(action, parameters = nil, session = nil, flash = nil)
+ process_action(action, parameters, session, flash, "GET")
+ end
 
-#module EngineControllerHacks
-# def get(action, parameters = nil, session = nil, flash = nil)
-# process_action(action, parameters, session, flash, "GET")
-# end
-#
-# # Executes a request simulating POST HTTP method and set/volley the response
-# def post(action, parameters = nil, session = nil, flash = nil)
-# process_action(action, parameters, session, flash, "POST")
-# end
-#
-# # Executes a request simulating PUT HTTP method and set/volley the response
-# def put(action, parameters = nil, session = nil, flash = nil)
-# process_action(action, parameters, session, flash, "PUT")
-# end
-#
-# # Executes a request simulating DELETE HTTP method and set/volley the response
-# def delete(action, parameters = nil, session = nil, flash = nil)
-# process_action(action, parameters, session, flash, "DELETE")
-# end
-#
-# private
-#
-# def process_action(action, parameters = nil, session = nil, flash = nil, method = "GET")
-# parameters ||= {}
-# merge = { :use_route => :cms }
-# if parameters[:use_route] == false
-# parameters.delete(:use_route)
-# merge = {}
-# end
-# process(action, parameters.merge!(merge), session, flash, method)
-# end
-#end
-#
-#ActionController::TestCase.send(:include, EngineControllerHacks)
+ # Executes a request simulating POST HTTP method and set/volley the response
+ def post(action, parameters = nil, session = nil, flash = nil)
+ process_action(action, parameters, session, flash, "POST")
+ end
+
+ # Executes a request simulating PUT HTTP method and set/volley the response
+ def put(action, parameters = nil, session = nil, flash = nil)
+ process_action(action, parameters, session, flash, "PUT")
+ end
+
+ # Executes a request simulating DELETE HTTP method and set/volley the response
+ def delete(action, parameters = nil, session = nil, flash = nil)
+ process_action(action, parameters, session, flash, "DELETE")
+ end
+
+ private
+
+ def process_action(action, parameters = nil, session = nil, flash = nil, method = "GET")
+ parameters ||= {}
+ merge = { :use_route => :cms }
+ if parameters[:use_route] == false
+ parameters.delete(:use_route)
+ merge = {}
+ end
+ process(action, parameters.merge!(merge), session, flash, method)
+ end
+end
+
+ActionController::TestCase.send(:include, EngineControllerHacks)

test/test_helper.rb

@@ -22,7 +22,7 @@
 require 'factories/factories'
 require 'factories/attachable_factories'
 
-#require 'support/engine_controller_hacks'
+require 'support/engine_controller_hacks'
 
 class ActiveSupport::TestCase