diff --git a/lib/acts_as_tree.rb b/lib/acts_as_tree.rb index 65cb8f3..d91d027 100644 --- a/lib/acts_as_tree.rb +++ b/lib/acts_as_tree.rb @@ -383,6 +383,3 @@ def update_parents_counter_cache end end end - -# Deprecating the following code in the future. -require 'acts_as_tree/active_record/acts/tree' diff --git a/lib/acts_as_tree/active_record/acts/tree.rb b/lib/acts_as_tree/active_record/acts/tree.rb deleted file mode 100644 index 583010c..0000000 --- a/lib/acts_as_tree/active_record/acts/tree.rb +++ /dev/null @@ -1,15 +0,0 @@ -require 'acts_as_tree' - -module ActiveRecord - module Acts #:nodoc: - module Tree - include ::ActsAsTree - - def self.included(base) - Kernel.warn "[DEPRECATION] The module ActiveRecord::Acts::Tree has moved to ActsAsTree" - - base.extend ::ActsAsTree::ClassMethods - end - end - end -end diff --git a/test/acts_as_tree_test.rb b/test/acts_as_tree_test.rb index 2773a4f..462cfab 100644 --- a/test/acts_as_tree_test.rb +++ b/test/acts_as_tree_test.rb @@ -3,7 +3,7 @@ require 'active_record' require 'acts_as_tree' -class ActsAsTreeTestCase < (defined?(MiniTest::Test) ? MiniTest::Test : MiniTest::Unit::TestCase) +class ActsAsTreeTestCase < (defined?(Minitest::Test) ? Minitest::Test : Minitest::Unit::TestCase) UPDATE_METHOD = ActiveRecord::VERSION::MAJOR >= 4 ? :update : :update_attributes def assert_queries(num = 1, &block) @@ -628,4 +628,3 @@ def test_alias_tree_level assert_equal 'Has Level Column', @level_column.level end end -