aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorCarlhuda <carlhuda@engineyard.com>2009-12-23 16:14:34 -0800
committerCarlhuda <carlhuda@engineyard.com>2009-12-23 16:14:34 -0800
commit83be262b4b2e415fe9be319eb6b187bcf415fb6d (patch)
tree5af81ccccdf65e0f9efde40317352ce8fed02314 /railties/test
parent38aeb1528c376f7a058beea6db0a328720b85f01 (diff)
downloadrails-83be262b4b2e415fe9be319eb6b187bcf415fb6d.tar.gz
rails-83be262b4b2e415fe9be319eb6b187bcf415fb6d.tar.bz2
rails-83be262b4b2e415fe9be319eb6b187bcf415fb6d.zip
Isolation tests intentionally avoid loading any state (because they're often testing things that have their own load path semantics that should not be polluted), so rack/test is not yet on the load path. Moving require "rack/test" into the setup means and after boot_rails means that it'll be required after the laod path has been altered to add in the Rails vendor/gems
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/application/routing_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/test/application/routing_test.rb b/railties/test/application/routing_test.rb
index 7b1df7f45d..ece9b13f8a 100644
--- a/railties/test/application/routing_test.rb
+++ b/railties/test/application/routing_test.rb
@@ -1,18 +1,18 @@
require 'isolation/abstract_unit'
-require 'rack/test'
module ApplicationTests
class RoutingTest < Test::Unit::TestCase
include ActiveSupport::Testing::Isolation
- include Rack::Test::Methods
def setup
build_app
+ boot_rails
+ require 'rack/test'
+ extend Rack::Test::Methods
end
def app
@app ||= begin
- boot_rails
require "#{app_path}/config/environment"
Rails.application