diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-05-19 22:42:59 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-05-19 22:43:22 -0500 |
| commit | 6761759a90c08b9db8d5720a8ee4c4329a547caf (patch) | |
| tree | b79aad2a0ebae2cd291222a25341c39cf26c1791 /actionpack/lib/action_controller/testing | |
| parent | df0faea378034b031f49995f06c8bf108a0b5530 (diff) | |
| download | rails-6761759a90c08b9db8d5720a8ee4c4329a547caf.tar.gz rails-6761759a90c08b9db8d5720a8ee4c4329a547caf.tar.bz2 rails-6761759a90c08b9db8d5720a8ee4c4329a547caf.zip | |
Temporarily bundle rack-test while MockSession is baking
Diffstat (limited to 'actionpack/lib/action_controller/testing')
| -rw-r--r-- | actionpack/lib/action_controller/testing/integration.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/testing/integration.rb b/actionpack/lib/action_controller/testing/integration.rb index 717b77674c..cc157816e2 100644 --- a/actionpack/lib/action_controller/testing/integration.rb +++ b/actionpack/lib/action_controller/testing/integration.rb @@ -1,8 +1,9 @@ require 'stringio' require 'uri' require 'active_support/test_case' -require 'rack/test' + require 'rack/mock_session' +require 'rack/test/cookie_jar' module ActionController module Integration #:nodoc: |