diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-03-18 11:18:48 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-03-18 11:18:48 -0700 |
commit | 6335f5d5186dfb97453dfa1a55aabe4c6f3962b0 (patch) | |
tree | 1582b9b5d7e2005aaa2dfe5a23e2d422fe4f094e /actionpack/lib/action_controller/integration.rb | |
parent | 70e3dfb2e9f94396eb6525d13f9adccd3e845c3d (diff) | |
parent | dc88847e5ce392eed210b97525c14fca55852867 (diff) | |
download | rails-6335f5d5186dfb97453dfa1a55aabe4c6f3962b0.tar.gz rails-6335f5d5186dfb97453dfa1a55aabe4c6f3962b0.tar.bz2 rails-6335f5d5186dfb97453dfa1a55aabe4c6f3962b0.zip |
Merge branch 'master' into bodyparts
Diffstat (limited to 'actionpack/lib/action_controller/integration.rb')
-rw-r--r-- | actionpack/lib/action_controller/integration.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb index 4faa263e2d..fda6b639d1 100644 --- a/actionpack/lib/action_controller/integration.rb +++ b/actionpack/lib/action_controller/integration.rb @@ -5,7 +5,7 @@ require 'active_support/test_case' module ActionController module Integration #:nodoc: # An integration Session instance represents a set of requests and responses - # performed sequentially by some virtual user. Becase you can instantiate + # performed sequentially by some virtual user. Because you can instantiate # multiple sessions and run them side-by-side, you can also mimic (to some # limited extent) multiple simultaneous users interacting with your system. # |