diff options
author | Xavier Noria <fxn@hashref.com> | 2010-08-31 00:24:05 +0200 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2010-08-31 00:24:05 +0200 |
commit | 3805d01c9b0ee6681d3e36233a82731200b87d34 (patch) | |
tree | 0c50c954f6561c64438dc14a7771f9ac4c320003 /actionpack/lib/action_dispatch/testing/integration.rb | |
parent | d37a65307d280e47eb5c15b61c0b20ac6cab6a84 (diff) | |
parent | c30f6c270da5cd2ad7605ee9255f052e93609e30 (diff) | |
download | rails-3805d01c9b0ee6681d3e36233a82731200b87d34.tar.gz rails-3805d01c9b0ee6681d3e36233a82731200b87d34.tar.bz2 rails-3805d01c9b0ee6681d3e36233a82731200b87d34.zip |
resolves merge conflict
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/integration.rb')
-rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index b52795c575..590ebbf364 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -115,8 +115,8 @@ module ActionDispatch end end - # An integration Session instance represents a set of requests and responses - # performed sequentially by some virtual user. Because you can instantiate + # An instance of this class represents a set of requests and responses + # performed sequentially by a test process. 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. # @@ -373,12 +373,12 @@ module ActionDispatch end end - # An IntegrationTest is one that spans multiple controllers and actions, + # An test that spans multiple controllers and actions, # tying them all together to ensure they work together as expected. It tests # more completely than either unit or functional tests do, exercising the # entire stack, from the dispatcher to the database. # - # At its simplest, you simply extend IntegrationTest and write your tests + # At its simplest, you simply extend <tt>IntegrationTest</tt> and write your tests # using the get/post methods: # # require "test_helper" @@ -403,7 +403,7 @@ module ActionDispatch # However, you can also have multiple session instances open per test, and # even extend those instances with assertions and methods to create a very # powerful testing DSL that is specific for your application. You can even - # reference any named routes you happen to have defined! + # reference any named routes you happen to have defined. # # require "test_helper" # |