diff options
| author | Emilio Tagua <miloops@gmail.com> | 2011-02-15 12:01:04 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2011-02-15 12:01:04 -0300 |
| commit | 8ee0b4414890f919594c1a388d987b5b7364a505 (patch) | |
| tree | 6c6c6aa19da0eb8066d2f0b9b02b08f2cc696c29 /actionpack/test/dispatch/session/cookie_store_test.rb | |
| parent | 348c0ec7c656b3691aa4e687565d28259ca0f693 (diff) | |
| parent | c9f1ab5365319e087e1b010a3f90626a2b8f080b (diff) | |
| download | rails-8ee0b4414890f919594c1a388d987b5b7364a505.tar.gz rails-8ee0b4414890f919594c1a388d987b5b7364a505.tar.bz2 rails-8ee0b4414890f919594c1a388d987b5b7364a505.zip | |
Merge remote branch 'rails/master' into identity_map
Conflicts:
activerecord/examples/performance.rb
activerecord/lib/active_record/association_preload.rb
activerecord/lib/active_record/associations.rb
activerecord/lib/active_record/associations/association_proxy.rb
activerecord/lib/active_record/autosave_association.rb
activerecord/lib/active_record/base.rb
activerecord/lib/active_record/nested_attributes.rb
activerecord/test/cases/relations_test.rb
Diffstat (limited to 'actionpack/test/dispatch/session/cookie_store_test.rb')
| -rw-r--r-- | actionpack/test/dispatch/session/cookie_store_test.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/test/dispatch/session/cookie_store_test.rb b/actionpack/test/dispatch/session/cookie_store_test.rb index 256d0781c7..27f55fd7ab 100644 --- a/actionpack/test/dispatch/session/cookie_store_test.rb +++ b/actionpack/test/dispatch/session/cookie_store_test.rb @@ -194,7 +194,6 @@ class CookieStoreTest < ActionDispatch::IntegrationTest with_test_route_set do get '/set_session_value' assert_response :success - session_payload = response.body assert_equal "_myapp_session=#{response.body}; path=/; HttpOnly", headers['Set-Cookie'] |