diff options
| author | José Valim <jose.valim@gmail.com> | 2011-05-22 09:12:27 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-22 09:12:27 -0700 |
| commit | 06474c15530406d81e03e7f6ad0dcccdf2a54ce3 (patch) | |
| tree | a7ad26c764f3b0cc14d4470522b5277f9782ff46 | |
| parent | ff55924921636c6ddeaea5d08a3587a97cd4e69b (diff) | |
| parent | 4c99f323ad4d1d4b46dba9d73b79cffbaa26956f (diff) | |
| download | rails-06474c15530406d81e03e7f6ad0dcccdf2a54ce3.tar.gz rails-06474c15530406d81e03e7f6ad0dcccdf2a54ce3.tar.bz2 rails-06474c15530406d81e03e7f6ad0dcccdf2a54ce3.zip | |
Merge pull request #1192 from arunagw/removal_extra
No more need rubygems here.
| -rw-r--r-- | activemodel/test/cases/helper.rb | 1 | ||||
| -rw-r--r-- | activeresource/test/abstract_unit.rb | 6 | ||||
| -rw-r--r-- | railties/test/isolation/abstract_unit.rb | 2 |
3 files changed, 0 insertions, 9 deletions
diff --git a/activemodel/test/cases/helper.rb b/activemodel/test/cases/helper.rb index 01f0158678..2e860272a4 100644 --- a/activemodel/test/cases/helper.rb +++ b/activemodel/test/cases/helper.rb @@ -10,5 +10,4 @@ require 'active_support/core_ext/string/access' # Show backtraces for deprecated behavior for quicker cleanup. ActiveSupport::Deprecation.debug = true -require 'rubygems' require 'test/unit' diff --git a/activeresource/test/abstract_unit.rb b/activeresource/test/abstract_unit.rb index 948dd94a1d..9c1e9a526d 100644 --- a/activeresource/test/abstract_unit.rb +++ b/activeresource/test/abstract_unit.rb @@ -3,7 +3,6 @@ require File.expand_path('../../../load_paths', __FILE__) lib = File.expand_path("#{File.dirname(__FILE__)}/../lib") $:.unshift(lib) unless $:.include?('lib') || $:.include?(lib) -require 'rubygems' require 'test/unit' require 'active_resource' require 'active_support' @@ -14,11 +13,6 @@ require 'setter_trap' require 'logger' ActiveResource::Base.logger = Logger.new("#{File.dirname(__FILE__)}/debug.log") -begin - require 'ruby-debug' -rescue LoadError -end - def setup_response matz_hash = { 'person' => { :id => 1, :name => 'Matz' } } diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb index f2261540ca..17a4131158 100644 --- a/railties/test/isolation/abstract_unit.rb +++ b/railties/test/isolation/abstract_unit.rb @@ -8,8 +8,6 @@ # Rails booted up. require 'fileutils' -# TODO: Remove rubygems when possible -require 'rubygems' require 'test/unit' # TODO: Remove setting this magic constant |