aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorCarlhuda <carlhuda@engineyard.com>2009-12-23 16:14:34 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2009-12-23 17:46:38 -0800
commitd926fb62e83d22b34d58f27a6d743cfa5f4c5c7b (patch)
tree57b277a68dbaf7b199d884b001e9489bc13f4f03 /railties/test
parent4d3602a8c4b38052c70655cd7d9dea42ae10ea8d (diff)
downloadrails-d926fb62e83d22b34d58f27a6d743cfa5f4c5c7b.tar.gz
rails-d926fb62e83d22b34d58f27a6d743cfa5f4c5c7b.tar.bz2
rails-d926fb62e83d22b34d58f27a6d743cfa5f4c5c7b.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