diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-13 23:47:27 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-13 23:47:27 +0000 |
| commit | 317f13c2a8c047b3868a58e0121453b092557dba (patch) | |
| tree | fcffaa5c7d91db8fba980120be96984bf74ea4fa | |
| parent | 0dfe122bb403e29def9bf58c0d21575ed771a918 (diff) | |
| download | rails-317f13c2a8c047b3868a58e0121453b092557dba.tar.gz rails-317f13c2a8c047b3868a58e0121453b092557dba.tar.bz2 rails-317f13c2a8c047b3868a58e0121453b092557dba.zip | |
Cut dependency on dev-utils by using included breakpoint lib
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@148 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rwxr-xr-x | activerecord/test/abstract_unit.rb | 6 | ||||
| -rw-r--r-- | railties/Rakefile | 1 | ||||
| -rwxr-xr-x | railties/bin/rails | 2 | ||||
| -rw-r--r-- | railties/helpers/test_helper.rb | 5 |
4 files changed, 3 insertions, 11 deletions
diff --git a/activerecord/test/abstract_unit.rb b/activerecord/test/abstract_unit.rb index 1b33579206..a4a1b55cb2 100755 --- a/activerecord/test/abstract_unit.rb +++ b/activerecord/test/abstract_unit.rb @@ -1,8 +1,4 @@ -$:.unshift(File.dirname(__FILE__) + '/../lib')#.unshift(File.dirname(__FILE__)) - -# Make rubygems available for testing if possible -begin require('rubygems'); rescue LoadError; end -begin require('dev-utils/debug'); rescue LoadError; end +$:.unshift(File.dirname(__FILE__) + '/../lib') require 'test/unit' require 'active_record' diff --git a/railties/Rakefile b/railties/Rakefile index d39471862e..ba93dff6cc 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -232,7 +232,6 @@ spec = Gem::Specification.new do |s| s.add_dependency('activerecord', '>= 1.1.0') s.add_dependency('actionpack', '>= 0.9.5') s.add_dependency('actionmailer', '>= 0.4.0') - s.add_dependency('dev-utils', '>= 1.0.1') s.files = PKG_FILES.to_a s.require_path = 'lib' diff --git a/railties/bin/rails b/railties/bin/rails index 846f02ac69..7b3eebea82 100755 --- a/railties/bin/rails +++ b/railties/bin/rails @@ -18,7 +18,7 @@ SYNOPSIS DESCRIPTION This generator will create a suggested directory structure, lots of minor helper files, and a default configuration for creating a new Rails application. Once the - generator is done, you're adviced to look at the README in the root of the folder. + generator is done, you're advised to look at the README in the root of the folder. EXAMPLE rails ~/Code/Ruby/weblog diff --git a/railties/helpers/test_helper.rb b/railties/helpers/test_helper.rb index 4d683e3500..ce1150c606 100644 --- a/railties/helpers/test_helper.rb +++ b/railties/helpers/test_helper.rb @@ -5,10 +5,7 @@ require 'abstract_application' require 'test/unit' require 'active_record/fixtures' require 'action_controller/test_process' - -# Make rubygems available for testing if possible -begin require('rubygems'); rescue LoadError; end -begin require('dev-utils/debug'); rescue LoadError; end +require 'breakpoint' def create_fixtures(*table_names) Fixtures.create_fixtures(File.dirname(__FILE__) + "/fixtures", table_names) |