diff options
| author | Rafael Mendonça França <rafael.franca@plataformatec.com.br> | 2014-08-17 22:51:13 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafael.franca@plataformatec.com.br> | 2014-08-17 22:51:13 -0300 |
| commit | cdc00aba62ffb0f0af452f5152aafeb5e490962e (patch) | |
| tree | 071ca4766dd07b9af34bbebf902c50a27c5c2b4d /actionpack/test/controller/request_forgery_protection_test.rb | |
| parent | cc9091c3e719facd0f73c8ab425a5bb9a7d0a65b (diff) | |
| parent | c78da4d5c472f7254ed609ef753d7b1719732802 (diff) | |
| download | rails-cdc00aba62ffb0f0af452f5152aafeb5e490962e.tar.gz rails-cdc00aba62ffb0f0af452f5152aafeb5e490962e.tar.bz2 rails-cdc00aba62ffb0f0af452f5152aafeb5e490962e.zip | |
Merge branch 'loofah'
Conflicts:
Gemfile
Diffstat (limited to 'actionpack/test/controller/request_forgery_protection_test.rb')
| -rw-r--r-- | actionpack/test/controller/request_forgery_protection_test.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/test/controller/request_forgery_protection_test.rb b/actionpack/test/controller/request_forgery_protection_test.rb index 2a5aad9c0e..05ad8b6cdc 100644 --- a/actionpack/test/controller/request_forgery_protection_test.rb +++ b/actionpack/test/controller/request_forgery_protection_test.rb @@ -389,7 +389,8 @@ class RequestForgeryProtectionControllerUsingResetSessionTest < ActionController SecureRandom.stubs(:base64).returns(@token + '<=?') get :meta assert_select 'meta[name=?][content=?]', 'csrf-param', 'custom_authenticity_token' - assert_select 'meta[name=?][content=?]', 'csrf-token', 'cf50faa3fe97702ca1ae<=?' + assert_select 'meta[name=?]', 'csrf-token' + assert_match(/cf50faa3fe97702ca1ae<=\?/, @response.body) end end |