aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-04-28 12:46:04 -0300
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-04-28 12:46:05 -0300
commitaf024f4b1efecbcc01b22393178271a72dfb6cfb (patch)
treeeb7ebc94a97a4be532cd6cb939930b111088c15b
parent2dab86c43c3a978727c75a7f15cfdb6452440cbd (diff)
downloadrails-af024f4b1efecbcc01b22393178271a72dfb6cfb.tar.gz
rails-af024f4b1efecbcc01b22393178271a72dfb6cfb.tar.bz2
rails-af024f4b1efecbcc01b22393178271a72dfb6cfb.zip
Remove Declarative module extending, it is already part of AS::TestCase
Removes method redefined warning.
-rw-r--r--railties/test/isolation/abstract_unit.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index 7957186ba2..f2dc0c71b1 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -18,7 +18,6 @@ RAILS_FRAMEWORK_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../../..")
# These files do not require any others and are needed
# to run the tests
require "#{RAILS_FRAMEWORK_ROOT}/activesupport/lib/active_support/testing/isolation"
-require "#{RAILS_FRAMEWORK_ROOT}/activesupport/lib/active_support/testing/declarative"
require "#{RAILS_FRAMEWORK_ROOT}/activesupport/lib/active_support/core_ext/kernel/reporting"
module TestHelpers
@@ -268,7 +267,6 @@ class ActiveSupport::TestCase
include TestHelpers::Paths
include TestHelpers::Rack
include TestHelpers::Generation
- extend ActiveSupport::Testing::Declarative
end
# Create a scope and build a fixture rails app