solves more deprecation issues (needs to be revisited)

app/controllers/cms/content_block_controller.rb

@@ -269,7 +269,7 @@ def update_block
     def model_params
       defaults = {"publish_on_save" => false}
       model_params = params[model_form_name]
-      defaults.merge(model_params)
+      defaults.merge(model_params.to_unsafe_h)
     end
 
     def after_update_on_success

app/controllers/cms/users_controller.rb

@@ -4,7 +4,7 @@ class UsersController < Cms::ResourceController
 
     check_permissions :administrate, :except => [:change_password, :update_password]
     before_action :only_self_or_administrator, :only => [:change_password, :update_password]
-    after_filter :update_flash, :only => [:update]
+    after_action :update_flash, :only => [:update]
 
     def index
       @have_external_users = Cms::ExternalUser.count > 0

app/controllers/tests/pretend_controller.rb

@@ -11,11 +11,11 @@ class Tests::PretendController < ApplicationController
   RESTRICTED_H1 = "Restricted"
 
   def restricted
-    render :text =>"<h1>#{RESTRICTED_H1}</h1> You can see this restricted page."
+    render plain: "<h1>#{RESTRICTED_H1}</h1> You can see this restricted page."
   end
 
   def open
-    render :text =>"<h1>Open Page</h1> You can see this public page."   
+    render plain: "<h1>Open Page</h1> You can see this public page."
   end
 
   def error

app/helpers/cms/path_helper.rb

@@ -34,7 +34,7 @@ def sortable_column_path(content_type, column_to_sort)
       filtered_params.delete(:action)
       filtered_params.delete(:controller)
       filtered_params.merge!(:order => determine_order(filtered_params[:order], column_to_sort))
-      polymorphic_path(engine_aware_path(content_type.model_class), filtered_params)
+      polymorphic_path(engine_aware_path(content_type.model_class), filtered_params.to_unsafe_h)
     end
 
     def link_to_usages(block)

test/support/engine_controller_hacks.rb

@@ -21,7 +21,6 @@ def delete(action, parameters = nil, session = nil, flash = nil)
   end
 
   private
-
   def process_action(action, parameters = nil, session = nil, flash = nil, method = "GET")
     parameters ||= {}
     merge = { :use_route => :cms }

test/unit/models/file_block_test.rb

@@ -9,12 +9,12 @@ def setup
 
   test "#valid? requires attached file" do
     refute @file.valid?
-    assert_equal ["You must upload a file"], @file.errors.get(:attachment)
+    assert_equal ["You must upload a file"], @file.errors[:attachment]
   end
 
   test "#valid? requires Name" do
     refute @file.valid?
-    assert_equal ["can't be blank"], @file.errors.get(:name)
+    assert_equal ["can't be blank"], @file.errors[:name]
   end
 
   test "New FileBlock should have 1 blank attachment" do

test/unit/schema_statements_test.rb

@@ -30,7 +30,7 @@ class ::Cms::NonVersionedBlock < ActiveRecord::Base
     connection.drop_table :non_versioned_block_versions rescue nil
     connection.create_content_table :non_versioned_blocks, :versioned=>false do |t| ; end
 
-    assert_equal false, ActiveRecord::Base.connection.table_exists?(:non_versioned_block_versions)
+    assert_equal false, ActiveRecord::Base.connection.data_source_exists?(:non_versioned_block_versions)
   end