diff options
| author | Jamis Buck <jamis@37signals.com> | 2006-03-18 14:27:36 +0000 |
|---|---|---|
| committer | Jamis Buck <jamis@37signals.com> | 2006-03-18 14:27:36 +0000 |
| commit | 36ea93e4b9dd880cb0803de624fe77ed0ffc2c53 (patch) | |
| tree | 2fda18433bfca40243e90ae3c51bd7fae4c3bae0 | |
| parent | ddce0ae5257c2714e603e301846e6bd4800e07b8 (diff) | |
| download | rails-36ea93e4b9dd880cb0803de624fe77ed0ffc2c53.tar.gz rails-36ea93e4b9dd880cb0803de624fe77ed0ffc2c53.tar.bz2 rails-36ea93e4b9dd880cb0803de624fe77ed0ffc2c53.zip | |
rename 'integration_test.rb' -> 'integration.rb'
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3923 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | actionpack/lib/action_controller/integration.rb (renamed from actionpack/lib/action_controller/integration_test.rb) | 0 | ||||
| -rw-r--r-- | railties/lib/console_app.rb | 2 | ||||
| -rw-r--r-- | railties/lib/test_help.rb | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/integration_test.rb b/actionpack/lib/action_controller/integration.rb index fd9f848f5e..fd9f848f5e 100644 --- a/actionpack/lib/action_controller/integration_test.rb +++ b/actionpack/lib/action_controller/integration.rb diff --git a/railties/lib/console_app.rb b/railties/lib/console_app.rb index 6e61fc9171..770b87de71 100644 --- a/railties/lib/console_app.rb +++ b/railties/lib/console_app.rb @@ -1,4 +1,4 @@ -require 'action_controller/integration_test' +require 'action_controller/integration' # work around the at_exit hook in test/unit, which kills IRB Test::Unit.run = true diff --git a/railties/lib/test_help.rb b/railties/lib/test_help.rb index 4eea71aa79..dcf47364d5 100644 --- a/railties/lib/test_help.rb +++ b/railties/lib/test_help.rb @@ -7,7 +7,7 @@ silence_warnings { RAILS_ENV = "test" } require 'test/unit' require 'active_record/fixtures' require 'action_controller/test_process' -require 'action_controller/integration_test' +require 'action_controller/integration' require 'action_web_service/test_invoke' require 'breakpoint' |