Permalink
Browse files

fixed deprecation-warnings for rails 2.3.5

  • Loading branch information...
1 parent 1cca85f commit 447973fad8bb19057b9eae0301cce09da4c87ede @kronn kronn committed Mar 15, 2010
View
@@ -60,5 +60,5 @@ def load_plugin_environments
#
# require 'zip/zip'
# # require 'cronedit'
-# require 'activerecord' # paperclip needs activerecord to be present
+# require 'active_record' # paperclip needs active_record to be present
# require 'paperclip'
@@ -3,7 +3,7 @@
#
require 'rubygems'
-require 'activesupport'
+require 'active_support'
require 'rake/tasklib'
require 'thread'
require 'webrick'
@@ -2,7 +2,7 @@
require 'rubygems'
require 'test/unit'
-require 'actionpack'
+require 'action_pack'
require 'action_controller'
require 'mocha'
@@ -1,4 +1,4 @@
-require 'activerecord'
+require 'active_record'
module IsParanoid
# Call this in your model to enable all the safety-net goodness
@@ -1,6 +1,6 @@
require 'rubygems'
require "#{File.dirname(__FILE__)}/../lib/is_paranoid"
-require 'activerecord'
+require 'active_record'
require 'yaml'
require 'spec'
@@ -1,4 +1,4 @@
-require 'activerecord'
+require 'active_record'
module IsParanoid
# Call this in your model to enable all the safety-net goodness
@@ -1,6 +1,6 @@
require 'rubygems'
require "#{File.dirname(__FILE__)}/../lib/is_paranoid"
-require 'activerecord'
+require 'active_record'
require 'yaml'
require 'spec'
@@ -2,8 +2,8 @@
$: << File.dirname(__FILE__) + '/../lib/'
require 'rubygems'
-require 'actionpack'
-require 'activesupport'
+require 'action_pack'
+require 'active_support'
require 'action_controller'
require 'action_controller/test_process'
require 'active_support/vendor'
@@ -1,10 +1,10 @@
require 'test/unit'
require 'rubygems'
-require 'activesupport'
-require 'active_support/test_case'
-require 'activerecord'
-require 'active_record/fixtures'
+require 'active_support'
+# require 'active_support/test_case'
+require 'active_record'
+# require 'active_record/fixtures'
dir = File.dirname(__FILE__)
$: << File.expand_path(File.join(dir, '..', 'lib'))
@@ -1,10 +1,10 @@
require 'test/unit'
require 'rubygems'
-require 'activesupport'
-require 'active_support/test_case'
-require 'activerecord'
-require 'active_record/fixtures'
+require 'active_support'
+# require 'active_support/test_case'
+require 'active_record'
+# require 'active_record/fixtures'
dir = File.dirname(__FILE__)
$: << File.expand_path(dir + '/../lib')
@@ -1,8 +1,8 @@
$: << File.dirname(__FILE__) + "/../lib"
require 'rubygems'
-require 'activesupport'
-require 'actionpack'
+require 'active_support'
+require 'action_pack'
require 'action_controller'
require 'action_view'
require 'action_view/test_case'
@@ -46,4 +46,4 @@ def build_body_row(*columns)
Row.new(build_body(*columns))
end
end
-end
+end
@@ -1,8 +1,8 @@
$: << File.dirname(__FILE__) + "/../lib"
require 'rubygems'
-require 'activesupport'
-require 'actionpack'
+require 'active_support'
+require 'action_pack'
require 'action_controller'
require 'action_view'
require 'action_view/test_case'
@@ -1,4 +1,4 @@
-require 'activerecord'
+require 'active_record'
module Rbac
module RoleType
@@ -44,4 +44,4 @@ def granted_to?(user, context = nil, options = {})
end
end
end
-end
+end
@@ -1,8 +1,8 @@
$: << File.dirname(__FILE__) + '/../lib'
require 'rubygems'
-require 'activerecord'
-require 'activesupport'
+require 'active_record'
+require 'active_support'
require 'test/unit'
require 'rbac'
@@ -59,4 +59,4 @@ module TestHelper
def self.test(name, &block)
define_method("test: " + name, &block)
end
-end
+end
@@ -320,6 +320,6 @@ class MissingKeyError < RuntimeError
end
end
ActiveRecord::Base.send :include, ActiveCrypto
-require 'actionpack'
+require 'action_pack'
require 'action_controller'
ActionController::Base.send :include, ActiveCrypto::ActionController
@@ -1,7 +1,7 @@
$:.push File.expand_path(File.dirname(__FILE__) + '/../../with/lib')
$:.push File.expand_path(File.dirname(__FILE__) + '/../lib')
-# require 'actionpack'
+# require 'action_pack'
# require 'action_controller'
# require 'action_controller/test_process'
# require 'active_support'
View
@@ -1,7 +1,7 @@
require File.dirname(__FILE__) + '/test/helper'
require 'rubygems'
-require 'actionpack'
+require 'action_pack'
require 'action_controller'
require 'action_controller/test_process'
require 'active_support'

0 comments on commit 447973f

Please sign in to comment.